drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 (4805b7ce) · Commits · 戴 / test

Register ANALOGIX_DP_FUNC_EN_1(offset 0x18), Rockchip is different to Exynos: on Exynos edp phy, BIT 7 MASTER_VID_FUNC_EN_N BIT 6 reserved BIT 5 SLAVE_VID_FUNC_EN_N on Rockchip edp phy, BIT 7 reserved BIT 6 RK_VID_CAP_FUNC_EN_N BIT 5 RK_VID_FIFO_FUNC_EN_N So, we should do some private operations to Rockchip. Cc: Tomasz Figa <tfiga@chromium.org> Signed-off-by:

zain wang <wzz@rock-chips.com> Signed-off-by:

Sean Paul <seanpaul@chromium.org> Signed-off-by:

Thierry Escande <thierry.escande@collabora.com> Reviewed-by:

Andrzej Hajda <a.hajda@samsung.com> Signed-off-by:

Enric Balletbo i Serra <enric.balletbo@collabora.com> Tested-by:

Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by:

Archit Taneja <architt@codeaurora.org> Signed-off-by:

Andrzej Hajda <a.hajda@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180423105003.9004-17-enric.balletbo@collabora.com

drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -126,9 +126,14 @@ void analogix_dp_reset(struct analogix_dp_device *dp)
		analogix_dp_stop_video(dp);
		analogix_dp_enable_video_mute(dp, 0);

		if (dp->plat_data && is_rockchip(dp->plat_data->dev_type))
		reg = RK_VID_CAP_FUNC_EN_N \| RK_VID_FIFO_FUNC_EN_N \|
		SW_FUNC_EN_N;
		else
		reg = MASTER_VID_FUNC_EN_N \| SLAVE_VID_FUNC_EN_N \|
		AUD_FIFO_FUNC_EN_N \| AUD_FUNC_EN_N \|
		HDCP_FUNC_EN_N \| SW_FUNC_EN_N;

		writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);

		reg = SSC_FUNC_EN_N \| AUX_FUNC_EN_N \|
		@@ -971,8 +976,12 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp)
		u32 reg;

		reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
		if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) {
		reg &= ~(RK_VID_CAP_FUNC_EN_N \| RK_VID_FIFO_FUNC_EN_N);
		} else {
		reg &= ~(MASTER_VID_FUNC_EN_N \| SLAVE_VID_FUNC_EN_N);
		reg \|= MASTER_VID_FUNC_EN_N;
		}
		writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);

		reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);

drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -127,7 +127,9 @@

		/* ANALOGIX_DP_FUNC_EN_1 */
		#define MASTER_VID_FUNC_EN_N (0x1 << 7)
		#define RK_VID_CAP_FUNC_EN_N (0x1 << 6)
		#define SLAVE_VID_FUNC_EN_N (0x1 << 5)
		#define RK_VID_FIFO_FUNC_EN_N (0x1 << 5)
		#define AUD_FIFO_FUNC_EN_N (0x1 << 4)
		#define AUD_FUNC_EN_N (0x1 << 3)
		#define HDCP_FUNC_EN_N (0x1 << 2)

Admin message