1. 28 6月, 2013 4 次提交
  2. 27 6月, 2013 9 次提交
  3. 26 6月, 2013 11 次提交
  4. 25 6月, 2013 7 次提交
    • L
      Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · f97f7d2d
      Linus Torvalds 提交于
      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
    • D
      drm: fix fb leak in setcrtc · 5cef29aa
      Daniel Vetter 提交于
      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: NRussell King <linux@arm.linux.org.uk>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      5cef29aa
    • D
      drm: check that ->set_config properly updates the fb · cc85e121
      Daniel Vetter 提交于
      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: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      cc85e121
    • D
      drm/crtc-helper: explicit DPMS on after modeset · 372835a8
      Daniel Vetter 提交于
      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: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      372835a8
    • D
      drm/crtc-helper: no need to check for fb->depth/bpp · cbdfebc9
      Daniel Vetter 提交于
      ... 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: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      cbdfebc9
    • D
      drm/crtc-helpers: Enforce sane set_config api · e58de880
      Daniel Vetter 提交于
      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: NRussell King <linux@arm.linux.org.uk>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e58de880
    • R
      powerpc/pci: Fix boot panic on mpc83xx (regression) · b37e1613
      Rojhalat Ibrahim 提交于
      The following commit caused a fatal oops when booting on mpc83xx with
      a non-express PCI bus (regardless of whether a PCI device is present):
      
      commit 50d8f87d
      Author: Rojhalat Ibrahim <imr@rtschenk.de>
      Date:   Mon Apr 8 10:15:28 2013 +0200
      
          powerpc/fsl-pci Make PCIe hotplug work with Freescale PCIe controllers
      
          Up to now the PCIe link status on Freescale PCIe controllers was only
          checked once at boot time. So hotplug did not work. With this patch the
          link status is checked on every config read. PCIe devices not present at
          boot time are found after doing 'echo 1 >/sys/bus/pci/rescan'.
      Signed-off-by: NRojhalat Ibrahim <imr@rtschenk.de>
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      
      This patch fixes the issue by calling setup_indirect_pci for all device types.
      fsl_indirect_read_config is now only used for booke/86xx PCIe controllers.
      Reported-by: NMichael Guntsche <mike@it-loops.com>
      Cc: Scott Wood <scottwood@freescale.com>
      Signed-off-by: NRojhalat Ibrahim <imr@rtschenk.de>
      Signed-off-by: NScott Wood <scottwood@freescale.com>
      b37e1613
  5. 24 6月, 2013 6 次提交
  6. 23 6月, 2013 3 次提交