diff options
author | Carlos Palminha <CARLOS.PALMINHA@synopsys.com> | 2016-02-16 09:10:03 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-16 09:36:49 -0500 |
commit | 49f718c57bf503b3076337aec803de562ec7f131 (patch) | |
tree | da34ff14213dcc6f2019fe5dbab96246617f40c0 | |
parent | 15fce29da39150cc08980299ed3700a07a1cb0a6 (diff) |
drm: fixes crct set_mode when crtc mode_fixup is null.
This patch set nukes all the dummy crtc mode_fixup implementations.
(made on top of Daniel topic/drm-misc branch)
Signed-off-by: Carlos Palminha <palminha@synopsys.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/9d41105dee6632b4bb50e9555f2196ac249b9fce.1455630967.git.palminha@synopsys.com
-rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index e70d064693ee..7539eea4ccbc 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -343,9 +343,12 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
343 | } | 343 | } |
344 | } | 344 | } |
345 | 345 | ||
346 | if (!(ret = crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) { | 346 | if (crtc_funcs->mode_fixup) { |
347 | DRM_DEBUG_KMS("CRTC fixup failed\n"); | 347 | if (!(ret = crtc_funcs->mode_fixup(crtc, mode, |
348 | goto done; | 348 | adjusted_mode))) { |
349 | DRM_DEBUG_KMS("CRTC fixup failed\n"); | ||
350 | goto done; | ||
351 | } | ||
349 | } | 352 | } |
350 | DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); | 353 | DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); |
351 | 354 | ||