diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-06-06 09:18:43 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 09:13:30 -0400 |
commit | 26c91a3898f1fd52af4e90d03ad740586112a6f7 (patch) | |
tree | aaa64a9574318dbcc55250f1c03fed1fa7a20775 | |
parent | 138fe53ef8d341dd27a0f01d55f8774d33b880f8 (diff) |
drm/omap: Don't store video mode internally for external encoders
The omap_dss_device .set_timings() operation for external encoders
stores the video mode in the device data structure. That mode is then
never used again. Drop it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index 824f302a515b..05d128600712 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | |||
@@ -25,8 +25,6 @@ struct panel_drv_data { | |||
25 | struct omap_dss_device dssdev; | 25 | struct omap_dss_device dssdev; |
26 | 26 | ||
27 | struct gpio_desc *enable_gpio; | 27 | struct gpio_desc *enable_gpio; |
28 | |||
29 | struct videomode vm; | ||
30 | }; | 28 | }; |
31 | 29 | ||
32 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) | 30 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) |
@@ -90,13 +88,10 @@ static void opa362_disable(struct omap_dss_device *dssdev) | |||
90 | static void opa362_set_timings(struct omap_dss_device *dssdev, | 88 | static void opa362_set_timings(struct omap_dss_device *dssdev, |
91 | const struct videomode *vm) | 89 | const struct videomode *vm) |
92 | { | 90 | { |
93 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
94 | struct omap_dss_device *src = dssdev->src; | 91 | struct omap_dss_device *src = dssdev->src; |
95 | 92 | ||
96 | dev_dbg(dssdev->dev, "set_timings\n"); | 93 | dev_dbg(dssdev->dev, "set_timings\n"); |
97 | 94 | ||
98 | ddata->vm = *vm; | ||
99 | |||
100 | src->ops->set_timings(src, vm); | 95 | src->ops->set_timings(src, vm); |
101 | } | 96 | } |
102 | 97 | ||
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c index de4233980898..86c90c15681e 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | |||
@@ -20,8 +20,6 @@ struct panel_drv_data { | |||
20 | struct omap_dss_device dssdev; | 20 | struct omap_dss_device dssdev; |
21 | 21 | ||
22 | struct gpio_desc *pd_gpio; | 22 | struct gpio_desc *pd_gpio; |
23 | |||
24 | struct videomode vm; | ||
25 | }; | 23 | }; |
26 | 24 | ||
27 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) | 25 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) |
@@ -87,11 +85,8 @@ static void tfp410_fix_timings(struct videomode *vm) | |||
87 | static void tfp410_set_timings(struct omap_dss_device *dssdev, | 85 | static void tfp410_set_timings(struct omap_dss_device *dssdev, |
88 | const struct videomode *vm) | 86 | const struct videomode *vm) |
89 | { | 87 | { |
90 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
91 | struct omap_dss_device *src = dssdev->src; | 88 | struct omap_dss_device *src = dssdev->src; |
92 | 89 | ||
93 | ddata->vm = *vm; | ||
94 | |||
95 | src->ops->set_timings(src, vm); | 90 | src->ops->set_timings(src, vm); |
96 | } | 91 | } |
97 | 92 | ||
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c index d9a590244eaa..1e24559e0aa1 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | |||
@@ -28,8 +28,6 @@ struct panel_drv_data { | |||
28 | struct gpio_desc *ct_cp_hpd_gpio; | 28 | struct gpio_desc *ct_cp_hpd_gpio; |
29 | struct gpio_desc *ls_oe_gpio; | 29 | struct gpio_desc *ls_oe_gpio; |
30 | struct gpio_desc *hpd_gpio; | 30 | struct gpio_desc *hpd_gpio; |
31 | |||
32 | struct videomode vm; | ||
33 | }; | 31 | }; |
34 | 32 | ||
35 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) | 33 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) |
@@ -96,11 +94,8 @@ static void tpd_disable(struct omap_dss_device *dssdev) | |||
96 | static void tpd_set_timings(struct omap_dss_device *dssdev, | 94 | static void tpd_set_timings(struct omap_dss_device *dssdev, |
97 | const struct videomode *vm) | 95 | const struct videomode *vm) |
98 | { | 96 | { |
99 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
100 | struct omap_dss_device *src = dssdev->src; | 97 | struct omap_dss_device *src = dssdev->src; |
101 | 98 | ||
102 | ddata->vm = *vm; | ||
103 | |||
104 | src->ops->set_timings(src, vm); | 99 | src->ops->set_timings(src, vm); |
105 | } | 100 | } |
106 | 101 | ||