Commit 63885c16 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/dsi: Support NO_CONNECTOR bridges 



For now, since we have a mix of bridges which support this flag, which
which do *not* support this flag, or work both ways, try it once with
NO_CONNECTOR and then fall back to the old way if that doesn't work.
Eventually we can drop the fallback path.

v2: Add missing drm_connector_attach_encoder() so display actually comes
    up when the bridge properly handles the NO_CONNECTOR flag

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210920225801.227211-2-robdclark@gmail.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 64739f33

drivers/gpu/drm/msm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ config DRM_MSM 
	select REGULATOR

	select DRM_KMS_HELPER

	select DRM_PANEL

	select DRM_BRIDGE

	select DRM_PANEL_BRIDGE

	select DRM_SCHED

	select SHMEM

	select TMPFS

drivers/gpu/drm/msm/dsi/dsi_manager.c

+37 −13
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 */



#include "drm/drm_bridge_connector.h"



#include "msm_kms.h"

#include "dsi.h"
@@ -688,10 +690,10 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) 
{

	struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);

	struct drm_device *dev = msm_dsi->dev;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	struct drm_bridge *int_bridge, *ext_bridge;

	struct drm_connector *connector;

	struct list_head *connector_list;

	int ret;



	int_bridge = msm_dsi->bridge;

	ext_bridge = msm_dsi->external_bridge =
@@ -699,6 +701,17 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) 


	encoder = msm_dsi->encoder;



	/*

	 * Try first to create the bridge without it creating its own

	 * connector.. currently some bridges support this, and others

	 * do not (and some support both modes)

	 */

	ret = drm_bridge_attach(encoder, ext_bridge, int_bridge,

			DRM_BRIDGE_ATTACH_NO_CONNECTOR);

	if (ret == -EINVAL) {

		struct drm_connector *connector;

		struct list_head *connector_list;



		/* link the internal dsi bridge to the external bridge */

		drm_bridge_attach(encoder, ext_bridge, int_bridge, 0);
@@ -717,6 +730,17 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) 
		return ERR_PTR(-ENODEV);

	}



	connector = drm_bridge_connector_init(dev, encoder);

	if (IS_ERR(connector)) {

		DRM_ERROR("Unable to create bridge connector\n");

		return ERR_CAST(connector);

	}



	drm_connector_attach_encoder(connector, encoder);



	return connector;

}



void msm_dsi_manager_bridge_destroy(struct drm_bridge *bridge)

{

}