diff mbox series

drm/msm/dpu: add rotation property

Message ID 20190822015756.30807-1-robdclark@gmail.com (mailing list archive)
State Superseded
Headers show
Series drm/msm/dpu: add rotation property | expand

Commit Message

Rob Clark Aug. 22, 2019, 1:57 a.m. UTC 
From: Rob Clark <robdclark@chromium.org>

Signed-off-by: Rob Clark <robdclark@chromium.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

Comments

Ville Syrjälä Aug. 22, 2019, 12:26 p.m. UTC | #1 
On Wed, Aug 21, 2019 at 06:57:24PM -0700, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
> 
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 45bfac9e3af7..c5653771e8fa 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1040,8 +1040,21 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
>  				pstate->multirect_mode);
>  
>  	if (pdpu->pipe_hw->ops.setup_format) {
> +		unsigned int rotation;
> +
>  		src_flags = 0x0;
>  
> +		rotation = drm_rotation_simplify(state->rotation,
> +						 DRM_MODE_ROTATE_0 |
> +						 DRM_MODE_REFLECT_X |
> +						 DRM_MODE_REFLECT_Y);
> +
> +		if (rotation & DRM_MODE_REFLECT_X)
> +			src_flags |= DPU_SSPP_FLIP_UD;
> + 
> +		if (rotation & DRM_MODE_REFLECT_Y)
> +			src_flags |= DPU_SSPP_FLIP_LR;
> +

UD vs. LR (assuming those mean what I think they mean) seem the wrong
way around here.

>
>  		/* update format */
>  		pdpu->pipe_hw->ops.setup_format(pdpu->pipe_hw, fmt, src_flags,
>  				pstate->multirect_index);
> @@ -1522,6 +1535,13 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev,
>  	if (ret)
>  		DPU_ERROR("failed to install zpos property, rc = %d\n", ret);
>  
> +	drm_plane_create_rotation_property(plane,
> +			DRM_MODE_ROTATE_0,
> +			DRM_MODE_ROTATE_0 |
> +			DRM_MODE_ROTATE_180 |
> +			DRM_MODE_REFLECT_X |
> +			DRM_MODE_REFLECT_Y);
> +
>  	drm_plane_enable_fb_damage_clips(plane);
>  
>  	/* success! finalize initialization */
> -- 
> 2.21.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Clark Aug. 22, 2019, 3:45 p.m. UTC | #2 
On Thu, Aug 22, 2019 at 5:26 AM Ville Syrjälä
<ville.syrjala@linux.intel.com> wrote:
>
> On Wed, Aug 21, 2019 at 06:57:24PM -0700, Rob Clark wrote:
> > From: Rob Clark <robdclark@chromium.org>
> >
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> > index 45bfac9e3af7..c5653771e8fa 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> > @@ -1040,8 +1040,21 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
> >                               pstate->multirect_mode);
> >
> >       if (pdpu->pipe_hw->ops.setup_format) {
> > +             unsigned int rotation;
> > +
> >               src_flags = 0x0;
> >
> > +             rotation = drm_rotation_simplify(state->rotation,
> > +                                              DRM_MODE_ROTATE_0 |
> > +                                              DRM_MODE_REFLECT_X |
> > +                                              DRM_MODE_REFLECT_Y);
> > +
> > +             if (rotation & DRM_MODE_REFLECT_X)
> > +                     src_flags |= DPU_SSPP_FLIP_UD;
> > +
> > +             if (rotation & DRM_MODE_REFLECT_Y)
> > +                     src_flags |= DPU_SSPP_FLIP_LR;
> > +
>
> UD vs. LR (assuming those mean what I think they mean) seem the wrong
> way around here.

ahh, right, reflect "along" vs "around"..

BR,
-R

>
> >
> >               /* update format */
> >               pdpu->pipe_hw->ops.setup_format(pdpu->pipe_hw, fmt, src_flags,
> >                               pstate->multirect_index);
> > @@ -1522,6 +1535,13 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev,
> >       if (ret)
> >               DPU_ERROR("failed to install zpos property, rc = %d\n", ret);
> >
> > +     drm_plane_create_rotation_property(plane,
> > +                     DRM_MODE_ROTATE_0,
> > +                     DRM_MODE_ROTATE_0 |
> > +                     DRM_MODE_ROTATE_180 |
> > +                     DRM_MODE_REFLECT_X |
> > +                     DRM_MODE_REFLECT_Y);
> > +
> >       drm_plane_enable_fb_damage_clips(plane);
> >
> >       /* success! finalize initialization */
> > --
> > 2.21.0
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Ville Syrjälä
> Intel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 45bfac9e3af7..c5653771e8fa 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1040,8 +1040,21 @@  static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
 				pstate->multirect_mode);
 
 	if (pdpu->pipe_hw->ops.setup_format) {
+		unsigned int rotation;
+
 		src_flags = 0x0;
 
+		rotation = drm_rotation_simplify(state->rotation,
+						 DRM_MODE_ROTATE_0 |
+						 DRM_MODE_REFLECT_X |
+						 DRM_MODE_REFLECT_Y);
+
+		if (rotation & DRM_MODE_REFLECT_X)
+			src_flags |= DPU_SSPP_FLIP_UD;
+
+		if (rotation & DRM_MODE_REFLECT_Y)
+			src_flags |= DPU_SSPP_FLIP_LR;
+
 		/* update format */
 		pdpu->pipe_hw->ops.setup_format(pdpu->pipe_hw, fmt, src_flags,
 				pstate->multirect_index);
@@ -1522,6 +1535,13 @@  struct drm_plane *dpu_plane_init(struct drm_device *dev,
 	if (ret)
 		DPU_ERROR("failed to install zpos property, rc = %d\n", ret);
 
+	drm_plane_create_rotation_property(plane,
+			DRM_MODE_ROTATE_0,
+			DRM_MODE_ROTATE_0 |
+			DRM_MODE_ROTATE_180 |
+			DRM_MODE_REFLECT_X |
+			DRM_MODE_REFLECT_Y);
+
 	drm_plane_enable_fb_damage_clips(plane);
 
 	/* success! finalize initialization */