korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 23:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/omap: displays: Remove videomode from omap_dss_device structure

Browse Source 
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>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2018-02-27 20:11:52 +02:00 committed by Tomi Valkeinen
parent e0528c9440
commit d65b0e0530
15 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
View File

@ -132,7 +132,6 @@ static void tvc_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.atv->set_timings(in, 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->dev = &pdev->dev;
dssdev->type = OMAP_DISPLAY_TYPE_VENC; dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = tvc_pal_vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/connector-dvi.c
View File

@ -139,7 +139,6 @@ static void dvic_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dvi->set_timings(in, 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->dev = &pdev->dev;
dssdev->type = OMAP_DISPLAY_TYPE_DVI; dssdev->type = OMAP_DISPLAY_TYPE_DVI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = dvic_default_vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
View File

@ -142,7 +142,6 @@ static void hdmic_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.hdmi->set_timings(in, 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->dev = &pdev->dev;
dssdev->type = OMAP_DISPLAY_TYPE_HDMI; dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = hdmic_default_vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

1
drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
View File

@ -143,7 +143,6 @@ static void opa362_set_timings(struct omap_dss_device *dssdev,
dev_dbg(dssdev->dev, "set_timings\n"); dev_dbg(dssdev->dev, "set_timings\n");
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.atv->set_timings(in, vm); in->ops.atv->set_timings(in, vm);
} }

1
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
View File

@ -137,7 +137,6 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev,
tfp410_fix_timings(vm); tfp410_fix_timings(vm);
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, vm); in->ops.dpi->set_timings(in, vm);
} }

1
drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
View File

@ -131,7 +131,6 @@ static void tpd_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.hdmi->set_timings(in, vm); in->ops.hdmi->set_timings(in, vm);
} }

2
drivers/gpu/drm/omapdrm/displays/panel-dpi.c
View File

@ -131,7 +131,6 @@ static void panel_dpi_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &panel_dpi_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

8
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
View File

@ -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 */ /* XXX no need to send this every frame, but dsi break if not done */
r = dsicm_set_update_window(ddata, 0, 0, r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive,
dssdev->panel.vm.hactive, ddata->vm.vactive);
dssdev->panel.vm.vactive);
if (r) if (r)
goto err; goto err;
@ -1089,7 +1088,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
} }
size = min((u32)w * h * 3, 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); in->ops.dsi->bus_lock(in);
@ -1331,7 +1330,6 @@ static int dsicm_probe(struct platform_device *pdev)
dssdev = &ddata->dssdev; dssdev = &ddata->dssdev;
dssdev->dev = dev; dssdev->dev = dev;
dssdev->driver = &dsicm_ops; dssdev->driver = &dsicm_ops;
dssdev->panel.vm = ddata->vm;
dssdev->type = OMAP_DISPLAY_TYPE_DSI; dssdev->type = OMAP_DISPLAY_TYPE_DSI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;

2
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
View File

@ -206,7 +206,6 @@ static void lb035q02_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &lb035q02_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
View File

@ -200,7 +200,6 @@ static void nec_8048_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &nec_8048_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
View File

@ -170,7 +170,6 @@ static void sharp_ls_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &sharp_ls_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
View File

@ -671,7 +671,6 @@ static void acx565akm_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.sdi->set_timings(in, 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->driver = &acx565akm_ops;
dssdev->type = OMAP_DISPLAY_TYPE_SDI; dssdev->type = OMAP_DISPLAY_TYPE_SDI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
View File

@ -340,7 +340,6 @@ static void td028ttec1_panel_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &td028ttec1_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
View File

@ -434,7 +434,6 @@ static void tpo_td043_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in; struct omap_dss_device *in = ddata->in;
ddata->vm = *vm; ddata->vm = *vm;
dssdev->panel.vm = *vm;
in->ops.dpi->set_timings(in, 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->driver = &tpo_td043_ops;
dssdev->type = OMAP_DISPLAY_TYPE_DPI; dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.vm = ddata->vm;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {

2
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@ -458,8 +458,6 @@ struct omap_dss_device {
enum omap_display_type output_type; enum omap_display_type output_type;
struct { struct {
struct videomode vm;
enum omap_dss_dsi_pixel_format dsi_pix_fmt; enum omap_dss_dsi_pixel_format dsi_pix_fmt;
enum omap_dss_dsi_mode dsi_mode; enum omap_dss_dsi_mode dsi_mode;
} panel; } panel;