From 78c8b4e61a6f09c5a75cc6a0d6b22021e8ca94ea Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 29 Aug 2019 17:22:58 +0800 Subject: [PATCH] drm/rockchip: driver: compare vmode picture_aspect_ratio Change-Id: I2d1e16d48876a5095d45e1c90e1389441c130d20 Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 5d0422d1dca2..b2f16cda1447 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -70,6 +70,7 @@ struct rockchip_drm_mode_set { int vdisplay; int vrefresh; int flags; + int picture_aspect_ratio; int crtc_hsync_end; int crtc_vsync_end; @@ -422,6 +423,9 @@ of_parse_display_resource(struct drm_device *drm_dev, struct device_node *route) if (!of_property_read_u32(route, "video,flags", &val)) set->flags = val; + if (!of_property_read_u32(route, "video,aspect_ratio", &val)) + set->picture_aspect_ratio = val; + if (!of_property_read_u32(route, "logo,ymirror", &val)) set->ymirror = val; @@ -628,7 +632,8 @@ static int setup_initial_state(struct drm_device *drm_dev, mode->crtc_hsync_end == set->crtc_hsync_end && mode->crtc_vsync_end == set->crtc_vsync_end && drm_mode_vrefresh(mode) == set->vrefresh && - mode->flags == set->flags) { + mode->flags == set->flags && + mode->picture_aspect_ratio == set->picture_aspect_ratio) { found = 1; match = 1; break;