From 94d85f7bddf88b037c1e529d5b15a53c8a7e55b1 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 29 Aug 2019 17:38:34 +0800 Subject: [PATCH] drm/rockchip: add picture aspect ratio define Change-Id: Ie1d8313afe5f24596a989f7c8f290c734815f036 Signed-off-by: Sandy Huang --- drivers/video/drm/rockchip_display.c | 1 + include/drm_modes.h | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/video/drm/rockchip_display.c b/drivers/video/drm/rockchip_display.c index ffb0fc8753..eadcd601ac 100644 --- a/drivers/video/drm/rockchip_display.c +++ b/drivers/video/drm/rockchip_display.c @@ -1497,6 +1497,7 @@ void rockchip_display_fixup(void *blob) FDT_SET_U32("video,vrefresh", drm_mode_vrefresh(&s->conn_state.mode)); FDT_SET_U32("video,flags", s->conn_state.mode.flags); + FDT_SET_U32("video,aspect_ratio", s->conn_state.mode.picture_aspect_ratio); FDT_SET_U32("overscan,left_margin", s->conn_state.overscan.left_margin); FDT_SET_U32("overscan,right_margin", s->conn_state.overscan.right_margin); FDT_SET_U32("overscan,top_margin", s->conn_state.overscan.top_margin); diff --git a/include/drm_modes.h b/include/drm_modes.h index 337f59ee30..2aa5374839 100644 --- a/include/drm_modes.h +++ b/include/drm_modes.h @@ -36,13 +36,33 @@ #define DRM_MODE_FLAG_PIXMUX (1 << 11) #define DRM_MODE_FLAG_DBLCLK (1 << 12) #define DRM_MODE_FLAG_CLKDIV2 (1 << 13) -#define DRM_MODE_FLAG_PPIXDATA BIT(31) +#define DRM_MODE_FLAG_PPIXDATA BIT(31) /* Panel Mirror control */ #define DRM_MODE_FLAG_XMIRROR (1<<28) #define DRM_MODE_FLAG_YMIRROR (1<<29) #define DRM_MODE_FLAG_XYMIRROR (DRM_MODE_FLAG_XMIRROR | DRM_MODE_FLAG_YMIRROR) +/* Picture aspect ratio options */ +#define DRM_MODE_PICTURE_ASPECT_NONE 0 +#define DRM_MODE_PICTURE_ASPECT_4_3 1 +#define DRM_MODE_PICTURE_ASPECT_16_9 2 +#define DRM_MODE_PICTURE_ASPECT_64_27 3 +#define DRM_MODE_PICTURE_ASPECT_256_135 4 + +/* Aspect ratio flag bitmask (4 bits 22:19) */ +#define DRM_MODE_FLAG_PIC_AR_MASK (0x0F << 19) +#define DRM_MODE_FLAG_PIC_AR_NONE \ + (DRM_MODE_PICTURE_ASPECT_NONE << 19) +#define DRM_MODE_FLAG_PIC_AR_4_3 \ + (DRM_MODE_PICTURE_ASPECT_4_3 << 19) +#define DRM_MODE_FLAG_PIC_AR_16_9 \ + (DRM_MODE_PICTURE_ASPECT_16_9 << 19) +#define DRM_MODE_FLAG_PIC_AR_64_27 \ + (DRM_MODE_PICTURE_ASPECT_64_27 << 19) +#define DRM_MODE_FLAG_PIC_AR_256_135 \ + (DRM_MODE_PICTURE_ASPECT_256_135 << 19) + #define DRM_MODE_CONNECTOR_Unknown 0 #define DRM_MODE_CONNECTOR_VGA 1 #define DRM_MODE_CONNECTOR_DVII 2