[PATCH 5/5] drm/i915: Bad pixel formats can't reach the sprite code

2012-05-24 Thread ville.syrj...@linux.intel.com
From: Ville Syrj?l? 

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? 
---
 drivers/gpu/drm/i915/intel_sprite.c |8 ++--
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 89631ff..e2abae6 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -77,9 +77,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 |= DVS_FORMAT_RGBX888;
-   break;
+   BUG();
}

if (obj->tiling_mode != I915_TILING_NONE)
@@ -251,9 +249,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)
-- 
1.7.3.4



[PATCH 5/5] drm/i915: Bad pixel formats can't reach the sprite code

2012-05-24 Thread ville . syrjala
From: Ville Syrjälä ville.syrj...@linux.intel.com

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.syrj...@linux.intel.com
---
 drivers/gpu/drm/i915/intel_sprite.c |8 ++--
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 89631ff..e2abae6 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -77,9 +77,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 |= DVS_FORMAT_RGBX888;
-   break;
+   BUG();
}
 
if (obj-tiling_mode != I915_TILING_NONE)
@@ -251,9 +249,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)
-- 
1.7.3.4

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel