github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-28 03:52:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/msm/dp: switch to struct drm_edid

Browse Source 
Prefer the struct drm_edid based functions for reading the EDID and
updating the connector.

Simplify the flow by updating the EDID property when the EDID is read
instead of at .get_modes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/593976/
Link: https://lore.kernel.org/r/93d6c446ed4831dadfb4a77635a67cf5f27e19ff.1715691257.git.jani.nikula@intel.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
Jani Nikula 2024-05-14 15:55:14 +03:00 committed by Dmitry Baryshkov
parent f217b8b0bf
commit 5bea90ad97
3 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/msm/dp/dp_display.c
View File

@ -360,26 +360,25 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp,
static int dp_display_process_hpd_high(struct dp_display_private *dp) static int dp_display_process_hpd_high(struct dp_display_private *dp)
{ {
struct drm_connector *connector = dp->dp_display.connector;
const struct drm_display_info *info = &connector->display_info;
int rc = 0; int rc = 0;
struct edid *edid;
rc = dp_panel_read_sink_caps(dp->panel, dp->dp_display.connector); rc = dp_panel_read_sink_caps(dp->panel, connector);
if (rc) if (rc)
goto end; goto end;
dp_link_process_request(dp->link); dp_link_process_request(dp->link);
if (!dp->dp_display.is_edp) if (!dp->dp_display.is_edp)
drm_dp_set_subconnector_property(dp->dp_display.connector, drm_dp_set_subconnector_property(connector,
connector_status_connected, connector_status_connected,
dp->panel->dpcd, dp->panel->dpcd,
dp->panel->downstream_ports); dp->panel->downstream_ports);
edid = dp->panel->edid;
dp->dp_display.psr_supported = dp->panel->psr_cap.version && psr_enabled; dp->dp_display.psr_supported = dp->panel->psr_cap.version && psr_enabled;
dp->audio_supported = drm_detect_monitor_audio(edid); dp->audio_supported = info->has_audio;
dp_panel_handle_sink_request(dp->panel); dp_panel_handle_sink_request(dp->panel);
/* /*

47
drivers/gpu/drm/msm/dp/dp_panel.c
View File

@ -108,28 +108,6 @@ static u32 dp_panel_get_supported_bpp(struct dp_panel *dp_panel,
return bpp; return bpp;
} }
static int dp_panel_update_modes(struct drm_connector *connector,
struct edid *edid)
{
int rc = 0;
if (edid) {
rc = drm_connector_update_edid_property(connector, edid);
if (rc) {
DRM_ERROR("failed to update edid property %d\n", rc);
return rc;
}
rc = drm_add_edid_modes(connector, edid);
return rc;
}
rc = drm_connector_update_edid_property(connector, NULL);
if (rc)
DRM_ERROR("failed to update edid property %d\n", rc);
return rc;
}
int dp_panel_read_sink_caps(struct dp_panel *dp_panel, int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
struct drm_connector *connector) struct drm_connector *connector)
{ {
@ -175,12 +153,13 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
if (rc) if (rc)
return rc; return rc;
kfree(dp_panel->edid); drm_edid_free(dp_panel->drm_edid);
dp_panel->edid = NULL;
dp_panel->edid = drm_get_edid(connector, dp_panel->drm_edid = drm_edid_read_ddc(connector, &panel->aux->ddc);
&panel->aux->ddc);
if (!dp_panel->edid) { drm_edid_connector_update(connector, dp_panel->drm_edid);
if (!dp_panel->drm_edid) {
DRM_ERROR("panel edid read failed\n"); DRM_ERROR("panel edid read failed\n");
/* check edid read fail is due to unplug */ /* check edid read fail is due to unplug */
if (!dp_catalog_link_is_connected(panel->catalog)) { if (!dp_catalog_link_is_connected(panel->catalog)) {
@ -224,13 +203,13 @@ int dp_panel_get_modes(struct dp_panel *dp_panel,
return -EINVAL; return -EINVAL;
} }
if (dp_panel->edid) if (dp_panel->drm_edid)
return dp_panel_update_modes(connector, dp_panel->edid); return drm_edid_connector_add_modes(connector);
return 0; return 0;
} }
static u8 dp_panel_get_edid_checksum(struct edid *edid) static u8 dp_panel_get_edid_checksum(const struct edid *edid)
{ {
edid += edid->extensions; edid += edid->extensions;
@ -249,10 +228,12 @@ void dp_panel_handle_sink_request(struct dp_panel *dp_panel)
panel = container_of(dp_panel, struct dp_panel_private, dp_panel); panel = container_of(dp_panel, struct dp_panel_private, dp_panel);
if (panel->link->sink_request & DP_TEST_LINK_EDID_READ) { if (panel->link->sink_request & DP_TEST_LINK_EDID_READ) {
/* FIXME: get rid of drm_edid_raw() */
const struct edid *edid = drm_edid_raw(dp_panel->drm_edid);
u8 checksum; u8 checksum;
if (dp_panel->edid) if (edid)
checksum = dp_panel_get_edid_checksum(dp_panel->edid); checksum = dp_panel_get_edid_checksum(edid);
else else
checksum = dp_panel->connector->real_edid_checksum; checksum = dp_panel->connector->real_edid_checksum;
@ -539,5 +520,5 @@ void dp_panel_put(struct dp_panel *dp_panel)
if (!dp_panel) if (!dp_panel)
return; return;
kfree(dp_panel->edid); drm_edid_free(dp_panel->drm_edid);
} }

2
drivers/gpu/drm/msm/dp/dp_panel.h
View File

@ -39,7 +39,7 @@ struct dp_panel {
u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS]; u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
struct dp_link_info link_info; struct dp_link_info link_info;
struct edid *edid; const struct drm_edid *drm_edid;
struct drm_connector *connector; struct drm_connector *connector;
struct dp_display_mode dp_mode; struct dp_display_mode dp_mode;
struct dp_panel_psr psr_cap; struct dp_panel_psr psr_cap;