diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 11 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dpi.c | 13 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi5.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/sdi.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 13 |
9 files changed, 0 insertions, 92 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index afee1b8b457a..27d63a14efe3 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | |||
| @@ -148,16 +148,6 @@ static void opa362_set_timings(struct omap_dss_device *dssdev, | |||
| 148 | in->ops.atv->set_timings(in, vm); | 148 | in->ops.atv->set_timings(in, vm); |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | static void opa362_get_timings(struct omap_dss_device *dssdev, | ||
| 152 | struct videomode *vm) | ||
| 153 | { | ||
| 154 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
| 155 | |||
| 156 | dev_dbg(dssdev->dev, "get_timings\n"); | ||
| 157 | |||
| 158 | *vm = ddata->vm; | ||
| 159 | } | ||
| 160 | |||
| 161 | static int opa362_check_timings(struct omap_dss_device *dssdev, | 151 | static int opa362_check_timings(struct omap_dss_device *dssdev, |
| 162 | struct videomode *vm) | 152 | struct videomode *vm) |
| 163 | { | 153 | { |
| @@ -178,7 +168,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = { | |||
| 178 | 168 | ||
| 179 | .check_timings = opa362_check_timings, | 169 | .check_timings = opa362_check_timings, |
| 180 | .set_timings = opa362_set_timings, | 170 | .set_timings = opa362_set_timings, |
| 181 | .get_timings = opa362_get_timings, | ||
| 182 | }; | 171 | }; |
| 183 | 172 | ||
| 184 | static int opa362_probe(struct platform_device *pdev) | 173 | static int opa362_probe(struct platform_device *pdev) |
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c index ed7ae384c3ed..566c63a3ad59 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | |||
| @@ -142,14 +142,6 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev, | |||
| 142 | in->ops.dpi->set_timings(in, vm); | 142 | in->ops.dpi->set_timings(in, vm); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | static void tfp410_get_timings(struct omap_dss_device *dssdev, | ||
| 146 | struct videomode *vm) | ||
| 147 | { | ||
| 148 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
| 149 | |||
| 150 | *vm = ddata->vm; | ||
| 151 | } | ||
| 152 | |||
| 153 | static int tfp410_check_timings(struct omap_dss_device *dssdev, | 145 | static int tfp410_check_timings(struct omap_dss_device *dssdev, |
| 154 | struct videomode *vm) | 146 | struct videomode *vm) |
| 155 | { | 147 | { |
| @@ -170,7 +162,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = { | |||
| 170 | 162 | ||
| 171 | .check_timings = tfp410_check_timings, | 163 | .check_timings = tfp410_check_timings, |
| 172 | .set_timings = tfp410_set_timings, | 164 | .set_timings = tfp410_set_timings, |
| 173 | .get_timings = tfp410_get_timings, | ||
| 174 | }; | 165 | }; |
| 175 | 166 | ||
| 176 | static int tfp410_probe_of(struct platform_device *pdev) | 167 | static int tfp410_probe_of(struct platform_device *pdev) |
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c index d275bf152da5..4753e5455f82 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | |||
| @@ -136,14 +136,6 @@ static void tpd_set_timings(struct omap_dss_device *dssdev, | |||
| 136 | in->ops.hdmi->set_timings(in, vm); | 136 | in->ops.hdmi->set_timings(in, vm); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | static void tpd_get_timings(struct omap_dss_device *dssdev, | ||
| 140 | struct videomode *vm) | ||
| 141 | { | ||
| 142 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
| 143 | |||
| 144 | *vm = ddata->vm; | ||
| 145 | } | ||
| 146 | |||
| 147 | static int tpd_check_timings(struct omap_dss_device *dssdev, | 139 | static int tpd_check_timings(struct omap_dss_device *dssdev, |
| 148 | struct videomode *vm) | 140 | struct videomode *vm) |
| 149 | { | 141 | { |
| @@ -249,7 +241,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = { | |||
| 249 | 241 | ||
| 250 | .check_timings = tpd_check_timings, | 242 | .check_timings = tpd_check_timings, |
| 251 | .set_timings = tpd_set_timings, | 243 | .set_timings = tpd_set_timings, |
| 252 | .get_timings = tpd_get_timings, | ||
| 253 | 244 | ||
| 254 | .read_edid = tpd_read_edid, | 245 | .read_edid = tpd_read_edid, |
| 255 | .detect = tpd_detect, | 246 | .detect = tpd_detect, |
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index 9fcc50217133..5d2d4314055f 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c | |||
| @@ -491,18 +491,6 @@ static void dpi_set_timings(struct omap_dss_device *dssdev, | |||
| 491 | mutex_unlock(&dpi->lock); | 491 | mutex_unlock(&dpi->lock); |
| 492 | } | 492 | } |
| 493 | 493 | ||
| 494 | static void dpi_get_timings(struct omap_dss_device *dssdev, | ||
| 495 | struct videomode *vm) | ||
| 496 | { | ||
| 497 | struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev); | ||
| 498 | |||
| 499 | mutex_lock(&dpi->lock); | ||
| 500 | |||
| 501 | *vm = dpi->vm; | ||
| 502 | |||
| 503 | mutex_unlock(&dpi->lock); | ||
| 504 | } | ||
| 505 | |||
| 506 | static int dpi_check_timings(struct omap_dss_device *dssdev, | 494 | static int dpi_check_timings(struct omap_dss_device *dssdev, |
| 507 | struct videomode *vm) | 495 | struct videomode *vm) |
| 508 | { | 496 | { |
| @@ -702,7 +690,6 @@ static const struct omapdss_dpi_ops dpi_ops = { | |||
| 702 | 690 | ||
| 703 | .check_timings = dpi_check_timings, | 691 | .check_timings = dpi_check_timings, |
| 704 | .set_timings = dpi_set_timings, | 692 | .set_timings = dpi_set_timings, |
| 705 | .get_timings = dpi_get_timings, | ||
| 706 | }; | 693 | }; |
| 707 | 694 | ||
| 708 | static void dpi_init_output_port(struct dpi_data *dpi, struct device_node *port) | 695 | static void dpi_init_output_port(struct dpi_data *dpi, struct device_node *port) |
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index 5879f45f6fc9..b3d7865347a3 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c | |||
| @@ -296,14 +296,6 @@ static void hdmi_display_set_timing(struct omap_dss_device *dssdev, | |||
| 296 | mutex_unlock(&hdmi->lock); | 296 | mutex_unlock(&hdmi->lock); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static void hdmi_display_get_timings(struct omap_dss_device *dssdev, | ||
| 300 | struct videomode *vm) | ||
| 301 | { | ||
| 302 | struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); | ||
| 303 | |||
| 304 | *vm = hdmi->cfg.vm; | ||
| 305 | } | ||
| 306 | |||
| 307 | static int hdmi_dump_regs(struct seq_file *s, void *p) | 299 | static int hdmi_dump_regs(struct seq_file *s, void *p) |
| 308 | { | 300 | { |
| 309 | struct omap_hdmi *hdmi = s->private; | 301 | struct omap_hdmi *hdmi = s->private; |
| @@ -557,7 +549,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = { | |||
| 557 | 549 | ||
| 558 | .check_timings = hdmi_display_check_timing, | 550 | .check_timings = hdmi_display_check_timing, |
| 559 | .set_timings = hdmi_display_set_timing, | 551 | .set_timings = hdmi_display_set_timing, |
| 560 | .get_timings = hdmi_display_get_timings, | ||
| 561 | 552 | ||
| 562 | .read_edid = hdmi_read_edid, | 553 | .read_edid = hdmi_read_edid, |
| 563 | .lost_hotplug = hdmi_lost_hotplug, | 554 | .lost_hotplug = hdmi_lost_hotplug, |
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index ae1a001d1b83..8e9b3a24b2ab 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c | |||
| @@ -293,14 +293,6 @@ static void hdmi_display_set_timing(struct omap_dss_device *dssdev, | |||
| 293 | mutex_unlock(&hdmi->lock); | 293 | mutex_unlock(&hdmi->lock); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | static void hdmi_display_get_timings(struct omap_dss_device *dssdev, | ||
| 297 | struct videomode *vm) | ||
| 298 | { | ||
| 299 | struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); | ||
| 300 | |||
| 301 | *vm = hdmi->cfg.vm; | ||
| 302 | } | ||
| 303 | |||
| 304 | static int hdmi_dump_regs(struct seq_file *s, void *p) | 296 | static int hdmi_dump_regs(struct seq_file *s, void *p) |
| 305 | { | 297 | { |
| 306 | struct omap_hdmi *hdmi = s->private; | 298 | struct omap_hdmi *hdmi = s->private; |
| @@ -549,7 +541,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = { | |||
| 549 | 541 | ||
| 550 | .check_timings = hdmi_display_check_timing, | 542 | .check_timings = hdmi_display_check_timing, |
| 551 | .set_timings = hdmi_display_set_timing, | 543 | .set_timings = hdmi_display_set_timing, |
| 552 | .get_timings = hdmi_display_get_timings, | ||
| 553 | 544 | ||
| 554 | .read_edid = hdmi_read_edid, | 545 | .read_edid = hdmi_read_edid, |
| 555 | .set_infoframe = hdmi_set_infoframe, | 546 | .set_infoframe = hdmi_set_infoframe, |
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 67db0ea272f3..426ac8297f5f 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h | |||
| @@ -309,8 +309,6 @@ struct omapdss_dpi_ops { | |||
| 309 | struct videomode *vm); | 309 | struct videomode *vm); |
| 310 | void (*set_timings)(struct omap_dss_device *dssdev, | 310 | void (*set_timings)(struct omap_dss_device *dssdev, |
| 311 | struct videomode *vm); | 311 | struct videomode *vm); |
| 312 | void (*get_timings)(struct omap_dss_device *dssdev, | ||
| 313 | struct videomode *vm); | ||
| 314 | }; | 312 | }; |
| 315 | 313 | ||
| 316 | struct omapdss_sdi_ops { | 314 | struct omapdss_sdi_ops { |
| @@ -326,8 +324,6 @@ struct omapdss_sdi_ops { | |||
| 326 | struct videomode *vm); | 324 | struct videomode *vm); |
| 327 | void (*set_timings)(struct omap_dss_device *dssdev, | 325 | void (*set_timings)(struct omap_dss_device *dssdev, |
| 328 | struct videomode *vm); | 326 | struct videomode *vm); |
| 329 | void (*get_timings)(struct omap_dss_device *dssdev, | ||
| 330 | struct videomode *vm); | ||
| 331 | }; | 327 | }; |
| 332 | 328 | ||
| 333 | struct omapdss_dvi_ops { | 329 | struct omapdss_dvi_ops { |
| @@ -343,8 +339,6 @@ struct omapdss_dvi_ops { | |||
| 343 | struct videomode *vm); | 339 | struct videomode *vm); |
| 344 | void (*set_timings)(struct omap_dss_device *dssdev, | 340 | void (*set_timings)(struct omap_dss_device *dssdev, |
| 345 | struct videomode *vm); | 341 | struct videomode *vm); |
| 346 | void (*get_timings)(struct omap_dss_device *dssdev, | ||
| 347 | struct videomode *vm); | ||
| 348 | }; | 342 | }; |
| 349 | 343 | ||
| 350 | struct omapdss_atv_ops { | 344 | struct omapdss_atv_ops { |
| @@ -360,8 +354,6 @@ struct omapdss_atv_ops { | |||
| 360 | struct videomode *vm); | 354 | struct videomode *vm); |
| 361 | void (*set_timings)(struct omap_dss_device *dssdev, | 355 | void (*set_timings)(struct omap_dss_device *dssdev, |
| 362 | struct videomode *vm); | 356 | struct videomode *vm); |
| 363 | void (*get_timings)(struct omap_dss_device *dssdev, | ||
| 364 | struct videomode *vm); | ||
| 365 | }; | 357 | }; |
| 366 | 358 | ||
| 367 | struct omapdss_hdmi_ops { | 359 | struct omapdss_hdmi_ops { |
| @@ -377,8 +369,6 @@ struct omapdss_hdmi_ops { | |||
| 377 | struct videomode *vm); | 369 | struct videomode *vm); |
| 378 | void (*set_timings)(struct omap_dss_device *dssdev, | 370 | void (*set_timings)(struct omap_dss_device *dssdev, |
| 379 | struct videomode *vm); | 371 | struct videomode *vm); |
| 380 | void (*get_timings)(struct omap_dss_device *dssdev, | ||
| 381 | struct videomode *vm); | ||
| 382 | 372 | ||
| 383 | int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len); | 373 | int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len); |
| 384 | void (*lost_hotplug)(struct omap_dss_device *dssdev); | 374 | void (*lost_hotplug)(struct omap_dss_device *dssdev); |
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c index 69c3b7a3d5c7..43cf331e80e4 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c | |||
| @@ -237,14 +237,6 @@ static void sdi_set_timings(struct omap_dss_device *dssdev, | |||
| 237 | sdi->vm = *vm; | 237 | sdi->vm = *vm; |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | static void sdi_get_timings(struct omap_dss_device *dssdev, | ||
| 241 | struct videomode *vm) | ||
| 242 | { | ||
| 243 | struct sdi_device *sdi = dssdev_to_sdi(dssdev); | ||
| 244 | |||
| 245 | *vm = sdi->vm; | ||
| 246 | } | ||
| 247 | |||
| 248 | static int sdi_check_timings(struct omap_dss_device *dssdev, | 240 | static int sdi_check_timings(struct omap_dss_device *dssdev, |
| 249 | struct videomode *vm) | 241 | struct videomode *vm) |
| 250 | { | 242 | { |
| @@ -328,7 +320,6 @@ static const struct omapdss_sdi_ops sdi_ops = { | |||
| 328 | 320 | ||
| 329 | .check_timings = sdi_check_timings, | 321 | .check_timings = sdi_check_timings, |
| 330 | .set_timings = sdi_set_timings, | 322 | .set_timings = sdi_set_timings, |
| 331 | .get_timings = sdi_get_timings, | ||
| 332 | }; | 323 | }; |
| 333 | 324 | ||
| 334 | static void sdi_init_output(struct sdi_device *sdi) | 325 | static void sdi_init_output(struct sdi_device *sdi) |
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index c573254df766..ab0eeec38db0 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c | |||
| @@ -614,18 +614,6 @@ static int venc_check_timings(struct omap_dss_device *dssdev, | |||
| 614 | } | 614 | } |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | static void venc_get_timings(struct omap_dss_device *dssdev, | ||
| 618 | struct videomode *vm) | ||
| 619 | { | ||
| 620 | struct venc_device *venc = dssdev_to_venc(dssdev); | ||
| 621 | |||
| 622 | mutex_lock(&venc->venc_lock); | ||
| 623 | |||
| 624 | *vm = venc->vm; | ||
| 625 | |||
| 626 | mutex_unlock(&venc->venc_lock); | ||
| 627 | } | ||
| 628 | |||
| 629 | static int venc_init_regulator(struct venc_device *venc) | 617 | static int venc_init_regulator(struct venc_device *venc) |
| 630 | { | 618 | { |
| 631 | struct regulator *vdda_dac; | 619 | struct regulator *vdda_dac; |
| @@ -771,7 +759,6 @@ static const struct omapdss_atv_ops venc_ops = { | |||
| 771 | 759 | ||
| 772 | .check_timings = venc_check_timings, | 760 | .check_timings = venc_check_timings, |
| 773 | .set_timings = venc_set_timings, | 761 | .set_timings = venc_set_timings, |
| 774 | .get_timings = venc_get_timings, | ||
| 775 | }; | 762 | }; |
| 776 | 763 | ||
| 777 | static void venc_init_output(struct venc_device *venc) | 764 | static void venc_init_output(struct venc_device *venc) |
