Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

Pull drm fixes from Dave Airlie:
 - i915 fixes: a few display regressions
 - vmwgfx: possible loop forever fix
 - nouveau: one userspace interface fix

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/core: don't leak oclass type bits to user
  drm/i915: Fix lock dropping in intel_tv_detect()
  drm/i915: handle G45/GM45 pulse detection connected state.
  drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
  drm/vmwgfx: Fix an incorrect OOM return value
  drm/i915: Remove bogus __init annotation from DMI callbacks
  drm/i915: don't warn if backlight unexpectedly enabled
  drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to haswell_crtc_disable()
  drm/i915: fix plane/cursor handling when runtime suspended
  drm/i915: Ignore VBT backlight presence check on Acer C720 (4005U)

...

This commit is contained in:

Linus Torvalds 2014-09-05 07:37:15 -07:00

parent b7fece1be8 68c78bd67b

commit caa552358e

10 changed files with 90 additions and 41 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/i915/intel_bios.c

View file

2

drivers/gpu/drm/i915/intel_crt.c

View file

34

drivers/gpu/drm/i915/intel_display.c

View file

55

drivers/gpu/drm/i915/intel_dp.c

View file

2

drivers/gpu/drm/i915/intel_lvds.c

View file

8

drivers/gpu/drm/i915/intel_panel.c

View file

10

drivers/gpu/drm/i915/intel_tv.c

View file

4

drivers/gpu/drm/nouveau/core/core/parent.c

View file

11

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

View file

3

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

View file