drm/radeon: convert bios_hardcoded_edid to drm_edid

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 168f3f94003bff323081726e963134fa1f8c2f9b..81a0a91921b95ed4dd434bcb7f45ea019b054af5 100644 (file)
--- 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 41ddc576f8f8b292357833d97257d061cb3d318f..df8d7f56b0289996fef8e049d7ce36295f37314d 100644 (file)
--- 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 880edabfc9e3d00964f658af6b98860f430f45c9..528a8f3677c295c5cfb40bc888214d1f461b7020 100644 (file)
--- 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 10fd58f400bc5960100b0b734b3a7bb07dbf19fe..8f5f8abcb1b4703c8cfa5220079c4a5de99a8aed 100644 (file)
--- 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 e0a5af18080170c771cebcf16153691bcda8bfb5..421c83fc70dc834015336346f5b11681fb1eb9e7 100644 (file)
--- 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;