Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-02 08:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/panel-edp: Avoid adding multiple preferred modes

Browse Source 
If a non generic edp-panel is under aux-bus, the mode read from edid would
still be selected as preferred and results in multiple preferred modes,
which is ambiguous.

If both hard-coded mode and edid exists, only add mode from hard-coded.

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231117215056.1883314-4-hsinyi@chromium.org
This commit is contained in:
Hsin-Yi Wang 2023-11-17 13:46:34 -08:00 committed by Douglas Anderson
parent 70e0d5550f
commit fb3f43d50d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/panel/panel-edp.c
View File

@ -589,6 +589,7 @@ static int panel_edp_get_modes(struct drm_panel *panel,
{ {
struct panel_edp *p = to_panel_edp(panel); struct panel_edp *p = to_panel_edp(panel);
int num = 0; int num = 0;
bool has_hard_coded_modes = p->desc->num_timings || p->desc->num_modes;
bool has_override_edid_mode = p->detected_panel && bool has_override_edid_mode = p->detected_panel &&
p->detected_panel != ERR_PTR(-EINVAL) && p->detected_panel != ERR_PTR(-EINVAL) &&
p->detected_panel->override_edid_mode; p->detected_panel->override_edid_mode;
@ -599,7 +600,11 @@ static int panel_edp_get_modes(struct drm_panel *panel,
if (!p->edid) if (!p->edid)
p->edid = drm_get_edid(connector, p->ddc); p->edid = drm_get_edid(connector, p->ddc);
if (p->edid) { /*
* If both edid and hard-coded modes exists, skip edid modes to
* avoid multiple preferred modes.
*/
if (p->edid && !has_hard_coded_modes) {
if (has_override_edid_mode) { if (has_override_edid_mode) {
/* /*
* override_edid_mode is specified. Use * override_edid_mode is specified. Use
@ -616,12 +621,7 @@ static int panel_edp_get_modes(struct drm_panel *panel,
pm_runtime_put_autosuspend(panel->dev); pm_runtime_put_autosuspend(panel->dev);
} }
/* if (has_hard_coded_modes)
* Add hard-coded panel modes. Don't call this if there are no timings
* and no modes (the generic edp-panel case) because it will clobber
* the display_info that was already set by drm_add_edid_modes().
*/
if (p->desc->num_timings || p->desc->num_modes)
num += panel_edp_get_non_edid_modes(p, connector); num += panel_edp_get_non_edid_modes(p, connector);
else if (!num) else if (!num)
dev_warn(p->base.dev, "No display modes\n"); dev_warn(p->base.dev, "No display modes\n");