[PATCH v2 4/4] drm/fb-helper: Apply panel orientation connector prop to the primary plane

[Daniel Vetter]

On Sun, Oct 01, 2017 at 05:33:17PM +0200, Hans de Goede wrote:
> Apply the "panel orientation" drm connector prop to the primary plane,
> so that fbcon and fbdev using userspace programs display the right way
> up.
> 
> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94894
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
> Changes in v2:
> -New patch in v2 of this patch-set
> ---
>  drivers/gpu/drm/drm_fb_helper.c | 53 +++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 51 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 1b8f013ffa65..75c409430a26 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -41,6 +41,7 @@
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
>  
> +#include "drm_crtc_internal.h"
>  #include "drm_crtc_helper_internal.h"
>  
>  static bool drm_fbdev_emulation = true;
> @@ -347,6 +348,53 @@ int drm_fb_helper_debug_leave(struct fb_info *info)
>  }
>  EXPORT_SYMBOL(drm_fb_helper_debug_leave);
>  
> +static int get_plane_rotation_from_panel_orientation(
> +	struct drm_fb_helper *fb_helper, struct drm_plane *plane)
> +{
> +	int i, rotation = DRM_MODE_ROTATE_0;
> +	struct drm_connector *conn;
> +	uint64_t valid_mask = 0;
> +
> +	drm_fb_helper_for_each_connector(fb_helper, i) {
> +		conn = fb_helper->connector_info[i]->connector;
> +		if (conn->state->crtc && conn->state->crtc->primary == plane) {
> +			switch (conn->display_info.panel_orientation) {
> +			case DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP:
> +				rotation = DRM_MODE_ROTATE_180;
> +				break;
> +			case DRM_MODE_PANEL_ORIENTATION_LEFT_UP:
> +				rotation = DRM_MODE_ROTATE_90;
> +				break;
> +			case DRM_MODE_PANEL_ORIENTATION_RIGHT_UP:
> +				rotation = DRM_MODE_ROTATE_270;
> +				break;
> +			}
> +			break;
> +		}
> +	}
> +
> +	/*
> +	 * Check the necessary rotation to compensate for the panel orientation
> +	 * is supported.
> +	 * Note currently we simply leave things as is when not supported, maybe
> +	 * we shouls set a hint in fb_info to tell fbcon to rotate in this case
> +	 * so that atleast the console ends up the right way. Maybe, but this:
> +	 * a) Is not necessary for any known models with a non upright panel
> +	 * b) Is tricky because fbcon rotation applies to all outputs rather
> +	 *    then a single one
> +	 */
> +	if (!plane->rotation_property)
> +		return DRM_MODE_ROTATE_0;
> +
> +	for (i = 0; i < plane->rotation_property->num_values; i++)
> +		valid_mask |= (1ULL << plane->rotation_property->values[i]);
> +
> +	if (rotation & ~valid_mask)
> +		return DRM_MODE_ROTATE_0;
> +
> +	return rotation;
> +}
> +
>  static int restore_fbdev_mode_atomic(struct drm_fb_helper *fb_helper, bool active)
>  {
>  	struct drm_device *dev = fb_helper->dev;
> @@ -376,8 +424,9 @@ static int restore_fbdev_mode_atomic(struct drm_fb_helper *fb_helper, bool activ
>  			goto out_state;
>  		}
>  
> -		plane_state->rotation = DRM_MODE_ROTATE_0;
> -
> +		plane_state->rotation =
> +			get_plane_rotation_from_panel_orientation(fb_helper,
> +								  plane);

This is the loop to reset all the planes to default values, feels a bit
awkward to change the rotation value in there. Also gives you that
unpretty loop to check you're on the right plane.

I think a cleaner way to do this would be:
- add a rotation member to struct drm_fb_helper_crtc
- set that when setting up the configuration drm_setup_crtcs
- look up crtc->primary plane_state and set it int the loop below this one
  here (which is the one that actually sets the mode)

Cheers, Daniel
>  		plane->old_fb = plane->fb;
>  		plane_mask |= 1 << drm_plane_index(plane);
>  
> -- 
> 2.14.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch