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

drm: bridge: dw-hdmi: Restore the original mode_valid arguments

Browse Source 
Fixes: 0a52ff8181 ("drm/rockchip: dw_hdmi: check display mode with crtc mode valid")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Icaef76860b9df1b3cd2e9f5899297584440fd465
This commit is contained in:
Algea Cao
2023-04-13 19:19:54 +08:00
committed by Tao Huang
parent 8e6b1313d2
commit a024be9ff1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3902,7 +3902,6 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_mode *mode)
{
struct dw_hdmi *hdmi = bridge->driver_private;
struct drm_connector *connector = &hdmi->connector;
const struct dw_hdmi_plat_data *pdata = hdmi->plat_data;
enum drm_mode_status mode_status = MODE_OK;
@@ -3910,8 +3909,9 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
return MODE_OK;
if (pdata->mode_valid)
mode_status = pdata->mode_valid(connector, pdata->priv_data,
info, mode);
mode_status = pdata->mode_valid(hdmi, pdata->priv_data, info,
mode);
return mode_status;
}

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

@@ -1570,10 +1570,11 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
}
static enum drm_mode_status
dw_hdmi_rockchip_mode_valid(struct drm_connector *connector, void *data,
dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
struct drm_connector *connector = container_of(info, struct drm_connector, display_info);
struct drm_encoder *encoder = connector->encoder;
enum drm_mode_status status = MODE_OK;
struct drm_device *dev = connector->dev;

3
include/drm/bridge/dw_hdmi.h
View File

@@ -204,8 +204,7 @@ struct dw_hdmi_plat_data {
void *priv_data;
/* Platform-specific mode validation (optional). */
enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
void *data,
enum drm_mode_status (*mode_valid)(struct dw_hdmi *hdmi, void *data,
const struct drm_display_info *info,
const struct drm_display_mode *mode);