@@ -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);
plane->old_fb = plane->fb;
plane_mask |= 1 << drm_plane_index(plane);
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@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(-)