p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm: Use DRM_ROTATE_MASK and DRM_REFLECT_MASK 

Avoid magic numbers and use the introduced defines.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Joonas Lahtinen 2015-10-01 10:00:58 +03:00 committed by Daniel Vetter
parent 6220907089
commit 14152c8d30
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View File

@ -633,7 +633,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
if (!state->bpp[i]) if (!state->bpp[i])
return -EINVAL; return -EINVAL;
switch (state->base.rotation & 0xf) { switch (state->base.rotation & DRM_ROTATE_MASK) {
case BIT(DRM_ROTATE_90): case BIT(DRM_ROTATE_90):
offset = ((y_offset + state->src_y + patched_src_w - 1) / offset = ((y_offset + state->src_y + patched_src_w - 1) /
ydiv) * fb->pitches[i]; ydiv) * fb->pitches[i];

3
drivers/gpu/drm/drm_crtc.c
View File

@ -5629,7 +5629,8 @@ unsigned int drm_rotation_simplify(unsigned int rotation,
{ {
if (rotation & ~supported_rotations) { if (rotation & ~supported_rotations) {
rotation ^= BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y); rotation ^= BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y);
rotation = (rotation & ~0xf) | BIT((ffs(rotation & 0xf) + 1) % 4); rotation = (rotation & DRM_REFLECT_MASK) |
BIT((ffs(rotation & DRM_ROTATE_MASK) + 1) % 4);
} }
return rotation; return rotation;

4
drivers/gpu/drm/drm_rect.c
View File

@ -330,7 +330,7 @@ void drm_rect_rotate(struct drm_rect *r,
} }
} }
switch (rotation & 0xf) { switch (rotation & DRM_ROTATE_MASK) {
case BIT(DRM_ROTATE_0): case BIT(DRM_ROTATE_0):
break; break;
case BIT(DRM_ROTATE_90): case BIT(DRM_ROTATE_90):
@ -390,7 +390,7 @@ void drm_rect_rotate_inv(struct drm_rect *r,
{ {
struct drm_rect tmp; struct drm_rect tmp;
switch (rotation & 0xf) { switch (rotation & DRM_ROTATE_MASK) {
case BIT(DRM_ROTATE_0): case BIT(DRM_ROTATE_0):
break; break;
case BIT(DRM_ROTATE_90): case BIT(DRM_ROTATE_90):

4
drivers/gpu/drm/omapdrm/omap_fb.c
View File

@ -171,7 +171,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
uint32_t w = win->src_w; uint32_t w = win->src_w;
uint32_t h = win->src_h; uint32_t h = win->src_h;
switch (win->rotation & 0xf) { switch (win->rotation & DRM_ROTATE_MASK) {
default: default:
dev_err(fb->dev->dev, "invalid rotation: %02x", dev_err(fb->dev->dev, "invalid rotation: %02x",
(uint32_t)win->rotation); (uint32_t)win->rotation);
@ -209,7 +209,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
info->rotation_type = OMAP_DSS_ROT_TILER; info->rotation_type = OMAP_DSS_ROT_TILER;
info->screen_width = omap_gem_tiled_stride(plane->bo, orient); info->screen_width = omap_gem_tiled_stride(plane->bo, orient);
} else { } else {
switch (win->rotation & 0xf) { switch (win->rotation & DRM_ROTATE_MASK) {
case 0: case 0:
case BIT(DRM_ROTATE_0): case BIT(DRM_ROTATE_0):
/* OK */ /* OK */

2
drivers/gpu/drm/omapdrm/omap_plane.c
View File

@ -108,7 +108,7 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
win.src_x = state->src_x >> 16; win.src_x = state->src_x >> 16;
win.src_y = state->src_y >> 16; win.src_y = state->src_y >> 16;
switch (state->rotation & 0xf) { switch (state->rotation & DRM_ROTATE_MASK) {
case BIT(DRM_ROTATE_90): case BIT(DRM_ROTATE_90):
case BIT(DRM_ROTATE_270): case BIT(DRM_ROTATE_270):
win.src_w = state->src_h >> 16; win.src_w = state->src_h >> 16;