From 8debb7192f387811fa6b2b12376913639e822e90 Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Tue, 17 May 2022 09:31:41 +0000 Subject: [PATCH] drm/bridge: analogix_dp: Check if connector type is valid Fixes: 43f938cfbb8b ("drm/rockchip: analogix_dp: Support DP connector") Signed-off-by: Wyon Bi Change-Id: I8d3bbdead2d1128cfac0f7dfa8df38be58be6da9 --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index e1e292626250..256b4075bdc8 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1320,14 +1320,18 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, } if (!dp->plat_data->skip_connector) { + int connector_type = DRM_MODE_CONNECTOR_eDP; + + if (dp->plat_data->bridge && + dp->plat_data->bridge->type != DRM_MODE_CONNECTOR_Unknown) + connector_type = dp->plat_data->bridge->type; + connector = &dp->connector; connector->polled = DRM_CONNECTOR_POLL_HPD; ret = drm_connector_init(dp->drm_dev, connector, &analogix_dp_connector_funcs, - dp->plat_data->bridge ? - dp->plat_data->bridge->type : - DRM_MODE_CONNECTOR_eDP); + connector_type); if (ret) { DRM_ERROR("Failed to initialize connector with drm\n"); return ret;