The omap_dss_device structure stores a videomode. All the connector and panel drivers that use omap_dss_device also store the videomode in their own panel_drv_data structures. There's no need to duplicate, remove the videomode field from omap_dss_device.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com Reviewed-by: Sebastian Reichel sebastian.reichel@collabora.co.uk --- drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 2 -- drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 2 -- drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 2 -- drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 1 - drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 1 - drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 1 - drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 8 +++----- drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 -- drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 -- drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 -- 15 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c index a49bc4a8dcae..6b640ede6614 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c @@ -132,7 +132,6 @@ static void tvc_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.atv->set_timings(in, vm); } @@ -186,7 +185,6 @@ static int tvc_probe(struct platform_device *pdev) dssdev->dev = &pdev->dev; dssdev->type = OMAP_DISPLAY_TYPE_VENC; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = tvc_pal_vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c index c320f3c5ae6c..84598ea12a9b 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c @@ -139,7 +139,6 @@ static void dvic_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dvi->set_timings(in, vm); } @@ -403,7 +402,6 @@ static int dvic_probe(struct platform_device *pdev) dssdev->dev = &pdev->dev; dssdev->type = OMAP_DISPLAY_TYPE_DVI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = dvic_default_vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c index 6f12f9bb8054..e031280468fb 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c @@ -142,7 +142,6 @@ static void hdmic_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.hdmi->set_timings(in, vm); } @@ -368,7 +367,6 @@ static int hdmic_probe(struct platform_device *pdev) dssdev->dev = &pdev->dev; dssdev->type = OMAP_DISPLAY_TYPE_HDMI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = hdmic_default_vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index 27d63a14efe3..0e3f4a20e531 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c @@ -143,7 +143,6 @@ static void opa362_set_timings(struct omap_dss_device *dssdev, dev_dbg(dssdev->dev, "set_timings\n");
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.atv->set_timings(in, vm); } diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c index 566c63a3ad59..08e63e39d0b7 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c @@ -137,7 +137,6 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev, tfp410_fix_timings(vm);
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c index 4753e5455f82..f35e2afa3e9c 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c @@ -131,7 +131,6 @@ static void tpd_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.hdmi->set_timings(in, vm); } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c index e874f0b72798..bbd630ead3c1 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c @@ -131,7 +131,6 @@ static void panel_dpi_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -230,7 +229,6 @@ static int panel_dpi_probe(struct platform_device *pdev) dssdev->driver = &panel_dpi_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index d7c57d84d7bd..555ab2ac5576 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -956,9 +956,8 @@ static int dsicm_update(struct omap_dss_device *dssdev, }
/* XXX no need to send this every frame, but dsi break if not done */ - r = dsicm_set_update_window(ddata, 0, 0, - dssdev->panel.vm.hactive, - dssdev->panel.vm.vactive); + r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive, + ddata->vm.vactive); if (r) goto err;
@@ -1089,7 +1088,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, }
size = min((u32)w * h * 3, - dssdev->panel.vm.hactive * dssdev->panel.vm.vactive * 3); + ddata->vm.hactive * ddata->vm.vactive * 3);
in->ops.dsi->bus_lock(in);
@@ -1331,7 +1330,6 @@ static int dsicm_probe(struct platform_device *pdev) dssdev = &ddata->dssdev; dssdev->dev = dev; dssdev->driver = &dsicm_ops; - dssdev->panel.vm = ddata->vm; dssdev->type = OMAP_DISPLAY_TYPE_DSI; dssdev->owner = THIS_MODULE;
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c index ad98d2ffcf1b..0a6ab6470253 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c @@ -206,7 +206,6 @@ static void lb035q02_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -281,7 +280,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi) dssdev->driver = &lb035q02_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c index 0846fb594352..9816e661c97d 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c @@ -200,7 +200,6 @@ static void nec_8048_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -305,7 +304,6 @@ static int nec_8048_probe(struct spi_device *spi) dssdev->driver = &nec_8048_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c index e7c4a830e214..e259240f96fa 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c @@ -170,7 +170,6 @@ static void sharp_ls_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -281,7 +280,6 @@ static int sharp_ls_probe(struct platform_device *pdev) dssdev->driver = &sharp_ls_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c index 02415592f856..d298a3f56189 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c @@ -671,7 +671,6 @@ static void acx565akm_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.sdi->set_timings(in, vm); } @@ -812,7 +811,6 @@ static int acx565akm_probe(struct spi_device *spi) dssdev->driver = &acx565akm_ops; dssdev->type = OMAP_DISPLAY_TYPE_SDI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c index 3c4036ee7b0c..366e0f71288e 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c @@ -340,7 +340,6 @@ static void td028ttec1_panel_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -406,7 +405,6 @@ static int td028ttec1_panel_probe(struct spi_device *spi) dssdev->driver = &td028ttec1_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c index 14a37b82ee13..8e98232ee9d9 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c @@ -434,7 +434,6 @@ static void tpo_td043_set_timings(struct omap_dss_device *dssdev, struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; - dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); } @@ -549,7 +548,6 @@ static int tpo_td043_probe(struct spi_device *spi) dssdev->driver = &tpo_td043_ops; dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->owner = THIS_MODULE; - dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); if (r) { diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index e3d31b2fee4c..a93afbbe19de 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -458,8 +458,6 @@ struct omap_dss_device { enum omap_display_type output_type;
struct { - struct videomode vm; - enum omap_dss_dsi_pixel_format dsi_pix_fmt; enum omap_dss_dsi_mode dsi_mode; } panel;