shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: dw_hdmi-qp: support show split mode logo

Browse Source 
Change-Id: I13d62aee86ba911253112be6709d84e86213a59e
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
This commit is contained in:
Zhang Yubing
2023-02-13 15:50:37 +08:00
committed by Tao Huang
parent f06f540a36
commit d0954732ea
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
View File

@@ -2359,7 +2359,7 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
struct drm_crtc_state *crtc_state, *old_crtc_state;
struct dw_hdmi_qp *hdmi =
container_of(connector, struct dw_hdmi_qp, connector);
struct drm_display_mode *mode = NULL;
struct drm_display_mode mode;
void *data = hdmi->plat_data->phy_data;
struct hdmi_vmode_qp *vmode = &hdmi->hdmi_data.video_mode;
@@ -2382,13 +2382,21 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
if (hdmi->plat_data->get_vp_id)
hdmi->vp_id = hdmi->plat_data->get_vp_id(crtc_state);
mode = &crtc_state->mode;
memcpy(&mode, &crtc_state->mode, sizeof(mode));
/*
* If HDMI is enabled in uboot, it's need to record
* drm_display_mode and set phy status to enabled.
*/
if (!vmode->mpixelclock) {
struct dw_hdmi_qp *secondary = NULL;
if (hdmi->plat_data->left)
secondary = hdmi->plat_data->left;
else if (hdmi->plat_data->right)
secondary = hdmi->plat_data->right;
hdmi->curr_conn = connector;
if (secondary)
secondary->curr_conn = connector;
if (hdmi->plat_data->get_enc_in_encoding)
hdmi->hdmi_data.enc_in_encoding =
hdmi->plat_data->get_enc_in_encoding(data);
@@ -2403,13 +2411,13 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
hdmi->plat_data->get_output_bus_format(data);
if (hdmi->plat_data->split_mode) {
hdmi->plat_data->convert_to_origin_mode(mode);
mode->crtc_clock /= 2;
hdmi->plat_data->convert_to_origin_mode(&mode);
mode.crtc_clock /= 2;
}
memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode));
vmode->mpixelclock = mode->crtc_clock * 1000;
vmode->previous_pixelclock = mode->clock;
vmode->previous_tmdsclock = mode->clock;
memcpy(&hdmi->previous_mode, &mode, sizeof(hdmi->previous_mode));
vmode->mpixelclock = mode.crtc_clock * 1000;
vmode->previous_pixelclock = mode.clock;
vmode->previous_tmdsclock = mode.clock;
vmode->mtmdsclock = hdmi_get_tmdsclock(hdmi,
vmode->mpixelclock);
if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format))
@@ -2440,7 +2448,7 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
return PTR_ERR(crtc_state);
crtc_state->mode_changed = true;
if (mode->clock > 600000)
if (mode.clock > 600000)
hdmi->frl_switch = true;
}
@@ -2621,7 +2629,7 @@ static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge,
if (hdmi->phy.ops->disable && !hdmi->frl_switch) {
hdmi_writel(hdmi, 0, FLT_CONFIG0);
/* set sink frl mode disable */
if (dw_hdmi_support_scdc(hdmi, &hdmi->curr_conn->display_info))
if (hdmi->curr_conn && dw_hdmi_support_scdc(hdmi, &hdmi->curr_conn->display_info))
drm_scdc_writeb(hdmi->ddc, 0x31, 0);
hdmi->phy.ops->disable(hdmi, hdmi->phy.data);

24
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View File

@@ -1742,10 +1742,8 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)
ret ? "LIT" : "BIG");
}
static int dw_hdmi_rockchip_encoder_loader_protect(struct drm_encoder *encoder,
bool on)
static int _dw_hdmi_rockchip_encoder_loader_protect(struct rockchip_hdmi *hdmi, bool on)
{
struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
int ret;
if (on) {
@@ -1766,6 +1764,20 @@ static int dw_hdmi_rockchip_encoder_loader_protect(struct drm_encoder *encoder,
return 0;
}
static int dw_hdmi_rockchip_encoder_loader_protect(struct drm_encoder *encoder, bool on)
{
struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
struct rockchip_hdmi *secondary;
_dw_hdmi_rockchip_encoder_loader_protect(hdmi, on);
if (hdmi->plat_data->right) {
secondary = rockchip_hdmi_find_by_id(hdmi->dev->driver, !hdmi->id);
_dw_hdmi_rockchip_encoder_loader_protect(secondary, on);
}
return 0;
}
static void rk3588_set_link_mode(struct rockchip_hdmi *hdmi)
{
int val;
@@ -3632,8 +3644,12 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
if (plat_data->connector) {
hdmi->sub_dev.connector = plat_data->connector;
hdmi->sub_dev.of_node = dev->of_node;
hdmi->sub_dev.loader_protect = dw_hdmi_rockchip_encoder_loader_protect;
if (secondary && device_property_read_bool(secondary->dev, "split-mode"))
hdmi->sub_dev.of_node = secondary->dev->of_node;
else
hdmi->sub_dev.of_node = hdmi->dev->of_node;
rockchip_drm_register_sub_dev(&hdmi->sub_dev);
}