aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_encoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_encoder.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_encoder.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 94b75d018e71..a6dce480b2cf 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -101,21 +101,9 @@ static int omap_encoder_update(struct drm_encoder *encoder,
101 struct omap_dss_device *dssdev = omap_encoder->display; 101 struct omap_dss_device *dssdev = omap_encoder->display;
102 int ret; 102 int ret;
103 103
104 if (dssdev->ops->check_timings) { 104 ret = dssdev->ops->check_timings(dssdev, vm);
105 ret = dssdev->ops->check_timings(dssdev, vm);
106 } else {
107 struct videomode t = {0};
108
109 dssdev->ops->get_timings(dssdev, &t);
110
111 if (memcmp(vm, &t, sizeof(*vm)))
112 ret = -EINVAL;
113 else
114 ret = 0;
115 }
116
117 if (ret) { 105 if (ret) {
118 dev_err(dev->dev, "could not set timings: %d\n", ret); 106 dev_err(dev->dev, "invalid timings: %d\n", ret);
119 return ret; 107 return ret;
120 } 108 }
121 109