From nobody Mon Feb 9 15:17:02 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 16A7C28EA for ; Thu, 22 Aug 2024 19:35:34 +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=1724355341; cv=none; b=IAze8lTTBTJQkl6MmwD8xW1WTcGkPpiKAwMHuXovsZJVcQ3bRvO3JcSvpJmvpwX+KxCDhqJFJ+t3L48QHsoRvvNzXYXHkYyV0DCD7DJVcaGsK9xpK6PB5d3tJtVG212WCXe04EMol/k7vZGQB6xnO0VGpdrZP0jmatu5uxBzpQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724355341; c=relaxed/simple; bh=unmdRnxKVrGlyrBnRnof1V5PGegvso8ARvgyRUmQENo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=lsC4XAtFUADPRyhs1RPm9fCIpZtHfkhG92YPXj28hyw0kswqaf7I2v+a3ys5CQ35t8f0/z1gMgEp++s1bS2ustx+4d5b8/E26fcjKBVm4uiKnI6gpGEORAp+/lIQriD06ZldTdkHc0CKn/OodA9h3AZY1hjXKp3SS6Ot6wqKidc= 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=FdKAxBOv; 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="FdKAxBOv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1724355332; bh=unmdRnxKVrGlyrBnRnof1V5PGegvso8ARvgyRUmQENo=; h=From:Date:Subject:To:Cc:From; b=FdKAxBOv7SEdKr1dhCAcdC8SIHcPk8BNpvUlAoDIkMvx/e3qyDbfFSO9FELidgNyz ic8Q3qk+GV6YAGsMPHeaDA8ua+LRrxfyVSi7KXoTOVMQWvl2yBGfFh0gSoPXrhiUbP dzMZc24ecpRO4cAdcN1jd5UZ1lylCmnyJobN5V3Q= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 22 Aug 2024 21:35:23 +0200 Subject: [PATCH v2] drm/radeon: Switch radeon_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: <20240822-radeon-drm_edid-v2-1-58321551811d@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAPqSx2YC/3WNQQ6CMBBFr0JmbQ0tRMCV9zDEYGews7DoFFBDe ncrLly5fC/57y8QSJgC7LMFhGYOPPgEZpOBdZ2/kGJMDCY3ZV7rWkmHNHiFcj0RMqqmzy3ZYkf GVJBWN6Gen2vx2H5Z6D6l8PiTjsM4yGt9nfXH/j+YtdKqPFc9om50YejwIA4hWDe5racR2hjjG 30vfBnIAAAA To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1724355331; l=10595; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=unmdRnxKVrGlyrBnRnof1V5PGegvso8ARvgyRUmQENo=; b=7WmwrJCTlhbPymQeEviPzA9T1oNFyQP6q/FkILal0oeE3p9BngCFgYNFStxbsnblJXve1z2sL dk5N1iu/iAMDzEcO7oIKw52FTgUwbTxxA8lX2DEX7xaTLFE+7xCU/Ab 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 --- Changes in v2: - Simplify some logic as drm_edid_*()-APIs can handle NULL - Correctly use drm_edid_read_switcheroo() - Link to v1: https://lore.kernel.org/r/20240818-radeon-drm_edid-v1-1-4b7fd= d19132e@weissschuh.net --- This is only compile-tested. --- drivers/gpu/drm/radeon/radeon_audio.c | 4 +-- drivers/gpu/drm/radeon/radeon_combios.c | 4 +-- drivers/gpu/drm/radeon/radeon_connectors.c | 56 +++++++++++++-------------= ---- drivers/gpu/drm/radeon/radeon_mode.h | 5 ++- 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon= /radeon_audio.c index 47aa06a9a942..59d0e47c94d0 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -311,7 +311,7 @@ static void radeon_audio_write_sad_regs(struct drm_enco= der *encoder) if (!connector) return; =20 - sad_count =3D drm_edid_to_sad(radeon_connector->edid, &sads); + sad_count =3D drm_edid_to_sad(drm_edid_raw(radeon_connector->drm_edid), &= sads); if (sad_count < 0) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); if (sad_count <=3D 0) @@ -335,7 +335,7 @@ static void radeon_audio_write_speaker_allocation(struc= t drm_encoder *encoder) if (!connector) return; =20 - sad_count =3D drm_edid_to_speaker_allocation(radeon_connector->edid, &sad= b); + sad_count =3D drm_edid_to_speaker_allocation(drm_edid_raw(radeon_connecto= r->drm_edid), &sadb); if (sad_count < 0) { DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", sad_count); diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/rade= on/radeon_combios.c index df8d7f56b028..f4947acd0419 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -390,10 +390,10 @@ bool radeon_combios_check_hardcoded_edid(struct radeo= n_device *rdev) } =20 /* this is used for atom LCDs as well */ -struct edid * +const struct drm_edid * radeon_bios_get_hardcoded_edid(struct radeon_device *rdev) { - return drm_edid_duplicate(drm_edid_raw(rdev->mode_info.bios_hardcoded_edi= d)); + return drm_edid_dup(rdev->mode_info.bios_hardcoded_edid); } =20 static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_devic= e *rdev, diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/r= adeon/radeon_connectors.c index 528a8f3677c2..5cf3486b7378 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -261,7 +261,7 @@ static void radeon_connector_get_edid(struct drm_connec= tor *connector) struct radeon_device *rdev =3D dev->dev_private; struct radeon_connector *radeon_connector =3D to_radeon_connector(connect= or); =20 - if (radeon_connector->edid) + if (radeon_connector->drm_edid) return; =20 /* on hw with routers, select right port */ @@ -271,8 +271,8 @@ static void radeon_connector_get_edid(struct drm_connec= tor *connector) if ((radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=3D ENCODER_OBJECT_ID_NONE) && radeon_connector->ddc_bus->has_aux) { - radeon_connector->edid =3D drm_get_edid(connector, - &radeon_connector->ddc_bus->aux.ddc); + radeon_connector->drm_edid =3D drm_edid_read_ddc(connector, + &radeon_connector->ddc_bus->aux.ddc); } else if ((connector->connector_type =3D=3D DRM_MODE_CONNECTOR_DisplayPo= rt) || (connector->connector_type =3D=3D DRM_MODE_CONNECTOR_eDP)) { struct radeon_connector_atom_dig *dig =3D radeon_connector->con_priv; @@ -280,22 +280,22 @@ static void radeon_connector_get_edid(struct drm_conn= ector *connector) if ((dig->dp_sink_type =3D=3D CONNECTOR_OBJECT_ID_DISPLAYPORT || dig->dp_sink_type =3D=3D CONNECTOR_OBJECT_ID_eDP) && radeon_connector->ddc_bus->has_aux) - radeon_connector->edid =3D drm_get_edid(&radeon_connector->base, - &radeon_connector->ddc_bus->aux.ddc); + radeon_connector->drm_edid =3D drm_edid_read_ddc(&radeon_connector->bas= e, + &radeon_connector->ddc_bus->aux.ddc); else if (radeon_connector->ddc_bus) - radeon_connector->edid =3D drm_get_edid(&radeon_connector->base, - &radeon_connector->ddc_bus->adapter); + radeon_connector->drm_edid =3D drm_edid_read_ddc(&radeon_connector->bas= e, + &radeon_connector->ddc_bus->adapter); } else if (vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC= && connector->connector_type =3D=3D DRM_MODE_CONNECTOR_LVDS && radeon_connector->ddc_bus) { - radeon_connector->edid =3D drm_get_edid_switcheroo(&radeon_connector->ba= se, - &radeon_connector->ddc_bus->adapter); + radeon_connector->drm_edid =3D drm_edid_read_switcheroo(&radeon_connecto= r->base, + &radeon_connector->ddc_bus->adapter); } else if (radeon_connector->ddc_bus) { - radeon_connector->edid =3D drm_get_edid(&radeon_connector->base, - &radeon_connector->ddc_bus->adapter); + radeon_connector->drm_edid =3D drm_edid_read_ddc(&radeon_connector->base, + &radeon_connector->ddc_bus->adapter); } =20 - if (!radeon_connector->edid) { + if (!radeon_connector->drm_edid) { /* don't fetch the edid from the vbios if ddc fails and runpm is * enabled so we report disconnected. */ @@ -306,34 +306,30 @@ static void radeon_connector_get_edid(struct drm_conn= ector *connector) /* some laptops provide a hardcoded edid in rom for LCDs */ if (((connector->connector_type =3D=3D DRM_MODE_CONNECTOR_LVDS) || (connector->connector_type =3D=3D DRM_MODE_CONNECTOR_eDP))) - radeon_connector->edid =3D radeon_bios_get_hardcoded_edid(rdev); + radeon_connector->drm_edid =3D radeon_bios_get_hardcoded_edid(rdev); } else { /* some servers provide a hardcoded edid in rom for KVMs */ - radeon_connector->edid =3D radeon_bios_get_hardcoded_edid(rdev); + radeon_connector->drm_edid =3D radeon_bios_get_hardcoded_edid(rdev); } } + + drm_edid_connector_update(&radeon_connector->base, radeon_connector->drm_= edid); } =20 static void radeon_connector_free_edid(struct drm_connector *connector) { struct radeon_connector *radeon_connector =3D to_radeon_connector(connect= or); =20 - kfree(radeon_connector->edid); - radeon_connector->edid =3D NULL; + drm_edid_free(radeon_connector->drm_edid); + radeon_connector->drm_edid =3D NULL; } =20 static int radeon_ddc_get_modes(struct drm_connector *connector) { struct radeon_connector *radeon_connector =3D to_radeon_connector(connect= or); - int ret; =20 - if (radeon_connector->edid) { - drm_connector_update_edid_property(connector, radeon_connector->edid); - ret =3D drm_add_edid_modes(connector, radeon_connector->edid); - return ret; - } - drm_connector_update_edid_property(connector, NULL); - return 0; + drm_edid_connector_update(connector, radeon_connector->drm_edid); + return drm_edid_connector_add_modes(connector); } =20 static struct drm_encoder *radeon_best_single_encoder(struct drm_connector= *connector) @@ -869,7 +865,7 @@ radeon_lvds_detect(struct drm_connector *connector, boo= l force) =20 /* check for edid as well */ radeon_connector_get_edid(connector); - if (radeon_connector->edid) + if (radeon_connector->drm_edid) ret =3D connector_status_connected; /* check acpi lid status ??? */ =20 @@ -1012,13 +1008,12 @@ radeon_vga_detect(struct drm_connector *connector, = bool force) radeon_connector_free_edid(connector); radeon_connector_get_edid(connector); =20 - if (!radeon_connector->edid) { + if (!radeon_connector->drm_edid) { DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", connector->name); ret =3D connector_status_connected; } else { - radeon_connector->use_digital =3D - !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); + radeon_connector->use_digital =3D drm_edid_is_digital(radeon_connector-= >drm_edid); =20 /* some oems have boards with separate digital and analog connectors * with a shared ddc line (often vga + hdmi) @@ -1270,7 +1265,7 @@ radeon_dvi_detect(struct drm_connector *connector, bo= ol force) radeon_connector_free_edid(connector); radeon_connector_get_edid(connector); =20 - if (!radeon_connector->edid) { + if (!radeon_connector->drm_edid) { DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", connector->name); /* rs690 seems to have a problem with connectors not existing and always @@ -1286,8 +1281,7 @@ radeon_dvi_detect(struct drm_connector *connector, bo= ol force) broken_edid =3D true; /* defer use_digital to later */ } } else { - radeon_connector->use_digital =3D - !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); + radeon_connector->use_digital =3D drm_edid_is_digital(radeon_connector-= >drm_edid); =20 /* some oems have boards with separate digital and analog connectors * with a shared ddc line (often vga + hdmi) diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/= radeon_mode.h index 421c83fc70dc..ae1d91cd93ec 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -38,7 +38,6 @@ #include #include =20 -struct edid; struct drm_edid; struct radeon_bo; struct radeon_device; @@ -521,7 +520,7 @@ struct radeon_connector { bool use_digital; /* 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; void *con_priv; bool dac_load_detect; bool detected_by_load; /* if the connection status was determined by load= */ @@ -843,7 +842,7 @@ radeon_get_crtc_scanout_position(struct drm_crtc *crtc,= bool in_vblank_irq, const struct drm_display_mode *mode); =20 extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev= ); -extern struct edid * +extern const struct drm_edid * radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); extern bool radeon_atom_get_clock_info(struct drm_device *dev); extern bool radeon_combios_get_clock_info(struct drm_device *dev); --- base-commit: 19cff16559a4f2d763faf4f8392bf86d3a21b93c change-id: 20240818-radeon-drm_edid-9f0cec36e227 Best regards, --=20 Thomas Wei=C3=9Fschuh