hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Add local 'fb' variables 

Add a local 'fb' variable to a few places to get rid of the
'crtc->primary->fb' stuff. Looks neater and helps me with my poor
coccinelle skills later.

While at it switch over to using the pixel format rather than
depth+bpp.

Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-2-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2016-11-18 21:52:37 +02:00
parent a1f761a592
commit 1967b34d5a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/i915/intel_overlay.c
View File

@ -658,6 +658,8 @@ static bool update_scaling_factors(struct intel_overlay *overlay,
static void update_colorkey(struct intel_overlay *overlay, static void update_colorkey(struct intel_overlay *overlay,
struct overlay_registers __iomem *regs) struct overlay_registers __iomem *regs)
{ {
const struct drm_framebuffer *fb =
overlay->crtc->base.primary->fb;
u32 key = overlay->color_key; u32 key = overlay->color_key;
u32 flags; u32 flags;
@ -665,24 +667,20 @@ static void update_colorkey(struct intel_overlay *overlay,
if (overlay->color_key_enabled) if (overlay->color_key_enabled)
flags |= DST_KEY_ENABLE; flags |= DST_KEY_ENABLE;
switch (overlay->crtc->base.primary->fb->bits_per_pixel) { switch (fb->pixel_format) {
case 8: case DRM_FORMAT_C8:
key = 0; key = 0;
flags |= CLK_RGB8I_MASK; flags |= CLK_RGB8I_MASK;
break; break;
case DRM_FORMAT_XRGB1555:
case 16:
if (overlay->crtc->base.primary->fb->depth == 15) {
key = RGB15_TO_COLORKEY(key); key = RGB15_TO_COLORKEY(key);
flags |= CLK_RGB15_MASK; flags |= CLK_RGB15_MASK;
} else { break;
case DRM_FORMAT_RGB565:
key = RGB16_TO_COLORKEY(key); key = RGB16_TO_COLORKEY(key);
flags |= CLK_RGB16_MASK; flags |= CLK_RGB16_MASK;
}
break; break;
default:
case 24:
case 32:
flags |= CLK_RGB24_MASK; flags |= CLK_RGB24_MASK;
break; break;
} }