| Message ID | 20221024192224.180507-3-hamza.mahfooz@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/edid: add a quirk for two LG monitors to get them to work on 10bpc | expand |
Series is Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry On 2022-10-24 15:22, Hamza Mahfooz wrote: > This reverts commit 55eea8ef98641f6e1e1c202bd3a49a57c1dd4059. > > This quirk is now handled in the DRM core, so we can drop all of > the internal code that was added to handle it. > > Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> > --- > .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 ------------------- > 1 file changed, 35 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 4956a0118215..a21e2ba77ddb 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 > @@ -41,39 +41,6 @@ > #include "dm_helpers.h" > #include "ddc_service_types.h" > > -struct monitor_patch_info { > - unsigned int manufacturer_id; > - unsigned int product_id; > - void (*patch_func)(struct dc_edid_caps *edid_caps, unsigned int param); > - unsigned int patch_param; > -}; > -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param); > - > -static const struct monitor_patch_info monitor_patch_table[] = { > -{0x6D1E, 0x5BBF, set_max_dsc_bpp_limit, 15}, > -{0x6D1E, 0x5B9A, set_max_dsc_bpp_limit, 15}, > -}; > - > -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param) > -{ > - if (edid_caps) > - edid_caps->panel_patch.max_dsc_target_bpp_limit = param; > -} > - > -static int amdgpu_dm_patch_edid_caps(struct dc_edid_caps *edid_caps) > -{ > - int i, ret = 0; > - > - for (i = 0; i < ARRAY_SIZE(monitor_patch_table); i++) > - if ((edid_caps->manufacturer_id == monitor_patch_table[i].manufacturer_id) > - && (edid_caps->product_id == monitor_patch_table[i].product_id)) { > - monitor_patch_table[i].patch_func(edid_caps, monitor_patch_table[i].patch_param); > - ret++; > - } > - > - return ret; > -} > - > /* dm_helpers_parse_edid_caps > * > * Parse edid caps > @@ -148,8 +115,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps( > kfree(sads); > kfree(sadb); > > - amdgpu_dm_patch_edid_caps(edid_caps); > - > return result; > } >
@Daniel Vetter , @Dave Airlie Any objections taking this through the AMD tree or would you rather it landed via drm-misc? Thanks, Alex On Tue, Oct 25, 2022 at 10:21 AM Harry Wentland <harry.wentland@amd.com> wrote: > > Series is > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > > Harry > > On 2022-10-24 15:22, Hamza Mahfooz wrote: > > This reverts commit 55eea8ef98641f6e1e1c202bd3a49a57c1dd4059. > > > > This quirk is now handled in the DRM core, so we can drop all of > > the internal code that was added to handle it. > > > > Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> > > --- > > .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 ------------------- > > 1 file changed, 35 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 4956a0118215..a21e2ba77ddb 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 > > @@ -41,39 +41,6 @@ > > #include "dm_helpers.h" > > #include "ddc_service_types.h" > > > > -struct monitor_patch_info { > > - unsigned int manufacturer_id; > > - unsigned int product_id; > > - void (*patch_func)(struct dc_edid_caps *edid_caps, unsigned int param); > > - unsigned int patch_param; > > -}; > > -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param); > > - > > -static const struct monitor_patch_info monitor_patch_table[] = { > > -{0x6D1E, 0x5BBF, set_max_dsc_bpp_limit, 15}, > > -{0x6D1E, 0x5B9A, set_max_dsc_bpp_limit, 15}, > > -}; > > - > > -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param) > > -{ > > - if (edid_caps) > > - edid_caps->panel_patch.max_dsc_target_bpp_limit = param; > > -} > > - > > -static int amdgpu_dm_patch_edid_caps(struct dc_edid_caps *edid_caps) > > -{ > > - int i, ret = 0; > > - > > - for (i = 0; i < ARRAY_SIZE(monitor_patch_table); i++) > > - if ((edid_caps->manufacturer_id == monitor_patch_table[i].manufacturer_id) > > - && (edid_caps->product_id == monitor_patch_table[i].product_id)) { > > - monitor_patch_table[i].patch_func(edid_caps, monitor_patch_table[i].patch_param); > > - ret++; > > - } > > - > > - return ret; > > -} > > - > > /* dm_helpers_parse_edid_caps > > * > > * Parse edid caps > > @@ -148,8 +115,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps( > > kfree(sads); > > kfree(sadb); > > > > - amdgpu_dm_patch_edid_caps(edid_caps); > > - > > return result; > > } > > >
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 4956a0118215..a21e2ba77ddb 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 @@ -41,39 +41,6 @@ #include "dm_helpers.h" #include "ddc_service_types.h" -struct monitor_patch_info { - unsigned int manufacturer_id; - unsigned int product_id; - void (*patch_func)(struct dc_edid_caps *edid_caps, unsigned int param); - unsigned int patch_param; -}; -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param); - -static const struct monitor_patch_info monitor_patch_table[] = { -{0x6D1E, 0x5BBF, set_max_dsc_bpp_limit, 15}, -{0x6D1E, 0x5B9A, set_max_dsc_bpp_limit, 15}, -}; - -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param) -{ - if (edid_caps) - edid_caps->panel_patch.max_dsc_target_bpp_limit = param; -} - -static int amdgpu_dm_patch_edid_caps(struct dc_edid_caps *edid_caps) -{ - int i, ret = 0; - - for (i = 0; i < ARRAY_SIZE(monitor_patch_table); i++) - if ((edid_caps->manufacturer_id == monitor_patch_table[i].manufacturer_id) - && (edid_caps->product_id == monitor_patch_table[i].product_id)) { - monitor_patch_table[i].patch_func(edid_caps, monitor_patch_table[i].patch_param); - ret++; - } - - return ret; -} - /* dm_helpers_parse_edid_caps * * Parse edid caps @@ -148,8 +115,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps( kfree(sads); kfree(sadb); - amdgpu_dm_patch_edid_caps(edid_caps); - return result; }
This reverts commit 55eea8ef98641f6e1e1c202bd3a49a57c1dd4059. This quirk is now handled in the DRM core, so we can drop all of the internal code that was added to handle it. Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 ------------------- 1 file changed, 35 deletions(-)