diff options
| author | Daniel Vetter | 2013-09-24 09:29:24 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-09-24 09:32:53 +0200 |
| commit | b599c89e8c5cf0c37352e0871be240291f8ce922 (patch) | |
| tree | a03ce75b3a3d6d39852bc201b26bcfab412bf55f /drivers/gpu/drm/i915/intel_dvo.c | |
| parent | drm/i915: assume all GM45 Acer laptops use inverted backlight PWM (diff) | |
| parent | Linux 3.12-rc2 (diff) | |
| download | kernel-qcow2-linux-b599c89e8c5cf0c37352e0871be240291f8ce922.tar.gz kernel-qcow2-linux-b599c89e8c5cf0c37352e0871be240291f8ce922.tar.xz kernel-qcow2-linux-b599c89e8c5cf0c37352e0871be240291f8ce922.zip | |
Merge tag 'v3.12-rc2' into drm-intel-next
Backmerge Linux 3.12-rc2 to prep for a bunch of -next patches:
- Header cleanup in intel_drv.h, both changed in -fixes and my current
-next pile.
- Cursor handling cleanup for -next which depends upon the cursor
handling fix merged into -rc2.
All just trivial conflicts of the "changed adjacent lines" type:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index fe65c7270f06..ff86c366218c 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -265,6 +265,8 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder, C(vtotal); C(clock); #undef C + + drm_mode_set_crtcinfo(adjusted_mode, 0); } return true; |