Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fa50dc3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

one oops fixes and a 0-length allocation fix from next backported.

* tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Reject the colorkey ioctls for primary and cursor planes
  drm/i915: Skip allocating shadow batch for 0-length batches
parents c7d74874 840a1cf0

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
		goto err;

	}



	if (i915_needs_cmd_parser(ring)) {

	if (i915_needs_cmd_parser(ring) && args->batch_len) {

		batch_obj = i915_gem_execbuffer_parse(ring,

						      &shadow_exec_entry,

						      eb,

drivers/gpu/drm/i915/intel_sprite.c

+2 −2
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data, 
	drm_modeset_lock_all(dev);



	plane = drm_plane_find(dev, set->plane_id);

	if (!plane) {

	if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {

		ret = -ENOENT;

		goto out_unlock;

	}
@@ -1349,7 +1349,7 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data, 
	drm_modeset_lock_all(dev);



	plane = drm_plane_find(dev, get->plane_id);

	if (!plane) {

	if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {

		ret = -ENOENT;

		goto out_unlock;

	}