drm/i915: Error out when trying to set a y-tiled as a sprite

v2: Use a switch for consistency (Chris Wilson)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index e69035d40aee5f1a298023385d4c8b4bfa93eb13..f9001af4a30d2093d27d76e857ceec98bad1fad3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -450,6 +450,15 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
        if (intel_plane->pipe != intel_crtc->pipe)
                return -EINVAL;
 
+       /* Sprite planes can be linear or x-tiled surfaces */
+       switch (obj->tiling_mode) {
+               case I915_TILING_NONE:
+               case I915_TILING_X:
+                       break;
+               default:
+                       return -EINVAL;
+       }
+
        /*
         * Clamp the width & height into the visible area.  Note we don't
         * try to scale the source if part of the visible region is offscreen.