1. 27 Jun, 2013 6 commits
    • Dave Airlie's avatar
      Merge branch 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into drm-next · dc021644
      Dave Airlie authored
      Merge in the tip core/mutexes branch for future GPU driver use.
      
      Ingo will send this branch to Linus prior to drm-next.
      
      * 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        locking-selftests: Handle unexpected failures more strictly
        mutex: Add more w/w tests to test EDEADLK path handling
        mutex: Add more tests to lib/locking-selftest.c
        mutex: Add w/w tests to lib/locking-selftest.c
        mutex: Add w/w mutex slowpath debugging
        mutex: Add support for wound/wait style locks
        arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
        powerpc/pci: Fix boot panic on mpc83xx (regression)
        s390/ipl: Fix FCP WWPN and LUN format strings for read
        fs: fix new splice.c kernel-doc warning
        spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()
        s390/mem_detect: fix memory hole handling
        s390/dma: support debug_dma_mapping_error
        s390/dma: fix mapping_error detection
        s390/irq: Only define synchronize_irq() on SMP
        Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
        Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
        spi/pxa2xx: use GFP_ATOMIC in sg table allocation
        fuse: hold i_mutex in fuse_file_fallocate()
        Input: add missing dependencies on CONFIG_HAS_IOMEM
        ...
      dc021644
    • Dave Airlie's avatar
      Merge tag 'v3.10-rc7' into drm-next · 4300a0f8
      Dave Airlie authored
      Linux 3.10-rc7
      
      The sdvo lvds fix in this -fixes pull
      
      commit c3456fb3
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Mon Jun 10 09:47:58 2013 +0200
      
          drm/i915: prefer VBT modes for SVDO-LVDS over EDID
      
      has a silent functional conflict with
      
      commit 990256ae
      Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Date:   Fri May 31 12:17:07 2013 +0000
      
          drm: Add probed modes in probe order
      
      in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
      other way round than now.
      
      Conflicts:
      	drivers/gpu/drm/drm_prime.c
      	drivers/gpu/drm/i915/intel_sdvo.c
      4300a0f8
    • Daniel Vetter's avatar
      drm: kms_helper: don't lose hotplug event · 160954b7
      Daniel Vetter authored
      There's a race window (small for hpd, 10s large for polled outputs)
      where userspace could sneak in with an unrelated connnector probe
      ioctl call and eat the hotplug event (since neither the hpd nor the
      poll code see a state change).
      
      To avoid this, check whether the connector state changes in all other
      ->detect calls (in the current helper code that's only probe_single)
      and if that's the case, fire off a hotplug event. Note that we can't
      directly call the hotplug event handler, since that expects that no
      locks are held (due to reentrancy with the fb code to update the kms
      console).
      
      Also, this requires that drivers using the probe_single helper
      function set up the poll work. All current drivers do that already,
      and with the reworked hpd handling there'll be no downside to
      unconditionally setting up the poll work any more.
      Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      160954b7
    • Dave Airlie's avatar
      Merge branch 'drm/shmob' of git://linuxtv.org/pinchartl/fbdev into drm-next · 2b54f781
      Dave Airlie authored
      Fixes for shmob + prime support
      
      * 'drm/shmob' of git://linuxtv.org/pinchartl/fbdev:
        drm/shmobile: Enable compilation on all ARM platforms
        drm/shmobile: Add DRM PRIME support
        drm/shmobile: Use devm_* managed functions
        drm/shmobile: Minor typo fix in debug message
      2b54f781
    • Laurent Pinchart's avatar
      drm: Renesas R-Car Display Unit DRM driver · 4bf8e196
      Laurent Pinchart authored
      The R-Car Display Unit (DU) DRM driver supports both superposition
      processors and all eight planes in RGB and YUV formats with alpha
      blending.
      
      Only VGA and LVDS encoders and connectors are currently supported.
      Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      4bf8e196
    • Dave Airlie's avatar
      vgacon: fix missing include. · 0ab3691f
      Dave Airlie authored
      This fixes the build error.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      0ab3691f
  2. 26 Jun, 2013 8 commits
  3. 25 Jun, 2013 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 1e876e3b
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "A couple of last-minute fixes: a build regression for !SMP, a recent
        memory detection patch caused kdump to break, a regression in regard
        to sscanf vs reboot from FCP, and two fixes in the DMA mapping code
        for PCI"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/ipl: Fix FCP WWPN and LUN format strings for read
        s390/mem_detect: fix memory hole handling
        s390/dma: support debug_dma_mapping_error
        s390/dma: fix mapping_error detection
        s390/irq: Only define synchronize_irq() on SMP
      1e876e3b
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · ad465470
      Linus Torvalds authored
      Pull powerpc bugfix from Ben Herrenschmidt:
       "This is a fix for a regression causing a freescale "83xx" based
        platforms to crash on boot due to some PCI breakage"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/pci: Fix boot panic on mpc83xx (regression)
      ad465470
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 5dbc7469
      Linus Torvalds authored
      Pull fuse bugfix from Miklos Szeredi:
       "This fixes a race between fallocate() and truncate()"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: hold i_mutex in fuse_file_fallocate()
      5dbc7469
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · f97f7d2d
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A few last minute SPI updates: fix a missized allocation and use
        atomic allocations in atomic context in the PXA driver, and fix the
        checking of return codes in the S3C64xx driver which caused spurious
        errors under heavy load."
      
      * tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()
        spi/pxa2xx: use GFP_ATOMIC in sg table allocation
        spi: s3c64xx: Fix pm_runtime_get_sync() return value check
      f97f7d2d
    • Daniel Vetter's avatar
      drm: fix fb leak in setcrtc · 5cef29aa
      Daniel Vetter authored
      Drivers are allowed (actually have to) disable unrelated crtcs in
      their ->set_config callback (when we steal all the connectors from
      that crtc). If they do that they'll clear crtc->fb to NULL.
      
      Which results in a refcount leak, since the drm core is keeping track
      of that reference.
      
      To fix this track the old fb of all crtcs and adjust references for
      all of them. Of course, since we only hold an additional reference for
      the fb for the current crtc we need to increase refcounts before we
      drop the old one.
      
      This approach has the benefit that it inches us a bit closer to an
      atomic modeset world, where we want to update the config of all crtcs
      in one step.
      
      This regression has been introduce in the framebuffer refcount
      conversion, specifically in
      
      commit b0d12325
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Tue Dec 11 01:07:12 2012 +0100
      
          drm: refcounting for crtc framebuffers
      Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      5cef29aa
    • Daniel Vetter's avatar
      drm: check that ->set_config properly updates the fb · cc85e121
      Daniel Vetter authored
      Historically drm lacked fb refcounting, so the updating of crtc->fb
      was done by the lower levels at a point convenient to get their own
      refcounting (e.g. refcounts for the underlying gem bo, pinning
      refcounts) right. With the introduction of refcounted fbs the drm core
      handled the fb refcounts, but still relied on drivers to update the
      crtc->fb pointer (this approach required the least invasive changes in
      drivers).
      
      Enforce this contract with a WARN_ON.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      cc85e121
    • Daniel Vetter's avatar
      drm/crtc-helper: explicit DPMS on after modeset · 372835a8
      Daniel Vetter authored
      Atm the crtc helper implementation of set_config has really
      inconsisten semantics: If just an fb update is good enough, dpms state
      will be left as-is, but if we do a full modeset we force everything to
      dpms on.
      
      This change has already been applied to the i915 modeset code in
      
      commit e3de42b6
      Author: Imre Deak <imre.deak@intel.com>
      Date:   Fri May 3 19:44:07 2013 +0200
      
          drm/i915: force full modeset if the connector is in DPMS OFF mode
      
      which according to Greg KH seems to aim for a new record in most
      Bugzilla: links in a commit message.
      
      The history of this dpms forcing is pretty interesting. This patch
      here is an almost-revert of
      
      commit 811aaa55
      Author: Keith Packard <keithp@keithp.com>
      Date:   Thu Feb 3 16:57:28 2011 -0800
      
          drm: Only set DPMS ON when actually configuring a mode
      
      which fixed the bug of trying to dpms on disabled outputs, but
      introduced the new discrepancy between an fb update only and full
      modesets. The actual introduction of this goes back to
      
      commit bf9dc102
      Author: Keith Packard <keithp@keithp.com>
      Date:   Fri Nov 26 10:45:58 2010 -0800
      
          drm: Set connector DPMS status to ON in drm_crtc_helper_set_config
      
      And if you'd dig around in the i915 driver code there's even more fun
      around forcing dpms on and losing our heads and temper of the
      resulting inconsistencies. Especially the DP re-training code had tons
      of funny stuff in it.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      372835a8
    • Daniel Vetter's avatar
      drm/crtc-helper: no need to check for fb->depth/bpp · cbdfebc9
      Daniel Vetter authored
      ... since we already check for fb->pixel_format, which encodes all
      this. The other two fields are only for backwards compat of older
      drivers (and we might want to look into eventually just killing them).
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      cbdfebc9
    • Daniel Vetter's avatar
      drm/crtc-helpers: Enforce sane set_config api · e58de880
      Daniel Vetter authored
      There's no point in trying to clean up after driver-bugs, so just blow
      up. Furthermore it's an interface abuse to set no mode but have an fb
      and aslo to try to set an fb without enough connectors. These two
      spefici cases of interface abuse have been committed by the fb helper,
      but that's been fixed meanwhile in
      
      commit 7e53f3a4
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Mon Jan 21 10:52:17 2013 +0100
      
          drm/fb-helper: fixup set_config semantics
      
      The i915 driver has been shipping since a while with these BUGs with
      no reports, so should be save.
      
      Note that this drops an ugly case where we clear crtc->fb behind the
      upper levels back and so cause a refcounting mayhem, which Russell
      Kins spotted while trying to hunt down a drm framebuffer leak.
      Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e58de880
  4. 24 Jun, 2013 6 commits
  5. 23 Jun, 2013 1 commit
  6. 22 Jun, 2013 9 commits
  7. 21 Jun, 2013 1 commit
    • Linus Torvalds's avatar
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f71194a7
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin:
       "This series fixes a couple of build failures, and fixes MTRR cleanup
        and memory setup on very specific memory maps.
      
        Finally, it fixes triggering backtraces on all CPUs, which was
        inadvertently disabled on x86."
      
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/efi: Fix dummy variable buffer allocation
        x86: Fix trigger_all_cpu_backtrace() implementation
        x86: Fix section mismatch on load_ucode_ap
        x86: fix build error and kconfig for ia32_emulation and binfmt
        range: Do not add new blank slot with add_range_with_merge
        x86, mtrr: Fix original mtrr range get for mtrr_cleanup
      f71194a7