aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinaro CI <ci_notify@linaro.org>2020-12-04 06:22:19 +0000
committerLinaro CI <ci_notify@linaro.org>2020-12-04 06:22:19 +0000
commit409fd1a66cc1d5aed6835151849f2eb40e4b4521 (patch)
tree1674d798374697835ddb2c1b4da0ffe03bd653bf
parent9bc25c292ba2cec5caaddd751e27efce5023ae6c (diff)
parentc81881456f5e5c569f58a662464e7dd13c0b958a (diff)
Merge remote-tracking branch 'lt9611-fix-4k/tracking-qcomlt-lt9611-fix-4k' into integration-linux-qcomlt
-rw-r--r--drivers/gpu/drm/bridge/lontium-lt9611.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index d734d9402c35..e8eb8deb444b 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -867,8 +867,14 @@ static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_mode *mode)
{
struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode);
+ struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
- return lt9611_mode ? MODE_OK : MODE_BAD;
+ if (!lt9611_mode)
+ return MODE_BAD;
+ else if (lt9611_mode->intfs > 1 && !lt9611->dsi1)
+ return MODE_PANEL;
+ else
+ return MODE_OK;
}
static void lt9611_bridge_pre_enable(struct drm_bridge *bridge)