[git pull] drm i915 and nouveau fixes
Dave Airlie
airlied at linux.ie
Thu Oct 2 22:21:44 PDT 2014
Hi Linus,
Nothing too major or scary,
one i915 regression fix, nouveau has a tmds regression fix, along with a
regression fix for the runtime pm code for optimus laptops not restoring
the display hw correctly.
Dave.
The following changes since commit fe82dcec644244676d55a1384c958d5f67979adb:
Linux 3.17-rc7 (2014-09-28 14:29:07 -0700)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux drm-fixes
for you to fetch changes up to eee0815dabbdd7d584bea8275f5758d25c97cb9b:
Merge tag 'drm-intel-fixes-2014-10-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2014-10-03 11:38:16 +1000)
----------------------------------------------------------------
Ben Skeggs (4):
drm/nv50/disp: fix dpms regression on certain boards
drm/nouveau: fix regression on original nv50 board
drm/nouveau: punt fbcon resume out to a workqueue
drm/nouveau: make sure display hardware is reinitialised on runtime resume
Chris Wilson (1):
drm/i915: Flush the PTEs after updating them before suspend
Dave Airlie (2):
Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Merge tag 'drm-intel-fixes-2014-10-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes
drivers/gpu/drm/i915/i915_gem_gtt.c | 14 ++++++-
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 3 +-
drivers/gpu/drm/nouveau/nouveau_chan.c | 7 +++-
drivers/gpu/drm/nouveau/nouveau_display.c | 23 ++++++-----
drivers/gpu/drm/nouveau/nouveau_display.h | 5 +--
drivers/gpu/drm/nouveau/nouveau_drm.c | 51 +++++++------------------
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 23 ++++++++---
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 +
8 files changed, 65 insertions(+), 62 deletions(-)
More information about the dri-devel
mailing list