mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 18:20:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/panel: panel-simple: get rid of panel_dpi hack

Browse source 
The empty panel_dpi struct was only ever used as a discriminant, but
it's kind of a hack, and with the reworks done in the previous patches,
we shouldn't need it anymore.

Let's get rid of it.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Tested-by: Francesco Dolcini <francesco.dolcini@toradex.com> # Toradex Colibri iMX6
Link: https://lore.kernel.org/r/20250626-drm-panel-simple-fixes-v2-5-5afcaa608bdc@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
Maxime Ripard 2025-06-26 12:05:03 +02:00
parent 47c08262f3
commit f6faebc11a
No known key found for this signature in database
GPG key ID: 275FCE19A23DBE76
1 changed files with 18 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/gpu/drm/panel/panel-simple.c
View file

@ -439,8 +439,6 @@ static const struct drm_panel_funcs panel_simple_funcs = {
.get_timings = panel_simple_get_timings, .get_timings = panel_simple_get_timings,
}; };
static struct panel_desc panel_dpi;
static struct panel_desc *panel_dpi_probe(struct device *dev) static struct panel_desc *panel_dpi_probe(struct device *dev)
{ {
struct display_timing *timing; struct display_timing *timing;
@ -593,11 +591,17 @@ static const struct panel_desc *panel_simple_get_desc(struct device *dev)
const struct panel_desc *desc; const struct panel_desc *desc;
desc = of_device_get_match_data(dev); desc = of_device_get_match_data(dev);
if (!desc) if (!desc) {
return ERR_PTR(-ENODEV); /*
* panel-dpi probes without a descriptor and
if (desc == &panel_dpi) * panel_dpi_probe() will initialize one for us
* based on the device tree.
*/
if (of_device_is_compatible(dev->of_node, "panel-dpi"))
return panel_dpi_probe(dev); return panel_dpi_probe(dev);
else
return ERR_PTR(-ENODEV);
}
return desc; return desc;
} }
@ -651,7 +655,7 @@ static struct panel_simple *panel_simple_probe(struct device *dev)
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);
} }
if ((desc != &panel_dpi) && if (!of_device_is_compatible(dev->of_node, "panel-dpi") &&
!of_get_display_timing(dev->of_node, "panel-timing", &dt)) !of_get_display_timing(dev->of_node, "panel-timing", &dt))
panel_simple_parse_panel_timing_node(dev, panel, &dt); panel_simple_parse_panel_timing_node(dev, panel, &dt);
@ -5400,7 +5404,12 @@ static const struct of_device_id platform_of_match[] = {
}, { }, {
/* Must be the last entry */ /* Must be the last entry */
.compatible = "panel-dpi", .compatible = "panel-dpi",
.data = &panel_dpi,
/*
* Explicitly NULL, the panel_desc structure will be
* allocated by panel_dpi_probe().
*/
.data = NULL,
}, { }, {
/* sentinel */ /* sentinel */
} }