Unverified Commit f47f537c authored by Robert Foss's avatar Robert Foss
Browse files

Revert "Revert "drm/bridge: ti-sn65dsi86: Implement bridge connector operations for DP"" 



This commit was accidentally reverted instead of another commit, and
therefore needs to be reinstated.

This reverts commit 8c9c40ec.

Fixes: 8c9c40ec ("Revert "drm/bridge: ti-sn65dsi86: Implement bridge connector operations for DP"")
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220919102009.150503-2-robert.foss@linaro.org
parent e09523ad

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+28 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_bridge_connector.h>

#include <drm/drm_edid.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>
@@ -68,6 +69,7 @@ 
#define  BPP_18_RGB				BIT(0)

#define SN_HPD_DISABLE_REG			0x5C

#define  HPD_DISABLE				BIT(0)

#define  HPD_DEBOUNCED_STATE			BIT(4)

#define SN_GPIO_IO_REG				0x5E

#define  SN_GPIO_INPUT_SHIFT			4

#define  SN_GPIO_OUTPUT_SHIFT			0
@@ -1158,10 +1160,33 @@ static void ti_sn_bridge_atomic_post_disable(struct drm_bridge *bridge, 
	pm_runtime_put_sync(pdata->dev);

}



static enum drm_connector_status ti_sn_bridge_detect(struct drm_bridge *bridge)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);

	int val = 0;



	pm_runtime_get_sync(pdata->dev);

	regmap_read(pdata->regmap, SN_HPD_DISABLE_REG, &val);

	pm_runtime_put_autosuspend(pdata->dev);



	return val & HPD_DEBOUNCED_STATE ? connector_status_connected

					 : connector_status_disconnected;

}



static struct edid *ti_sn_bridge_get_edid(struct drm_bridge *bridge,

					  struct drm_connector *connector)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);



	return drm_get_edid(connector, &pdata->aux.ddc);

}



static const struct drm_bridge_funcs ti_sn_bridge_funcs = {

	.attach = ti_sn_bridge_attach,

	.detach = ti_sn_bridge_detach,

	.mode_valid = ti_sn_bridge_mode_valid,

	.get_edid = ti_sn_bridge_get_edid,

	.detect = ti_sn_bridge_detect,

	.atomic_pre_enable = ti_sn_bridge_atomic_pre_enable,

	.atomic_enable = ti_sn_bridge_atomic_enable,

	.atomic_disable = ti_sn_bridge_atomic_disable,
@@ -1257,6 +1282,9 @@ static int ti_sn_bridge_probe(struct auxiliary_device *adev, 
	pdata->bridge.type = pdata->next_bridge->type == DRM_MODE_CONNECTOR_DisplayPort

			   ? DRM_MODE_CONNECTOR_DisplayPort : DRM_MODE_CONNECTOR_eDP;



	if (pdata->bridge.type == DRM_MODE_CONNECTOR_DisplayPort)

		pdata->bridge.ops = DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_DETECT;



	drm_bridge_add(&pdata->bridge);



	ret = ti_sn_attach_host(pdata);