[PATCH 4/5] drm/i915: pixel_size == cpp

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

Use drm_format_plane_cpp() to get 'pixel_size' in the sprite code.

Signed-off-by: Ville Syrj?l? 
---
 drivers/gpu/drm/i915/intel_sprite.c |   19 +++
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 363a16e..89631ff 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -48,7 +48,7 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
struct intel_plane *intel_plane = to_intel_plane(plane);
int pipe = intel_plane->pipe;
u32 sprctl, sprscale = 0;
-   int pixel_size;
+   int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0);

sprctl = I915_READ(SPRCTL(pipe));

@@ -60,32 +60,25 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
switch (fb->pixel_format) {
case DRM_FORMAT_XBGR:
sprctl |= SPRITE_FORMAT_RGBX888;
-   pixel_size = 4;
break;
case DRM_FORMAT_XRGB:
sprctl |= SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX;
-   pixel_size = 4;
break;
case DRM_FORMAT_YUYV:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YUYV;
-   pixel_size = 2;
break;
case DRM_FORMAT_YVYU:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YVYU;
-   pixel_size = 2;
break;
case DRM_FORMAT_UYVY:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_UYVY;
-   pixel_size = 2;
break;
case DRM_FORMAT_VYUY:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;
-   pixel_size = 2;
break;
default:
DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
sprctl |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
}

@@ -227,8 +220,9 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
struct drm_device *dev = plane->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_plane *intel_plane = to_intel_plane(plane);
-   int pipe = intel_plane->pipe, pixel_size;
+   int pipe = intel_plane->pipe;
u32 dvscntr, dvsscale;
+   int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0);

dvscntr = I915_READ(DVSCNTR(pipe));

@@ -240,32 +234,25 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
switch (fb->pixel_format) {
case DRM_FORMAT_XBGR:
dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;
-   pixel_size = 4;
break;
case DRM_FORMAT_XRGB:
dvscntr |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
case DRM_FORMAT_YUYV:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YUYV;
-   pixel_size = 2;
break;
case DRM_FORMAT_YVYU:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YVYU;
-   pixel_size = 2;
break;
case DRM_FORMAT_UYVY:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_UYVY;
-   pixel_size = 2;
break;
case DRM_FORMAT_VYUY:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_VYUY;
-   pixel_size = 2;
break;
default:
DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
dvscntr |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
}

-- 
1.7.3.4

[PATCH 4/5] drm/i915: pixel_size == cpp

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

Use drm_format_plane_cpp() to get 'pixel_size' in the sprite code.

Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
---
 drivers/gpu/drm/i915/intel_sprite.c |   19 +++
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 363a16e..89631ff 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -48,7 +48,7 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
struct intel_plane *intel_plane = to_intel_plane(plane);
int pipe = intel_plane-pipe;
u32 sprctl, sprscale = 0;
-   int pixel_size;
+   int pixel_size = drm_format_plane_cpp(fb-pixel_format, 0);
 
sprctl = I915_READ(SPRCTL(pipe));
 
@@ -60,32 +60,25 @@ ivb_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
switch (fb-pixel_format) {
case DRM_FORMAT_XBGR:
sprctl |= SPRITE_FORMAT_RGBX888;
-   pixel_size = 4;
break;
case DRM_FORMAT_XRGB:
sprctl |= SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX;
-   pixel_size = 4;
break;
case DRM_FORMAT_YUYV:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YUYV;
-   pixel_size = 2;
break;
case DRM_FORMAT_YVYU:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YVYU;
-   pixel_size = 2;
break;
case DRM_FORMAT_UYVY:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_UYVY;
-   pixel_size = 2;
break;
case DRM_FORMAT_VYUY:
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;
-   pixel_size = 2;
break;
default:
DRM_DEBUG_DRIVER(bad pixel format, assuming RGBX888\n);
sprctl |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
}
 
@@ -227,8 +220,9 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
struct drm_device *dev = plane-dev;
struct drm_i915_private *dev_priv = dev-dev_private;
struct intel_plane *intel_plane = to_intel_plane(plane);
-   int pipe = intel_plane-pipe, pixel_size;
+   int pipe = intel_plane-pipe;
u32 dvscntr, dvsscale;
+   int pixel_size = drm_format_plane_cpp(fb-pixel_format, 0);
 
dvscntr = I915_READ(DVSCNTR(pipe));
 
@@ -240,32 +234,25 @@ ilk_update_plane(struct drm_plane *plane, struct 
drm_framebuffer *fb,
switch (fb-pixel_format) {
case DRM_FORMAT_XBGR:
dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;
-   pixel_size = 4;
break;
case DRM_FORMAT_XRGB:
dvscntr |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
case DRM_FORMAT_YUYV:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YUYV;
-   pixel_size = 2;
break;
case DRM_FORMAT_YVYU:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YVYU;
-   pixel_size = 2;
break;
case DRM_FORMAT_UYVY:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_UYVY;
-   pixel_size = 2;
break;
case DRM_FORMAT_VYUY:
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_VYUY;
-   pixel_size = 2;
break;
default:
DRM_DEBUG_DRIVER(bad pixel format, assuming RGBX888\n);
dvscntr |= DVS_FORMAT_RGBX888;
-   pixel_size = 4;
break;
}
 
-- 
1.7.3.4

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