Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14152c8d authored Oct 01, 2015 by Joonas Lahtinen Committed by Daniel Vetter Oct 05, 2015

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>

parent 62209070

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -633,7 +633,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
		if (!state->bpp[i])
		return -EINVAL;

		switch (state->base.rotation & 0xf) {
		switch (state->base.rotation & DRM_ROTATE_MASK) {
		case BIT(DRM_ROTATE_90):
		offset = ((y_offset + state->src_y + patched_src_w - 1) /
		ydiv) * fb->pitches[i];

drivers/gpu/drm/drm_crtc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5629,7 +5629,8 @@ unsigned int drm_rotation_simplify(unsigned int rotation,
		{
		if (rotation & ~supported_rotations) {
		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;

drivers/gpu/drm/drm_rect.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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):
		break;
		case BIT(DRM_ROTATE_90):
		@@ -390,7 +390,7 @@ void drm_rect_rotate_inv(struct drm_rect *r,
		{
		struct drm_rect tmp;

		switch (rotation & 0xf) {
		switch (rotation & DRM_ROTATE_MASK) {
		case BIT(DRM_ROTATE_0):
		break;
		case BIT(DRM_ROTATE_90):

drivers/gpu/drm/omapdrm/omap_fb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
		uint32_t w = win->src_w;
		uint32_t h = win->src_h;

		switch (win->rotation & 0xf) {
		switch (win->rotation & DRM_ROTATE_MASK) {
		default:
		dev_err(fb->dev->dev, "invalid rotation: %02x",
		(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->screen_width = omap_gem_tiled_stride(plane->bo, orient);
		} else {
		switch (win->rotation & 0xf) {
		switch (win->rotation & DRM_ROTATE_MASK) {
		case 0:
		case BIT(DRM_ROTATE_0):
		/* OK */

drivers/gpu/drm/omapdrm/omap_plane.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
		win.src_x = state->src_x >> 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_270):
		win.src_w = state->src_h >> 16;