]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/i915: Bad pixel formats can't reach the sprite code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 31 Oct 2012 15:50:21 +0000 (17:50 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 11 Nov 2012 22:51:14 +0000 (23:51 +0100)
The framebuffer pixel format is already checked by the common code.
So there's no way an invalid format could reach the driver. So instead
of falling back to a default format, call BUG().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_sprite.c

index a337fe930b8b362f818e781c67e4f520a4530c49..827dcd4edf1c31eff9018c7c9bec37139e93602f 100644 (file)
@@ -79,9 +79,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
                sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;
                break;
        default:
-               DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
-               sprctl |= SPRITE_FORMAT_RGBX888;
-               break;
+               BUG();
        }
 
        if (obj->tiling_mode != I915_TILING_NONE)
@@ -263,9 +261,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
                dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_VYUY;
                break;
        default:
-               DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
-               dvscntr |= DVS_FORMAT_RGBX888;
-               break;
+               BUG();
        }
 
        if (obj->tiling_mode != I915_TILING_NONE)