[PATCH v7 06/15] drm/amd/display: get panel id with drm_edid helper

[Melissa Wen]

Instead of using driver-specific code, use DRM helpers.

Reviewed-by: Mario Limonciello <mario.limoncie...@amd.com>
Signed-off-by: Melissa Wen <m...@igalia.com>
---
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index 632cf2a32a4e..c055841c3a8f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -49,16 +49,11 @@
 #include "ddc_service_types.h"
 #include "clk_mgr.h"
 
-static u32 edid_extract_panel_id(struct edid *edid)
+static void apply_edid_quirks(struct drm_device *dev,
+                             const struct drm_edid *drm_edid,
+                             struct dc_edid_caps *edid_caps)
 {
-       return (u32)edid->mfg_id[0] << 24   |
-              (u32)edid->mfg_id[1] << 16   |
-              (u32)EDID_PRODUCT_ID(edid);
-}
-
-static void apply_edid_quirks(struct drm_device *dev, struct edid *edid, 
struct dc_edid_caps *edid_caps)
-{
-       uint32_t panel_id = edid_extract_panel_id(edid);
+       uint32_t panel_id = drm_edid_get_panel_id(drm_edid);
 
        switch (panel_id) {
        /* Workaround for monitors that need a delay after detecting the link */
@@ -143,7 +138,7 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
 
        edid_caps->edid_hdmi = connector->display_info.is_hdmi;
 
-       apply_edid_quirks(dev, edid_buf, edid_caps);
+       apply_edid_quirks(dev, drm_edid, edid_caps);
 
        sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);
        if (sad_count <= 0) {
-- 
2.51.0