Merge branch 'drm-nouveau-next' of...
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes 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
Showing
- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 3 additions, 3 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv50.c
- drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c 3 additions, 3 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
- drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c 5 additions, 3 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/outpdp.c
- drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c 1 addition, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/sornv50.c
- drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h 2 additions, 2 deletionsdrivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h
- drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c 1 addition, 0 deletionsdrivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
- drivers/gpu/drm/nouveau/nouveau_drm.c 9 additions, 8 deletionsdrivers/gpu/drm/nouveau/nouveau_drm.c
- drivers/gpu/drm/nouveau/nouveau_fbcon.c 3 additions, 10 deletionsdrivers/gpu/drm/nouveau/nouveau_fbcon.c
- drivers/gpu/drm/nouveau/nouveau_fbcon.h 0 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_fbcon.h
- drivers/gpu/drm/nouveau/nv50_display.c 2 additions, 1 deletiondrivers/gpu/drm/nouveau/nv50_display.c
Loading
Please register or sign in to comment