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

Commit d83fc0a8 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: change rotate/reflect constant to new DRM convention" into msm-4.9

parents 86d429c1 531f5574

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int msm_disable_all_modes_commit( 
			goto fail;

		}



		plane_state->rotation = BIT(DRM_ROTATE_0);

		plane_state->rotation = DRM_ROTATE_0;



		plane->old_fb = plane->fb;

		plane_mask |= 1 << drm_plane_index(plane);

drivers/gpu/drm/msm/sde/sde_plane.c

+3 −3
Original line number Diff line number Diff line
@@ -1274,10 +1274,10 @@ static int _sde_plane_mode_set(struct drm_plane *plane, 
		SDE_DEBUG_PLANE(psde, "rotation 0x%llX\n",

			sde_plane_get_property(pstate, PLANE_PROP_ROTATION));

		if (sde_plane_get_property(pstate, PLANE_PROP_ROTATION) &

			BIT(DRM_REFLECT_X))

			DRM_REFLECT_X)

			src_flags |= SDE_SSPP_FLIP_LR;

		if (sde_plane_get_property(pstate, PLANE_PROP_ROTATION) &

			BIT(DRM_REFLECT_Y))

			DRM_REFLECT_Y)

			src_flags |= SDE_SSPP_FLIP_UD;



		/* update format */
@@ -1874,7 +1874,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 


	/* standard properties */

	msm_property_install_rotation(&psde->property_info,

		(unsigned int) (BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y)),

		(unsigned int) (DRM_REFLECT_X | DRM_REFLECT_Y),

		PLANE_PROP_ROTATION);



	msm_property_install_enum(&psde->property_info, "blend_op", 0x0, 0,