aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/vlv_dsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/vlv_dsi.c')
-rw-r--r--drivers/gpu/drm/i915/vlv_dsi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c
index 361e962a7969..9fc8085f76dc 100644
--- a/drivers/gpu/drm/i915/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/vlv_dsi.c
@@ -257,9 +257,9 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
257 mutex_unlock(&dev_priv->sb_lock); 257 mutex_unlock(&dev_priv->sb_lock);
258} 258}
259 259
260static bool intel_dsi_compute_config(struct intel_encoder *encoder, 260static int intel_dsi_compute_config(struct intel_encoder *encoder,
261 struct intel_crtc_state *pipe_config, 261 struct intel_crtc_state *pipe_config,
262 struct drm_connector_state *conn_state) 262 struct drm_connector_state *conn_state)
263{ 263{
264 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); 264 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
265 struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, 265 struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
@@ -285,7 +285,7 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
285 } 285 }
286 286
287 if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) 287 if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
288 return false; 288 return -EINVAL;
289 289
290 /* DSI uses short packets for sync events, so clear mode flags for DSI */ 290 /* DSI uses short packets for sync events, so clear mode flags for DSI */
291 adjusted_mode->flags = 0; 291 adjusted_mode->flags = 0;
@@ -303,16 +303,16 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
303 303
304 ret = bxt_dsi_pll_compute(encoder, pipe_config); 304 ret = bxt_dsi_pll_compute(encoder, pipe_config);
305 if (ret) 305 if (ret)
306 return false; 306 return -EINVAL;
307 } else { 307 } else {
308 ret = vlv_dsi_pll_compute(encoder, pipe_config); 308 ret = vlv_dsi_pll_compute(encoder, pipe_config);
309 if (ret) 309 if (ret)
310 return false; 310 return -EINVAL;
311 } 311 }
312 312
313 pipe_config->clock_set = true; 313 pipe_config->clock_set = true;
314 314
315 return true; 315 return 0;
316} 316}
317 317
318static bool glk_dsi_enable_io(struct intel_encoder *encoder) 318static bool glk_dsi_enable_io(struct intel_encoder *encoder)