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

Browse source

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv50/pm: signedness bug in nv50_pm_clocks_pre()
  drm/nouveau/gem: fix fence_sync race / oops
  drm/nouveau: fix typo on mxmdcb option
  drm/nouveau/mxm: pretend to succeed, even if we can't shadow the MXM-SIS
  drm/nouveau/disp: check that panel power gpio is enabled at init time

...

This commit is contained in:

Dave Airlie 2012-02-01 09:36:24 +00:00

parent 62aa2b537c a9d9938820

commit ebd80b941c

6 changed files with 46 additions and 7 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

5

drivers/gpu/drm/nouveau/nouveau_bios.h

View file

10

drivers/gpu/drm/nouveau/nouveau_display.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drv.c

View file

23

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

9

drivers/gpu/drm/nouveau/nouveau_mxm.c

View file

4

drivers/gpu/drm/nouveau/nv50_pm.c

View file