[PULL] drm-intel-fixes

[Jani Nikula]

Hi Dave -

A colorkey ioctl oops fix from Ville, cc: stable, and a backport of
Chris' 0-length batch allocation fix from drm-next.


BR,
Jani.


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://anongit.freedesktop.org/drm-intel tags/drm-intel-fixes-2015-04-02

for you to fetch changes up to 840a1cf0cd533f30da792527ca5ff6a023d4a727:

  drm/i915: Reject the colorkey ioctls for primary and cursor planes (2015-04-02 11:25:50 +0300)

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

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

 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
 drivers/gpu/drm/i915/intel_sprite.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
Jani Nikula, Intel Open Source Technology Center