diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 0042a7f69387..17a16917e134 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c | |||
@@ -235,9 +235,9 @@ intel_dvo_mode_valid(struct drm_connector *connector, | |||
235 | return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode); | 235 | return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode); |
236 | } | 236 | } |
237 | 237 | ||
238 | static bool intel_dvo_compute_config(struct intel_encoder *encoder, | 238 | static int intel_dvo_compute_config(struct intel_encoder *encoder, |
239 | struct intel_crtc_state *pipe_config, | 239 | struct intel_crtc_state *pipe_config, |
240 | struct drm_connector_state *conn_state) | 240 | struct drm_connector_state *conn_state) |
241 | { | 241 | { |
242 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); | 242 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
243 | const struct drm_display_mode *fixed_mode = | 243 | const struct drm_display_mode *fixed_mode = |
@@ -254,10 +254,11 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder, | |||
254 | intel_fixed_panel_mode(fixed_mode, adjusted_mode); | 254 | intel_fixed_panel_mode(fixed_mode, adjusted_mode); |
255 | 255 | ||
256 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) | 256 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) |
257 | return false; | 257 | return -EINVAL; |
258 | 258 | ||
259 | pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; | 259 | pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; |
260 | return true; | 260 | |
261 | return 0; | ||
261 | } | 262 | } |
262 | 263 | ||
263 | static void intel_dvo_pre_enable(struct intel_encoder *encoder, | 264 | static void intel_dvo_pre_enable(struct intel_encoder *encoder, |