Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Browse source

A couple of DP regression fixes, kepler memory reclocking fixes, and a fix for an annoying display issue that can pop up on resume.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/ram: fix test for gpio presence
  drm/nouveau/dp: workaround broken display
  drm/nouveau/dp: fix required link bandwidth calculations
  drm/nouveau/kms: restore fbcon after display has been resumed
  drm/nv50-/kms: pass a non-zero value for head to sor dpms methods
  drm/nouveau/fb: Prevent inlining of ramfuc_reg
  drm/gk104/ram: bash mpll bit 31 on

...

This commit is contained in:

Dave Airlie 2014-07-10 10:09:33 +10:00

parent 4f440cd534 0b4e8e7fd5

commit 093fa5d053

10 changed files with 29 additions and 31 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

6

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

View file

6

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

View file

8

drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c

View file

1

drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c

View file

4

drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h

View file

1

drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c

View file

17

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

13

drivers/gpu/drm/nouveau/nouveau_fbcon.c

View file

1

drivers/gpu/drm/nouveau/nouveau_fbcon.h

View file

3

drivers/gpu/drm/nouveau/nv50_display.c

View file