[git pull] drm fixes

Dave Airlie
2015-04-03T00:17:47Z

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2806 bytes --]

Hi Linus,

one drm core fix, one exynos regression fix, two sets of radeon fixes
(Alex was a bit behind last week), and two i915 fixes.

Nothing too serious we seem to have calmed down i915 since last week.

Dave.

The following changes since commit e42391cd048809d903291d07f86ed3934ce138e9:

Linux 4.0-rc6 (2015-03-29 15:26:31 -0700)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 51b52fac9b4ece9ec0c27a39b0ae1b3b4a829df9:

Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2015-04-03 09:28:55 +1000)

----------------------------------------------------------------

Alex Deucher (1):
drm/radeon/dpm: fix 120hz handling harder

Chris Wilson (1):
drm/i915: Skip allocating shadow batch for 0-length batches

Christian König (4):
drm/radeon: always dump the ring content if it's available
drm/radeon: programm the VCE fw BAR as well
drm/radeon: add extra check in radeon_ttm_tt_unpin_userptr
drm/radeon: fix wait in radeon_mn_invalidate_range_start

Daniel Stone (1):
drm: Exynos: Respect framebuffer pitch for FIMD/Mixer

Dave Airlie (5):
Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'topic/drm-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Merge tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes
Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

David Miller (1):
radeon: Do not directly dereference pointers to BIOS area.

Jani Nikula (1):
drm/edid: set ELD for firmware and debugfs override EDIDs

Ville Syrjälä (1):
drm/i915: Reject the colorkey ioctls for primary and cursor planes

drivers/gpu/drm/drm_edid_load.c | 1 +
drivers/gpu/drm/drm_probe_helper.c | 1 +
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 +++++---
drivers/gpu/drm/exynos/exynos_mixer.c | 17 ++++++++++-------
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/intel_sprite.c | 4 ++--
drivers/gpu/drm/radeon/cikd.h | 1 +
drivers/gpu/drm/radeon/radeon.h | 1 +
drivers/gpu/drm/radeon/radeon_bios.c | 10 +++++++---
drivers/gpu/drm/radeon/radeon_mn.c | 11 ++++-------
drivers/gpu/drm/radeon/radeon_pm.c | 22 +++++++++++++++++-----
drivers/gpu/drm/radeon/radeon_ring.c | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++++
drivers/gpu/drm/radeon/vce_v2_0.c | 3 +++
14 files changed, 58 insertions(+), 29 deletions(-)