diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:54:20 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:56:11 +0100 |
| commit | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 (patch) | |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 /drivers/gpu/drm/drm_modes.c | |
| parent | de67cba65944f26c0f147035bd62e30c5f456b96 (diff) | |
| parent | 019d96cb55ade38a4b4a52bba0304e8cd681f30a (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into for-airlieddrm-intel-next-2012-02-16-merge-resolved
Manually resolve the conflict between the new enum drm property
helpers in drm-next and the new "force-dvi" option that the "audio" output
property gained in drm-intel-next.
While resolving this conflict, switch the new drm_prop_enum_list to
use the newly introduced enum defines instead of magic values.
Conflicts:
drivers/gpu/drm/i915/intel_modes.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_modes.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index fb8e46b4e8b..7ff13bc47ca 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -686,8 +686,6 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags) p->crtc_vsync_end /= 2; p->crtc_vtotal /= 2; } - - p->crtc_vtotal |= 1; } if (p->flags & DRM_MODE_FLAG_DBLSCAN) { |