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

Browse source

Pull drm intel fixes from Dave Airlie:
 "Two intel stable fixes, that should be it from me for this round"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Unlock panel even when LVDS is disabled
  drm/i915: More cautious with pch fifo underruns

...

This commit is contained in:

Linus Torvalds 2014-12-04 22:39:37 -08:00

parent 56c67ce187 3e3282c0a2

commit ba2cb64b55

2 changed files with 11 additions and 13 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_display.c

View file

22

drivers/gpu/drm/i915/intel_lvds.c

View file