diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index e6c5d985ea0a..3377d813dbb3 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -379,9 +379,9 @@ intel_lvds_mode_valid(struct drm_connector *connector, | |||
379 | return MODE_OK; | 379 | return MODE_OK; |
380 | } | 380 | } |
381 | 381 | ||
382 | static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | 382 | static int intel_lvds_compute_config(struct intel_encoder *intel_encoder, |
383 | struct intel_crtc_state *pipe_config, | 383 | struct intel_crtc_state *pipe_config, |
384 | struct drm_connector_state *conn_state) | 384 | struct drm_connector_state *conn_state) |
385 | { | 385 | { |
386 | struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev); | 386 | struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev); |
387 | struct intel_lvds_encoder *lvds_encoder = | 387 | struct intel_lvds_encoder *lvds_encoder = |
@@ -395,7 +395,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | |||
395 | /* Should never happen!! */ | 395 | /* Should never happen!! */ |
396 | if (INTEL_GEN(dev_priv) < 4 && intel_crtc->pipe == 0) { | 396 | if (INTEL_GEN(dev_priv) < 4 && intel_crtc->pipe == 0) { |
397 | DRM_ERROR("Can't support LVDS on pipe A\n"); | 397 | DRM_ERROR("Can't support LVDS on pipe A\n"); |
398 | return false; | 398 | return -EINVAL; |
399 | } | 399 | } |
400 | 400 | ||
401 | if (lvds_encoder->a3_power == LVDS_A3_POWER_UP) | 401 | if (lvds_encoder->a3_power == LVDS_A3_POWER_UP) |
@@ -421,7 +421,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | |||
421 | adjusted_mode); | 421 | adjusted_mode); |
422 | 422 | ||
423 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) | 423 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) |
424 | return false; | 424 | return -EINVAL; |
425 | 425 | ||
426 | if (HAS_PCH_SPLIT(dev_priv)) { | 426 | if (HAS_PCH_SPLIT(dev_priv)) { |
427 | pipe_config->has_pch_encoder = true; | 427 | pipe_config->has_pch_encoder = true; |
@@ -440,7 +440,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | |||
440 | * user's requested refresh rate. | 440 | * user's requested refresh rate. |
441 | */ | 441 | */ |
442 | 442 | ||
443 | return true; | 443 | return 0; |
444 | } | 444 | } |
445 | 445 | ||
446 | static enum drm_connector_status | 446 | static enum drm_connector_status |