From nobody Tue Feb 10 04:15:49 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72B227B3E1 for ; Sun, 18 Aug 2024 10:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723977830; cv=none; b=bMdJQDhk9eyQx5O051ZLq/PNqou38UaFEfLcjmfEMZQ2KNp7SWhoDcg0Kow75hfIw/Hd9DfCflmY1Cqkzb41UghFudQ1tMDUc5z+ahhPLBHJjD36FDWX2lyXFby8pxNPf+xLct52qGu3YpIfxls9iw7rE3rdZ9sFy/GltdpNp3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723977830; c=relaxed/simple; bh=UWrJ3VflqYCBtRQaOO2P94458xmgaWThfRX9ByDExBY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gB9Za7mlDyJFsOevtjXEYoe8vXVoAh+l7dns4hvUdyE+6aaidsu2j04Fjm1+DX1SQz0btYnVZQUjX6rPLJJZGT+t+6hMuLN+cXvnnSyRBZyKUP6pW6zsdcGMEo7wzrMtZF54vfIljFyGV5qFbpzgSxF+toY6mxRaQrWToHBOZsI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=JK4M5ZqQ; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="JK4M5ZqQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1723977821; bh=UWrJ3VflqYCBtRQaOO2P94458xmgaWThfRX9ByDExBY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JK4M5ZqQ15E3rpJC946N9moNx/B61FWm84R4zk51SxXszFrdtAdh4q8vy85R3SQQN MHZGXfK1c97/qI2AoQTrlSfaUqZVJ1gwLWrcaRuqphVsZyQPItidHxz//v8HyxRIbI C0MOS/aIBJmt+/pEjKfMfN7Nq5hiAdYC5bvCzjbY= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 18 Aug 2024 12:43:33 +0200 Subject: [PATCH 09/12] drm/amd/display: Switch amdgpu_dm_connector to struct drm_edid Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240818-amdgpu-drm_edid-v1-9-aea66c1f7cf4@weissschuh.net> References: <20240818-amdgpu-drm_edid-v1-0-aea66c1f7cf4@weissschuh.net> In-Reply-To: <20240818-amdgpu-drm_edid-v1-0-aea66c1f7cf4@weissschuh.net> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , jinzh , Aric Cyr , Alan Liu , Tony Cheng , Andrey Grodzovsky , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Harry Wentland , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1723977820; l=13621; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=UWrJ3VflqYCBtRQaOO2P94458xmgaWThfRX9ByDExBY=; b=Q9JwO4Gq8RTg28ZKZGI9FedaBnDezMYUh3/KhAS08qETRI06D1En3TTJJPIlTN1KF+RcUJHSw saGFqUVwcuHDggksMH/WBalKxrICnyUKux4a4r4Fg600Hvalo7zvUuT X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= "struct drm_edid" is the safe and recommended alternative to "struct edid". Rename the member to make sure that no usage sites are missed, as "struct drm_edid" has some restrictions, for example it can not be used with kfree(). Signed-off-by: Thomas Wei=C3=9Fschuh --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 70 ++++++++++++------= ---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 ++++---- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index bd9a1a21720e..961f4f308dc7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3426,7 +3426,7 @@ void amdgpu_dm_update_connector_after_detect( aconnector->dc_sink =3D sink; dc_sink_retain(aconnector->dc_sink); amdgpu_dm_update_freesync_caps(connector, - aconnector->edid); + aconnector->drm_edid); } else { amdgpu_dm_update_freesync_caps(connector, NULL); if (!aconnector->dc_sink) { @@ -3485,18 +3485,18 @@ void amdgpu_dm_update_connector_after_detect( aconnector->dc_sink =3D sink; dc_sink_retain(aconnector->dc_sink); if (sink->dc_edid.length =3D=3D 0) { - aconnector->edid =3D NULL; + aconnector->drm_edid =3D NULL; if (aconnector->dc_link->aux_mode) { drm_dp_cec_unset_edid( &aconnector->dm_dp_aux.aux); } } else { - aconnector->edid =3D - (struct edid *)sink->dc_edid.raw_edid; + aconnector->drm_edid =3D drm_edid_alloc(sink->dc_edid.raw_edid, + sink->dc_edid.length); =20 if (aconnector->dc_link->aux_mode) drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, - aconnector->edid); + drm_edid_raw(aconnector->drm_edid)); } =20 if (!aconnector->timing_requested) { @@ -3507,8 +3507,8 @@ void amdgpu_dm_update_connector_after_detect( "failed to create aconnector->requested_timing\n"); } =20 - drm_connector_update_edid_property(connector, aconnector->edid); - amdgpu_dm_update_freesync_caps(connector, aconnector->edid); + drm_edid_connector_update(connector, aconnector->drm_edid); + amdgpu_dm_update_freesync_caps(connector, aconnector->drm_edid); update_connector_ext_caps(aconnector); } else { drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux); @@ -3517,7 +3517,7 @@ void amdgpu_dm_update_connector_after_detect( aconnector->num_modes =3D 0; dc_sink_release(aconnector->dc_sink); aconnector->dc_sink =3D NULL; - aconnector->edid =3D NULL; + aconnector->drm_edid =3D NULL; kfree(aconnector->timing_requested); aconnector->timing_requested =3D NULL; /* Set CP to DESIRED if it was ENABLED, so we can re-enable it again on = hotplug */ @@ -7016,7 +7016,7 @@ static void amdgpu_dm_connector_funcs_force(struct dr= m_connector *connector) struct amdgpu_dm_connector *aconnector =3D to_amdgpu_dm_connector(connect= or); struct dc_link *dc_link =3D aconnector->dc_link; struct dc_sink *dc_em_sink =3D aconnector->dc_em_sink; - struct edid *edid; + const struct drm_edid *drm_edid; struct i2c_adapter *ddc; =20 if (dc_link && dc_link->aux_mode) @@ -7025,23 +7025,25 @@ static void amdgpu_dm_connector_funcs_force(struct = drm_connector *connector) ddc =3D &aconnector->i2c->base; =20 /* - * Note: drm_get_edid gets edid in the following order: + * Note: drm_edid_read_ddc gets edid in the following order: * 1) override EDID if set via edid_override debugfs, * 2) firmware EDID if set via edid_firmware module parameter * 3) regular DDC read. */ - edid =3D drm_get_edid(connector, ddc); - if (!edid) { + drm_edid =3D drm_edid_read_ddc(connector, ddc); + if (!drm_edid) { DRM_ERROR("No EDID found on connector: %s.\n", connector->name); return; } =20 - aconnector->edid =3D edid; + aconnector->drm_edid =3D drm_edid; =20 /* Update emulated (virtual) sink's EDID */ if (dc_em_sink && dc_link) { memset(&dc_em_sink->edid_caps, 0, sizeof(struct dc_edid_caps)); - memmove(dc_em_sink->dc_edid.raw_edid, edid, (edid->extensions + 1) * EDI= D_LENGTH); + memmove(dc_em_sink->dc_edid.raw_edid, + drm_edid_raw(drm_edid), + (drm_edid_raw(drm_edid)->extensions + 1) * EDID_LENGTH); dm_helpers_parse_edid_caps( dc_link, &dc_em_sink->dc_edid, @@ -7076,7 +7078,7 @@ static void create_eml_sink(struct amdgpu_dm_connecto= r *aconnector) .link =3D aconnector->dc_link, .sink_signal =3D SIGNAL_TYPE_VIRTUAL }; - struct edid *edid; + const struct drm_edid *drm_edid; struct i2c_adapter *ddc; =20 if (dc_link->aux_mode) @@ -7085,25 +7087,25 @@ static void create_eml_sink(struct amdgpu_dm_connec= tor *aconnector) ddc =3D &aconnector->i2c->base; =20 /* - * Note: drm_get_edid gets edid in the following order: + * Note: drm_edid_read_ddc gets edid in the following order: * 1) override EDID if set via edid_override debugfs, * 2) firmware EDID if set via edid_firmware module parameter * 3) regular DDC read. */ - edid =3D drm_get_edid(connector, ddc); - if (!edid) { + drm_edid =3D drm_edid_read_ddc(connector, ddc); + if (!drm_edid) { DRM_ERROR("No EDID found on connector: %s.\n", connector->name); return; } =20 - if (drm_detect_hdmi_monitor(edid)) + if (connector->display_info.is_hdmi) init_params.sink_signal =3D SIGNAL_TYPE_HDMI_TYPE_A; =20 - aconnector->edid =3D edid; + aconnector->drm_edid =3D drm_edid; =20 aconnector->dc_em_sink =3D dc_link_add_remote_sink( aconnector->dc_link, - edid, + drm_edid_raw(drm_edid), &init_params); =20 if (aconnector->base.force =3D=3D DRM_FORCE_ON) { @@ -7786,16 +7788,17 @@ static void amdgpu_set_panel_orientation(struct drm= _connector *connector) } =20 static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connec= tor, - struct edid *edid) + const struct drm_edid *drm_edid) { struct amdgpu_dm_connector *amdgpu_dm_connector =3D to_amdgpu_dm_connector(connector); =20 - if (edid) { + if (drm_edid) { /* empty probed_modes */ INIT_LIST_HEAD(&connector->probed_modes); + drm_edid_connector_update(connector, drm_edid); amdgpu_dm_connector->num_modes =3D - drm_add_edid_modes(connector, edid); + drm_edid_connector_add_modes(connector); =20 /* sorting the probed modes before calling function * amdgpu_dm_get_native_mode() since EDID can have @@ -7809,10 +7812,10 @@ static void amdgpu_dm_connector_ddc_get_modes(struc= t drm_connector *connector, amdgpu_dm_get_native_mode(connector); =20 /* Freesync capabilities are reset by calling - * drm_add_edid_modes() and need to be + * drm_connector_edid_add_modes() and need to be * restored here. */ - amdgpu_dm_update_freesync_caps(connector, edid); + amdgpu_dm_update_freesync_caps(connector, drm_edid); } else { amdgpu_dm_connector->num_modes =3D 0; } @@ -7908,12 +7911,12 @@ static uint add_fs_modes(struct amdgpu_dm_connector= *aconnector) } =20 static void amdgpu_dm_connector_add_freesync_modes(struct drm_connector *c= onnector, - struct edid *edid) + const struct drm_edid *drm_edid) { struct amdgpu_dm_connector *amdgpu_dm_connector =3D to_amdgpu_dm_connector(connector); =20 - if (!(amdgpu_freesync_vid_mode && edid)) + if (!(amdgpu_freesync_vid_mode && drm_edid)) return; =20 if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10) @@ -7926,24 +7929,24 @@ static int amdgpu_dm_connector_get_modes(struct drm= _connector *connector) struct amdgpu_dm_connector *amdgpu_dm_connector =3D to_amdgpu_dm_connector(connector); struct drm_encoder *encoder; - struct edid *edid =3D amdgpu_dm_connector->edid; + const struct drm_edid *drm_edid =3D amdgpu_dm_connector->drm_edid; struct dc_link_settings *verified_link_cap =3D &amdgpu_dm_connector->dc_link->verified_link_cap; const struct dc *dc =3D amdgpu_dm_connector->dc_link->dc; =20 encoder =3D amdgpu_dm_connector_to_encoder(connector); =20 - if (!drm_edid_is_valid(edid)) { + if (!drm_edid_valid(drm_edid)) { amdgpu_dm_connector->num_modes =3D drm_add_modes_noedid(connector, 640, 480); if (dc->link_srv->dp_get_encoding_format(verified_link_cap) =3D=3D DP_12= 8b_132b_ENCODING) amdgpu_dm_connector->num_modes +=3D drm_add_modes_noedid(connector, 1920, 1080); } else { - amdgpu_dm_connector_ddc_get_modes(connector, edid); + amdgpu_dm_connector_ddc_get_modes(connector, drm_edid); if (encoder) amdgpu_dm_connector_add_common_modes(encoder, connector); - amdgpu_dm_connector_add_freesync_modes(connector, edid); + amdgpu_dm_connector_add_freesync_modes(connector, drm_edid); } amdgpu_dm_fbc_init(connector); =20 @@ -11953,12 +11956,13 @@ static int parse_hdmi_amd_vsdb(struct amdgpu_dm_c= onnector *aconnector, * FreeSync parameters. */ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, - const struct edid *edid) + const struct drm_edid *drm_edid) { int i =3D 0; const struct detailed_timing *timing; const struct detailed_non_pixel *data; const struct detailed_data_monitor_range *range; + const struct edid *edid =3D drm_edid_raw(drm_edid); struct amdgpu_dm_connector *amdgpu_dm_connector =3D to_amdgpu_dm_connector(connector); struct dm_connector_state *dm_con_state =3D NULL; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 27c0017707dd..c49cc0170fc5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -81,6 +81,7 @@ struct amdgpu_bo; struct dmub_srv; struct dc_plane_state; struct dmub_notification; +struct drm_edid; =20 struct amd_vsdb_block { unsigned char ieee_id[3]; @@ -673,7 +674,7 @@ struct amdgpu_dm_connector { =20 /* we need to mind the EDID between detect and get modes due to analog/digital/tvencoder */ - struct edid *edid; + const struct drm_edid *drm_edid; =20 /* shared with amdgpu */ struct amdgpu_hpd hpd; @@ -951,7 +952,7 @@ void dm_restore_drm_connector_state(struct drm_device *= dev, struct drm_connector *connector); =20 void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, - const struct edid *edid); + const struct drm_edid *drm_edid); =20 void amdgpu_dm_trigger_timing_sync(struct drm_device *dev); =20 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/= drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 25e98d248c21..cd03108db28b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -129,7 +129,7 @@ dm_dp_mst_connector_destroy(struct drm_connector *conne= ctor) dc_sink_release(aconnector->dc_sink); } =20 - kfree(aconnector->edid); + kfree(aconnector->drm_edid); =20 drm_connector_cleanup(connector); drm_dp_mst_put_port_malloc(aconnector->mst_output_port); @@ -182,7 +182,7 @@ amdgpu_dm_mst_connector_early_unregister(struct drm_con= nector *connector) =20 dc_sink_release(dc_sink); aconnector->dc_sink =3D NULL; - aconnector->edid =3D NULL; + aconnector->drm_edid =3D NULL; aconnector->dsc_aux =3D NULL; port->passthrough_aux =3D NULL; } @@ -302,12 +302,13 @@ static int dm_dp_mst_get_modes(struct drm_connector *= connector) if (!aconnector) return drm_add_edid_modes(connector, NULL); =20 - if (!aconnector->edid) { - struct edid *edid; + if (!aconnector->drm_edid) { + const struct drm_edid *drm_edid; =20 - edid =3D drm_dp_mst_get_edid(connector, &aconnector->mst_root->mst_mgr, = aconnector->mst_output_port); + drm_edid =3D drm_dp_mst_edid_read(connector, &aconnector->mst_root->mst_= mgr, + aconnector->mst_output_port); =20 - if (!edid) { + if (!drm_edid) { amdgpu_dm_set_mst_status(&aconnector->mst_status, MST_REMOTE_EDID, false); =20 @@ -344,7 +345,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *co= nnector) return ret; } =20 - aconnector->edid =3D edid; + aconnector->drm_edid =3D drm_edid; amdgpu_dm_set_mst_status(&aconnector->mst_status, MST_REMOTE_EDID, true); } @@ -361,7 +362,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *co= nnector) .sink_signal =3D SIGNAL_TYPE_DISPLAY_PORT_MST }; dc_sink =3D dc_link_add_remote_sink( aconnector->dc_link, - aconnector->edid, + drm_edid_raw(aconnector->drm_edid), &init_params); =20 if (!dc_sink) { @@ -403,7 +404,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *co= nnector) =20 if (aconnector->dc_sink) { amdgpu_dm_update_freesync_caps( - connector, aconnector->edid); + connector, aconnector->drm_edid); =20 #if defined(CONFIG_DRM_AMD_DC_FP) if (!validate_dsc_caps_on_connector(aconnector)) @@ -417,10 +418,9 @@ static int dm_dp_mst_get_modes(struct drm_connector *c= onnector) } } =20 - drm_connector_update_edid_property( - &aconnector->base, aconnector->edid); + drm_edid_connector_update(&aconnector->base, aconnector->drm_edid); =20 - ret =3D drm_add_edid_modes(connector, aconnector->edid); + ret =3D drm_edid_connector_add_modes(connector); =20 return ret; } @@ -498,7 +498,7 @@ dm_dp_mst_detect(struct drm_connector *connector, =20 dc_sink_release(aconnector->dc_sink); aconnector->dc_sink =3D NULL; - aconnector->edid =3D NULL; + aconnector->drm_edid =3D NULL; aconnector->dsc_aux =3D NULL; port->passthrough_aux =3D NULL; =20 --=20 2.46.0