forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
From 2a7bf5c8a7db22f7fb04af795c23b1fb5a2ac2e3 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 18 Apr 2024 15:39:16 +0100
|
|
Subject: [PATCH 1054/1085] drm/panel-simple: Remove custom handling of
|
|
orientation
|
|
|
|
The framework now handles reading orientation from DT, therefore
|
|
remove the custom get_orientation hook from panel-simple.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/panel/panel-simple.c | 22 ----------------------
|
|
1 file changed, 22 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/panel/panel-simple.c
|
|
+++ b/drivers/gpu/drm/panel/panel-simple.c
|
|
@@ -154,8 +154,6 @@ struct panel_simple {
|
|
struct edid *edid;
|
|
|
|
struct drm_display_mode override_mode;
|
|
-
|
|
- enum drm_panel_orientation orientation;
|
|
};
|
|
|
|
static inline struct panel_simple *to_panel_simple(struct drm_panel *panel)
|
|
@@ -412,12 +410,6 @@ static int panel_simple_get_modes(struct
|
|
/* add hard-coded panel modes */
|
|
num += panel_simple_get_non_edid_modes(p, connector);
|
|
|
|
- /*
|
|
- * TODO: Remove once all drm drivers call
|
|
- * drm_connector_set_orientation_from_panel()
|
|
- */
|
|
- drm_connector_set_panel_orientation(connector, p->orientation);
|
|
-
|
|
return num;
|
|
}
|
|
|
|
@@ -438,20 +430,12 @@ static int panel_simple_get_timings(stru
|
|
return p->desc->num_timings;
|
|
}
|
|
|
|
-static enum drm_panel_orientation panel_simple_get_orientation(struct drm_panel *panel)
|
|
-{
|
|
- struct panel_simple *p = to_panel_simple(panel);
|
|
-
|
|
- return p->orientation;
|
|
-}
|
|
-
|
|
static const struct drm_panel_funcs panel_simple_funcs = {
|
|
.disable = panel_simple_disable,
|
|
.unprepare = panel_simple_unprepare,
|
|
.prepare = panel_simple_prepare,
|
|
.enable = panel_simple_enable,
|
|
.get_modes = panel_simple_get_modes,
|
|
- .get_orientation = panel_simple_get_orientation,
|
|
.get_timings = panel_simple_get_timings,
|
|
};
|
|
|
|
@@ -579,12 +563,6 @@ static int panel_simple_probe(struct dev
|
|
return dev_err_probe(dev, PTR_ERR(panel->enable_gpio),
|
|
"failed to request GPIO\n");
|
|
|
|
- err = of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
|
|
- if (err) {
|
|
- dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err);
|
|
- return err;
|
|
- }
|
|
-
|
|
ddc = of_parse_phandle(dev->of_node, "ddc-i2c-bus", 0);
|
|
if (ddc) {
|
|
panel->ddc = of_find_i2c_adapter_by_node(ddc);
|