From dd4ce0a5ed3916598e91bd3586b83a53e61ff475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Wed, 31 Oct 2012 17:50:21 +0200 Subject: [PATCH] --- yaml --- r: 345231 b: refs/heads/master c: 28d491df4c6b00f9148a9885dba1f36a078535dc h: refs/heads/master i: 345229: aeb1e488ea3fa92484ec2038289781c5e0720c34 345227: adac979522607ff558a4a12f2584874340dcff8f 345223: f7a8ee3ecbb56b7fef1cbef0af8291345a457d5b 345215: 3baeb372d98ea7aaa1dbb7c18e76bd685f31c4ca v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_sprite.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 16f2174e0caf..288d60de93c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd3c3cb352b66f40965c974765d605e34d779d9 +refs/heads/master: 28d491df4c6b00f9148a9885dba1f36a078535dc diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c index a337fe930b8b..827dcd4edf1c 100644 --- a/trunk/drivers/gpu/drm/i915/intel_sprite.c +++ b/trunk/drivers/gpu/drm/i915/intel_sprite.c @@ -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)