Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

Pull drm fixes from Dave Airlie:
 "Exynos and Intel fixes.

  The intel fixes are fairly straightforward, mostly reverts due to bugs
  found.  The exynos one is a big larger since they found some issues
  with the G2D engine and iommu interaction, and needed to verify the
  operations a lot better than they were previously, otherwise a user
  app can just crash the kernel with an iommu fault."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/i915: write backlight harder"
  drm/i915: don't disable the power well yet
  Revert "drm/i915: set TRANSCODER_EDP even earlier"
  drm/exynos: Check g2d cmd list for g2d restrictions
  drm/exynos: Add a new function to get gem buffer size
  drm/exynos: Deal with g2d buffer info more efficiently
  drm/exynos: Clean up some G2D codes for readability
  drm/exynos: Fix G2D core malfunctioning issue
  drm/exynos: clear node object type at gem unmap
  drm/exynos: Fix error routine to getting dma addr.
  drm/exynos: Replaced kzalloc & memcpy with kmemdup
  drm/exynos: fimd: calculate the correct address offset
  drm/exynos: Make mixer_check_timing static
  drm/exynos: modify the compatible string for exynos fimd

...

This commit is contained in:

Linus Torvalds 2013-03-25 02:57:32 -07:00

parent 3912a677f6 7ac8833f59

commit c4052ba9da

11 changed files with 384 additions and 73 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

drivers/gpu/drm/exynos/exynos_drm_fimd.c

View file

370

drivers/gpu/drm/exynos/exynos_drm_g2d.c

View file

21

drivers/gpu/drm/exynos/exynos_drm_gem.c

View file

5

drivers/gpu/drm/exynos/exynos_drm_gem.h

View file

6

drivers/gpu/drm/exynos/exynos_drm_vidi.c

View file

2

drivers/gpu/drm/exynos/exynos_mixer.c

View file

5

drivers/gpu/drm/i915/i915_drv.c

View file

1

drivers/gpu/drm/i915/i915_drv.h

View file

10

drivers/gpu/drm/i915/intel_display.c

View file

13

drivers/gpu/drm/i915/intel_panel.c

View file

3

drivers/gpu/drm/i915/intel_pm.c

View file