* [PATCH v2 0/2] drm/{amdgpu,radeon}: convert bios_hardcoded_edid to drm_edid
@ 2024-07-26 13:40 Thomas Weißschuh
2024-07-26 13:40 ` [PATCH v2 1/2] drm/amdgpu: " Thomas Weißschuh
2024-07-26 13:40 ` [PATCH v2 2/2] drm/radeon: " Thomas Weißschuh
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Weißschuh @ 2024-07-26 13:40 UTC (permalink / raw)
To: Alex Deucher, Christian König, David Airlie, Daniel Vetter,
Xinhui Pan
Cc: amd-gfx, dri-devel, linux-kernel, Thomas Weißschuh
Instead of manually passing around 'struct edid *' and its size,
use 'struct drm_edid', which encapsulates a validated combination of
both.
While this series introduces new users for drm_edid_raw(),
these can be removed when the drivers get converted to 'struct drm_edid'
completely for which this series provides the foundation.
Only compile-tested.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
Changes in v2:
- Rebase onto current amdgpu/drm-next and
recent changes to hardcoded bios handling
- Add patch for drm/radeon
- Link to v1: https://lore.kernel.org/r/20240616-amdgpu-edid-bios-v1-1-2874f212b365@weissschuh.net
---
Thomas Weißschuh (2):
drm/amdgpu: convert bios_hardcoded_edid to drm_edid
drm/radeon: convert bios_hardcoded_edid to drm_edid
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 17 ++++++-----------
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +-
drivers/gpu/drm/radeon/radeon_atombios.c | 17 ++++++-----------
drivers/gpu/drm/radeon/radeon_combios.c | 26 +++++---------------------
drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++--
drivers/gpu/drm/radeon/radeon_display.c | 2 +-
drivers/gpu/drm/radeon/radeon_mode.h | 4 ++--
13 files changed, 30 insertions(+), 60 deletions(-)
---
base-commit: 644e49d582fd53d4d218d27e404043f56f2c286f
change-id: 20240616-amdgpu-edid-bios-a31aa16b0321
Best regards,
--
Thomas Weißschuh <linux@weissschuh.net>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/2] drm/amdgpu: convert bios_hardcoded_edid to drm_edid 2024-07-26 13:40 [PATCH v2 0/2] drm/{amdgpu,radeon}: convert bios_hardcoded_edid to drm_edid Thomas Weißschuh @ 2024-07-26 13:40 ` Thomas Weißschuh 2024-07-29 9:46 ` Jani Nikula 2024-07-26 13:40 ` [PATCH v2 2/2] drm/radeon: " Thomas Weißschuh 1 sibling, 1 reply; 6+ messages in thread From: Thomas Weißschuh @ 2024-07-26 13:40 UTC (permalink / raw) To: Alex Deucher, Christian König, David Airlie, Daniel Vetter, Xinhui Pan Cc: amd-gfx, dri-devel, linux-kernel, Thomas Weißschuh Instead of manually passing around 'struct edid *' and its size, use 'struct drm_edid', which encapsulates a validated combination of both. As the drm_edid_ can handle NULL gracefully, the explicit checks can be dropped. Also save a few characters by transforming '&array[0]' to the equivalent 'array' and using 'max_t(int, ...)' instead of manual casts. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +----- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 17 ++++++----------- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- 8 files changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index bd0fbdc5f55d..344e0a9ee08a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -249,11 +249,7 @@ amdgpu_connector_find_encoder(struct drm_connector *connector, static struct edid * amdgpu_connector_get_hardcoded_edid(struct amdgpu_device *adev) { - if (adev->mode_info.bios_hardcoded_edid) { - return kmemdup((unsigned char *)adev->mode_info.bios_hardcoded_edid, - adev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL); - } - return NULL; + return drm_edid_duplicate(drm_edid_raw(adev->mode_info.bios_hardcoded_edid)); } static void amdgpu_connector_get_edid(struct drm_connector *connector) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index d002b845d8ac..5e3faefc5510 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h @@ -51,6 +51,7 @@ struct amdgpu_encoder; struct amdgpu_router; struct amdgpu_hpd; struct edid; +struct drm_edid; #define to_amdgpu_crtc(x) container_of(x, struct amdgpu_crtc, base) #define to_amdgpu_connector(x) container_of(x, struct amdgpu_connector, base) @@ -326,8 +327,7 @@ struct amdgpu_mode_info { /* FMT dithering */ struct drm_property *dither_property; /* hardcoded DFP edid from BIOS */ - struct edid *bios_hardcoded_edid; - int bios_hardcoded_edid_size; + const struct drm_edid *bios_hardcoded_edid; /* firmware flags */ u32 firmware_flags; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c index 6415d0d039e1..e5f508d34ed8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c @@ -549,7 +549,7 @@ static int amdgpu_vkms_sw_fini(void *handle) adev->mode_info.mode_config_initialized = false; - kfree(adev->mode_info.bios_hardcoded_edid); + drm_edid_free(adev->mode_info.bios_hardcoded_edid); kfree(adev->amdgpu_vkms_output); return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c index ebf83fee43bb..8defca3705d5 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c @@ -2064,23 +2064,18 @@ amdgpu_atombios_encoder_get_lcd_info(struct amdgpu_encoder *encoder) case LCD_FAKE_EDID_PATCH_RECORD_TYPE: fake_edid_record = (ATOM_FAKE_EDID_PATCH_RECORD *)record; if (fake_edid_record->ucFakeEDIDLength) { - struct edid *edid; + const struct drm_edid *edid; int edid_size; if (fake_edid_record->ucFakeEDIDLength == 128) edid_size = fake_edid_record->ucFakeEDIDLength; else edid_size = fake_edid_record->ucFakeEDIDLength * 128; - edid = kmemdup(&fake_edid_record->ucFakeEDIDString[0], - edid_size, GFP_KERNEL); - if (edid) { - if (drm_edid_is_valid(edid)) { - adev->mode_info.bios_hardcoded_edid = edid; - adev->mode_info.bios_hardcoded_edid_size = edid_size; - } else { - kfree(edid); - } - } + edid = drm_edid_alloc(fake_edid_record->ucFakeEDIDString, edid_size); + if (drm_edid_valid(edid)) + adev->mode_info.bios_hardcoded_edid = edid; + else + drm_edid_free(edid); record += struct_size(fake_edid_record, ucFakeEDIDString, edid_size); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index dddb5fe16f2c..742adbc460c9 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -2846,7 +2846,7 @@ static int dce_v10_0_sw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - kfree(adev->mode_info.bios_hardcoded_edid); + drm_edid_free(adev->mode_info.bios_hardcoded_edid); drm_kms_helper_poll_fini(adev_to_drm(adev)); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 11780e4d7e9f..8d46ebadfa46 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -2973,7 +2973,7 @@ static int dce_v11_0_sw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - kfree(adev->mode_info.bios_hardcoded_edid); + drm_edid_free(adev->mode_info.bios_hardcoded_edid); drm_kms_helper_poll_fini(adev_to_drm(adev)); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index 05c0df97f01d..f08dc6a3886f 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -2745,7 +2745,7 @@ static int dce_v6_0_sw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - kfree(adev->mode_info.bios_hardcoded_edid); + drm_edid_free(adev->mode_info.bios_hardcoded_edid); drm_kms_helper_poll_fini(adev_to_drm(adev)); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index dc73e301d937..a6a3adf2ae13 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -2766,7 +2766,7 @@ static int dce_v8_0_sw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - kfree(adev->mode_info.bios_hardcoded_edid); + drm_edid_free(adev->mode_info.bios_hardcoded_edid); drm_kms_helper_poll_fini(adev_to_drm(adev)); -- 2.45.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] drm/amdgpu: convert bios_hardcoded_edid to drm_edid 2024-07-26 13:40 ` [PATCH v2 1/2] drm/amdgpu: " Thomas Weißschuh @ 2024-07-29 9:46 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2024-07-29 9:46 UTC (permalink / raw) To: Thomas Weißschuh, Alex Deucher, Christian König, David Airlie, Daniel Vetter, Xinhui Pan Cc: amd-gfx, dri-devel, linux-kernel, Thomas Weißschuh On Fri, 26 Jul 2024, Thomas Weißschuh <linux@weissschuh.net> wrote: > Instead of manually passing around 'struct edid *' and its size, > use 'struct drm_edid', which encapsulates a validated combination of > both. > > As the drm_edid_ can handle NULL gracefully, the explicit checks can be > dropped. > > Also save a few characters by transforming '&array[0]' to the equivalent > 'array' and using 'max_t(int, ...)' instead of manual casts. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +----- > drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- > drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 17 ++++++----------- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- > 8 files changed, 14 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c > index bd0fbdc5f55d..344e0a9ee08a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c > @@ -249,11 +249,7 @@ amdgpu_connector_find_encoder(struct drm_connector *connector, > static struct edid * > amdgpu_connector_get_hardcoded_edid(struct amdgpu_device *adev) > { > - if (adev->mode_info.bios_hardcoded_edid) { > - return kmemdup((unsigned char *)adev->mode_info.bios_hardcoded_edid, > - adev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL); > - } > - return NULL; > + return drm_edid_duplicate(drm_edid_raw(adev->mode_info.bios_hardcoded_edid)); > } > > static void amdgpu_connector_get_edid(struct drm_connector *connector) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > index d002b845d8ac..5e3faefc5510 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > @@ -51,6 +51,7 @@ struct amdgpu_encoder; > struct amdgpu_router; > struct amdgpu_hpd; > struct edid; > +struct drm_edid; > > #define to_amdgpu_crtc(x) container_of(x, struct amdgpu_crtc, base) > #define to_amdgpu_connector(x) container_of(x, struct amdgpu_connector, base) > @@ -326,8 +327,7 @@ struct amdgpu_mode_info { > /* FMT dithering */ > struct drm_property *dither_property; > /* hardcoded DFP edid from BIOS */ > - struct edid *bios_hardcoded_edid; > - int bios_hardcoded_edid_size; > + const struct drm_edid *bios_hardcoded_edid; > > /* firmware flags */ > u32 firmware_flags; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c > index 6415d0d039e1..e5f508d34ed8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c > @@ -549,7 +549,7 @@ static int amdgpu_vkms_sw_fini(void *handle) > > adev->mode_info.mode_config_initialized = false; > > - kfree(adev->mode_info.bios_hardcoded_edid); > + drm_edid_free(adev->mode_info.bios_hardcoded_edid); > kfree(adev->amdgpu_vkms_output); > return 0; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c > index ebf83fee43bb..8defca3705d5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c > +++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c > @@ -2064,23 +2064,18 @@ amdgpu_atombios_encoder_get_lcd_info(struct amdgpu_encoder *encoder) > case LCD_FAKE_EDID_PATCH_RECORD_TYPE: > fake_edid_record = (ATOM_FAKE_EDID_PATCH_RECORD *)record; > if (fake_edid_record->ucFakeEDIDLength) { > - struct edid *edid; > + const struct drm_edid *edid; Bikeshedding follows, up to you and the AMD maintainers to decide whether it matters. I know it's a bit verbose, but personally I've named the struct drm_edid variables drm_edid everywhere when making conversions, just to make a clear distinction from struct edid. And I like the fact that it forces you to account for every place the variable is used, in particular passing it to functions that don't have type safety e.g. kfree(). > int edid_size; > > if (fake_edid_record->ucFakeEDIDLength == 128) > edid_size = fake_edid_record->ucFakeEDIDLength; > else > edid_size = fake_edid_record->ucFakeEDIDLength * 128; > - edid = kmemdup(&fake_edid_record->ucFakeEDIDString[0], > - edid_size, GFP_KERNEL); > - if (edid) { > - if (drm_edid_is_valid(edid)) { > - adev->mode_info.bios_hardcoded_edid = edid; > - adev->mode_info.bios_hardcoded_edid_size = edid_size; > - } else { > - kfree(edid); > - } > - } > + edid = drm_edid_alloc(fake_edid_record->ucFakeEDIDString, edid_size); > + if (drm_edid_valid(edid)) > + adev->mode_info.bios_hardcoded_edid = edid; > + else > + drm_edid_free(edid); > record += struct_size(fake_edid_record, > ucFakeEDIDString, > edid_size); It also makes review easier because you don't have to check what goes on outside of the patch context here. It just won't build. > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index dddb5fe16f2c..742adbc460c9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2846,7 +2846,7 @@ static int dce_v10_0_sw_fini(void *handle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)handle; > > - kfree(adev->mode_info.bios_hardcoded_edid); > + drm_edid_free(adev->mode_info.bios_hardcoded_edid); > > drm_kms_helper_poll_fini(adev_to_drm(adev)); > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 11780e4d7e9f..8d46ebadfa46 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2973,7 +2973,7 @@ static int dce_v11_0_sw_fini(void *handle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)handle; > > - kfree(adev->mode_info.bios_hardcoded_edid); > + drm_edid_free(adev->mode_info.bios_hardcoded_edid); > > drm_kms_helper_poll_fini(adev_to_drm(adev)); > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index 05c0df97f01d..f08dc6a3886f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -2745,7 +2745,7 @@ static int dce_v6_0_sw_fini(void *handle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)handle; > > - kfree(adev->mode_info.bios_hardcoded_edid); > + drm_edid_free(adev->mode_info.bios_hardcoded_edid); > > drm_kms_helper_poll_fini(adev_to_drm(adev)); > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index dc73e301d937..a6a3adf2ae13 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -2766,7 +2766,7 @@ static int dce_v8_0_sw_fini(void *handle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)handle; > > - kfree(adev->mode_info.bios_hardcoded_edid); > + drm_edid_free(adev->mode_info.bios_hardcoded_edid); > > drm_kms_helper_poll_fini(adev_to_drm(adev)); -- Jani Nikula, Intel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] drm/radeon: convert bios_hardcoded_edid to drm_edid 2024-07-26 13:40 [PATCH v2 0/2] drm/{amdgpu,radeon}: convert bios_hardcoded_edid to drm_edid Thomas Weißschuh 2024-07-26 13:40 ` [PATCH v2 1/2] drm/amdgpu: " Thomas Weißschuh @ 2024-07-26 13:40 ` Thomas Weißschuh 2024-07-26 14:24 ` Alex Deucher 1 sibling, 1 reply; 6+ messages in thread From: Thomas Weißschuh @ 2024-07-26 13:40 UTC (permalink / raw) To: Alex Deucher, Christian König, David Airlie, Daniel Vetter, Xinhui Pan Cc: amd-gfx, dri-devel, linux-kernel, Thomas Weißschuh Instead of manually passing around 'struct edid *' and its size, use 'struct drm_edid', which encapsulates a validated combination of both. As the drm_edid_ can handle NULL gracefully, the explicit checks can be dropped. Also save a few characters by transforming '&array[0]' to the equivalent 'array' and using 'max_t(int, ...)' instead of manual casts. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- drivers/gpu/drm/radeon/radeon_atombios.c | 17 ++++++----------- drivers/gpu/drm/radeon/radeon_combios.c | 26 +++++--------------------- drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++-- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 4 ++-- 5 files changed, 16 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 168f3f94003b..81a0a91921b9 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1716,23 +1716,18 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct case LCD_FAKE_EDID_PATCH_RECORD_TYPE: fake_edid_record = (ATOM_FAKE_EDID_PATCH_RECORD *)record; if (fake_edid_record->ucFakeEDIDLength) { - struct edid *edid; + const struct drm_edid *edid; int edid_size; if (fake_edid_record->ucFakeEDIDLength == 128) edid_size = fake_edid_record->ucFakeEDIDLength; else edid_size = fake_edid_record->ucFakeEDIDLength * 128; - edid = kmemdup(&fake_edid_record->ucFakeEDIDString[0], - edid_size, GFP_KERNEL); - if (edid) { - if (drm_edid_is_valid(edid)) { - rdev->mode_info.bios_hardcoded_edid = edid; - rdev->mode_info.bios_hardcoded_edid_size = edid_size; - } else { - kfree(edid); - } - } + edid = drm_edid_alloc(fake_edid_record->ucFakeEDIDString, edid_size); + if (drm_edid_valid(edid)) + rdev->mode_info.bios_hardcoded_edid = edid; + else + drm_edid_free(edid); record += struct_size(fake_edid_record, ucFakeEDIDString, edid_size); diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 41ddc576f8f8..df8d7f56b028 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -370,7 +370,7 @@ static uint16_t combios_get_table_offset(struct drm_device *dev, bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) { int edid_info, size; - struct edid *edid; + const struct drm_edid *edid; unsigned char *raw; edid_info = combios_get_table_offset(rdev_to_drm(rdev), COMBIOS_HARDCODED_EDID_TABLE); if (!edid_info) @@ -378,19 +378,14 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) raw = rdev->bios + edid_info; size = EDID_LENGTH * (raw[0x7e] + 1); - edid = kmalloc(size, GFP_KERNEL); - if (edid == NULL) - return false; - - memcpy((unsigned char *)edid, raw, size); + edid = drm_edid_alloc(raw, size); - if (!drm_edid_is_valid(edid)) { - kfree(edid); + if (!drm_edid_valid(edid)) { + drm_edid_free(edid); return false; } rdev->mode_info.bios_hardcoded_edid = edid; - rdev->mode_info.bios_hardcoded_edid_size = size; return true; } @@ -398,18 +393,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) struct edid * radeon_bios_get_hardcoded_edid(struct radeon_device *rdev) { - struct edid *edid; - - if (rdev->mode_info.bios_hardcoded_edid) { - edid = kmalloc(rdev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL); - if (edid) { - memcpy((unsigned char *)edid, - (unsigned char *)rdev->mode_info.bios_hardcoded_edid, - rdev->mode_info.bios_hardcoded_edid_size); - return edid; - } - } - return NULL; + return drm_edid_duplicate(drm_edid_raw(rdev->mode_info.bios_hardcoded_edid)); } static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rdev, diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 880edabfc9e3..528a8f3677c2 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1059,7 +1059,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force) */ if ((!rdev->is_atom_bios) && (ret == connector_status_disconnected) && - rdev->mode_info.bios_hardcoded_edid_size) { + rdev->mode_info.bios_hardcoded_edid) { ret = connector_status_connected; } @@ -1392,7 +1392,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) out: if ((!rdev->is_atom_bios) && (ret == connector_status_disconnected) && - rdev->mode_info.bios_hardcoded_edid_size) { + rdev->mode_info.bios_hardcoded_edid) { radeon_connector->use_digital = true; ret = connector_status_connected; } diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 10fd58f400bc..8f5f8abcb1b4 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -1658,7 +1658,7 @@ void radeon_modeset_fini(struct radeon_device *rdev) rdev->mode_info.mode_config_initialized = false; } - kfree(rdev->mode_info.bios_hardcoded_edid); + drm_edid_free(rdev->mode_info.bios_hardcoded_edid); /* free i2c buses */ radeon_i2c_fini(rdev); diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index e0a5af180801..421c83fc70dc 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -39,6 +39,7 @@ #include <linux/i2c-algo-bit.h> struct edid; +struct drm_edid; struct radeon_bo; struct radeon_device; @@ -262,8 +263,7 @@ struct radeon_mode_info { /* Output CSC */ struct drm_property *output_csc_property; /* hardcoded DFP edid from BIOS */ - struct edid *bios_hardcoded_edid; - int bios_hardcoded_edid_size; + const struct drm_edid *bios_hardcoded_edid; /* firmware flags */ u16 firmware_flags; -- 2.45.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] drm/radeon: convert bios_hardcoded_edid to drm_edid 2024-07-26 13:40 ` [PATCH v2 2/2] drm/radeon: " Thomas Weißschuh @ 2024-07-26 14:24 ` Alex Deucher 2024-07-29 9:47 ` Jani Nikula 0 siblings, 1 reply; 6+ messages in thread From: Alex Deucher @ 2024-07-26 14:24 UTC (permalink / raw) To: Thomas Weißschuh Cc: Alex Deucher, Christian König, David Airlie, Daniel Vetter, Xinhui Pan, amd-gfx, dri-devel, linux-kernel Applied the series. Thanks! Alex On Fri, Jul 26, 2024 at 9:40 AM Thomas Weißschuh <linux@weissschuh.net> wrote: > > Instead of manually passing around 'struct edid *' and its size, > use 'struct drm_edid', which encapsulates a validated combination of > both. > > As the drm_edid_ can handle NULL gracefully, the explicit checks can be > dropped. > > Also save a few characters by transforming '&array[0]' to the equivalent > 'array' and using 'max_t(int, ...)' instead of manual casts. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > drivers/gpu/drm/radeon/radeon_atombios.c | 17 ++++++----------- > drivers/gpu/drm/radeon/radeon_combios.c | 26 +++++--------------------- > drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++-- > drivers/gpu/drm/radeon/radeon_display.c | 2 +- > drivers/gpu/drm/radeon/radeon_mode.h | 4 ++-- > 5 files changed, 16 insertions(+), 37 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c > index 168f3f94003b..81a0a91921b9 100644 > --- a/drivers/gpu/drm/radeon/radeon_atombios.c > +++ b/drivers/gpu/drm/radeon/radeon_atombios.c > @@ -1716,23 +1716,18 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct > case LCD_FAKE_EDID_PATCH_RECORD_TYPE: > fake_edid_record = (ATOM_FAKE_EDID_PATCH_RECORD *)record; > if (fake_edid_record->ucFakeEDIDLength) { > - struct edid *edid; > + const struct drm_edid *edid; > int edid_size; > > if (fake_edid_record->ucFakeEDIDLength == 128) > edid_size = fake_edid_record->ucFakeEDIDLength; > else > edid_size = fake_edid_record->ucFakeEDIDLength * 128; > - edid = kmemdup(&fake_edid_record->ucFakeEDIDString[0], > - edid_size, GFP_KERNEL); > - if (edid) { > - if (drm_edid_is_valid(edid)) { > - rdev->mode_info.bios_hardcoded_edid = edid; > - rdev->mode_info.bios_hardcoded_edid_size = edid_size; > - } else { > - kfree(edid); > - } > - } > + edid = drm_edid_alloc(fake_edid_record->ucFakeEDIDString, edid_size); > + if (drm_edid_valid(edid)) > + rdev->mode_info.bios_hardcoded_edid = edid; > + else > + drm_edid_free(edid); > record += struct_size(fake_edid_record, > ucFakeEDIDString, > edid_size); > diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c > index 41ddc576f8f8..df8d7f56b028 100644 > --- a/drivers/gpu/drm/radeon/radeon_combios.c > +++ b/drivers/gpu/drm/radeon/radeon_combios.c > @@ -370,7 +370,7 @@ static uint16_t combios_get_table_offset(struct drm_device *dev, > bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) > { > int edid_info, size; > - struct edid *edid; > + const struct drm_edid *edid; > unsigned char *raw; > edid_info = combios_get_table_offset(rdev_to_drm(rdev), COMBIOS_HARDCODED_EDID_TABLE); > if (!edid_info) > @@ -378,19 +378,14 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) > > raw = rdev->bios + edid_info; > size = EDID_LENGTH * (raw[0x7e] + 1); > - edid = kmalloc(size, GFP_KERNEL); > - if (edid == NULL) > - return false; > - > - memcpy((unsigned char *)edid, raw, size); > + edid = drm_edid_alloc(raw, size); > > - if (!drm_edid_is_valid(edid)) { > - kfree(edid); > + if (!drm_edid_valid(edid)) { > + drm_edid_free(edid); > return false; > } > > rdev->mode_info.bios_hardcoded_edid = edid; > - rdev->mode_info.bios_hardcoded_edid_size = size; > return true; > } > > @@ -398,18 +393,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) > struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev) > { > - struct edid *edid; > - > - if (rdev->mode_info.bios_hardcoded_edid) { > - edid = kmalloc(rdev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL); > - if (edid) { > - memcpy((unsigned char *)edid, > - (unsigned char *)rdev->mode_info.bios_hardcoded_edid, > - rdev->mode_info.bios_hardcoded_edid_size); > - return edid; > - } > - } > - return NULL; > + return drm_edid_duplicate(drm_edid_raw(rdev->mode_info.bios_hardcoded_edid)); > } > > static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rdev, > diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c > index 880edabfc9e3..528a8f3677c2 100644 > --- a/drivers/gpu/drm/radeon/radeon_connectors.c > +++ b/drivers/gpu/drm/radeon/radeon_connectors.c > @@ -1059,7 +1059,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force) > */ > if ((!rdev->is_atom_bios) && > (ret == connector_status_disconnected) && > - rdev->mode_info.bios_hardcoded_edid_size) { > + rdev->mode_info.bios_hardcoded_edid) { > ret = connector_status_connected; > } > > @@ -1392,7 +1392,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) > out: > if ((!rdev->is_atom_bios) && > (ret == connector_status_disconnected) && > - rdev->mode_info.bios_hardcoded_edid_size) { > + rdev->mode_info.bios_hardcoded_edid) { > radeon_connector->use_digital = true; > ret = connector_status_connected; > } > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 10fd58f400bc..8f5f8abcb1b4 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1658,7 +1658,7 @@ void radeon_modeset_fini(struct radeon_device *rdev) > rdev->mode_info.mode_config_initialized = false; > } > > - kfree(rdev->mode_info.bios_hardcoded_edid); > + drm_edid_free(rdev->mode_info.bios_hardcoded_edid); > > /* free i2c buses */ > radeon_i2c_fini(rdev); > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index e0a5af180801..421c83fc70dc 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -39,6 +39,7 @@ > #include <linux/i2c-algo-bit.h> > > struct edid; > +struct drm_edid; > struct radeon_bo; > struct radeon_device; > > @@ -262,8 +263,7 @@ struct radeon_mode_info { > /* Output CSC */ > struct drm_property *output_csc_property; > /* hardcoded DFP edid from BIOS */ > - struct edid *bios_hardcoded_edid; > - int bios_hardcoded_edid_size; > + const struct drm_edid *bios_hardcoded_edid; > > /* firmware flags */ > u16 firmware_flags; > > -- > 2.45.2 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] drm/radeon: convert bios_hardcoded_edid to drm_edid 2024-07-26 14:24 ` Alex Deucher @ 2024-07-29 9:47 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2024-07-29 9:47 UTC (permalink / raw) To: Alex Deucher, Thomas Weißschuh Cc: Alex Deucher, Christian König, David Airlie, Daniel Vetter, Xinhui Pan, amd-gfx, dri-devel, linux-kernel On Fri, 26 Jul 2024, Alex Deucher <alexdeucher@gmail.com> wrote: > Applied the series. Thanks! Ah, replied to patch 1 before noticing this. Never mind about the bikeshedding. :) BR, Jani. -- Jani Nikula, Intel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-29 9:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-26 13:40 [PATCH v2 0/2] drm/{amdgpu,radeon}: convert bios_hardcoded_edid to drm_edid Thomas Weißschuh
2024-07-26 13:40 ` [PATCH v2 1/2] drm/amdgpu: " Thomas Weißschuh
2024-07-29 9:46 ` Jani Nikula
2024-07-26 13:40 ` [PATCH v2 2/2] drm/radeon: " Thomas Weißschuh
2024-07-26 14:24 ` Alex Deucher
2024-07-29 9:47 ` Jani Nikula
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox