Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d38e421 authored by Yakir Yang's avatar Yakir Yang Committed by Heiko Stuebner
Browse files

drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR 



Make sure the request PSR state takes effect in analogix_dp_send_psr_spd()
function, or print the sink PSR error state if we failed to apply the
requested PSR setting.

Cc: 征增 王 <wzz@rock-chips.com>
Cc: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: default avatarYakir Yang <ykk@rock-chips.com>
[seanpaul changed timeout loop to a readx poll]
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180309222327.18689-2-enric.balletbo@collabora.com
parent 2c17a436

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -122,8 +122,7 @@ int analogix_dp_enable_psr(struct analogix_dp_device *dp) 
	psr_vsc.DB0 = 0;

	psr_vsc.DB0 = 0;

	psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;

	psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;





	analogix_dp_send_psr_spd(dp, &psr_vsc);

	return analogix_dp_send_psr_spd(dp, &psr_vsc);

	return 0;

}

}

EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);

EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
@@ -149,8 +148,7 @@ int analogix_dp_disable_psr(struct analogix_dp_device *dp) 
	if (ret != 1)

	if (ret != 1)

		dev_err(dp->dev, "Failed to set DP Power0 %d\n", ret);

		dev_err(dp->dev, "Failed to set DP Power0 %d\n", ret);





	analogix_dp_send_psr_spd(dp, &psr_vsc);

	return analogix_dp_send_psr_spd(dp, &psr_vsc);

	return 0;

}

}

EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);

EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,8 @@ 
#define MAX_CR_LOOP 5

#define MAX_CR_LOOP 5

#define MAX_EQ_LOOP 5

#define MAX_EQ_LOOP 5





#define DP_TIMEOUT_PSR_LOOP_MS			300



/* DP_MAX_LANE_COUNT */

/* DP_MAX_LANE_COUNT */

#define DPCD_ENHANCED_FRAME_CAP(x)		(((x) >> 7) & 0x1)

#define DPCD_ENHANCED_FRAME_CAP(x)		(((x) >> 7) & 0x1)

#define DPCD_MAX_LANE_COUNT(x)			((x) & 0x1f)

#define DPCD_MAX_LANE_COUNT(x)			((x) & 0x1f)
@@ -247,7 +249,7 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp); 
void analogix_dp_enable_scrambling(struct analogix_dp_device *dp);

void analogix_dp_enable_scrambling(struct analogix_dp_device *dp);

void analogix_dp_disable_scrambling(struct analogix_dp_device *dp);

void analogix_dp_disable_scrambling(struct analogix_dp_device *dp);

void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp);

void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp);

void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

			     struct edp_vsc_psr *vsc);

			     struct edp_vsc_psr *vsc);

ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,

ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,

			     struct drm_dp_aux_msg *msg);

			     struct drm_dp_aux_msg *msg);

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

+31 −4
Original line number Original line Diff line number Diff line
@@ -10,10 +10,11 @@ 
 * option) any later version.

 * option) any later version.

 */

 */





#include <linux/device.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/io.h>

#include <linux/iopoll.h>





#include <drm/bridge/analogix_dp.h>

#include <drm/bridge/analogix_dp.h>
@@ -992,10 +993,25 @@ void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp) 
	writel(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON);

	writel(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON);

}

}





void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

static ssize_t analogix_dp_get_psr_status(struct analogix_dp_device *dp)

{

	ssize_t val;

	u8 status;



	val = drm_dp_dpcd_readb(&dp->aux, DP_PSR_STATUS, &status);

	if (val < 0) {

		dev_err(dp->dev, "PSR_STATUS read failed ret=%zd", val);

		return val;

	}

	return status;

}



int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

			     struct edp_vsc_psr *vsc)

			     struct edp_vsc_psr *vsc)

{

{

	unsigned int val;

	unsigned int val;

	int ret;

	ssize_t psr_status;





	/* don't send info frame */

	/* don't send info frame */

	val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);

	val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
@@ -1036,6 +1052,17 @@ void analogix_dp_send_psr_spd(struct analogix_dp_device *dp, 
	val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);

	val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);

	val |= IF_EN;

	val |= IF_EN;

	writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);

	writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);



	ret = readx_poll_timeout(analogix_dp_get_psr_status, dp, psr_status,

		psr_status >= 0 &&

		((vsc->DB1 && psr_status == DP_PSR_SINK_ACTIVE_RFB) ||

		(!vsc->DB1 && psr_status == DP_PSR_SINK_INACTIVE)), 1500,

		DP_TIMEOUT_PSR_LOOP_MS * 1000);

	if (ret) {

		dev_warn(dp->dev, "Failed to apply PSR %d\n", ret);

		return ret;

	}

	return 0;

}

}





ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,

ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,