aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_encoder.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-09-21 09:13:00 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-03-18 05:42:13 -0400
commitd68164fe29642270ffba64ed64b0178ef7d916bf (patch)
treec45b50d24194a87669042fcb39b36bb206b42081 /drivers/gpu/drm/omapdrm/omap_encoder.c
parentd60dfaba4225d72e54ec887c5e307dd9fc0aa1db (diff)
drm/omap: Factor out common mode validation code
The encoder .atomic_check() and connector .mode_valid() operations both walk through the dss devices in the pipeline to validate the mode. Factor out the common code in a new omap_drm_connector_mode_fixup() function. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_encoder.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_encoder.c30
1 files changed, 9 insertions, 21 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 623154bc44bb..3a7cca01888e 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -206,29 +206,17 @@ static int omap_encoder_atomic_check(struct drm_encoder *encoder,
206 struct drm_connector_state *conn_state) 206 struct drm_connector_state *conn_state)
207{ 207{
208 struct omap_encoder *omap_encoder = to_omap_encoder(encoder); 208 struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
209 struct drm_device *dev = encoder->dev; 209 enum drm_mode_status status;
210 struct omap_dss_device *dssdev; 210
211 struct videomode vm = { 0 }; 211 status = omap_connector_mode_fixup(omap_encoder->output,
212 int ret; 212 &crtc_state->mode,
213 213 &crtc_state->adjusted_mode);
214 drm_display_mode_to_videomode(&crtc_state->mode, &vm); 214 if (status != MODE_OK) {
215 215 dev_err(encoder->dev->dev, "invalid timings: %d\n", status);
216 for (dssdev = omap_encoder->output; dssdev; dssdev = dssdev->next) { 216 return -EINVAL;
217 if (!dssdev->ops->check_timings)
218 continue;
219
220 ret = dssdev->ops->check_timings(dssdev, &vm);
221 if (ret)
222 goto done;
223 } 217 }
224 218
225 drm_display_mode_from_videomode(&vm, &crtc_state->adjusted_mode); 219 return 0;
226
227done:
228 if (ret)
229 dev_err(dev->dev, "invalid timings: %d\n", ret);
230
231 return ret;
232} 220}
233 221
234static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = { 222static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {