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

Browse source

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: error paths leak in nvc0_graph_construct_context()
  drm/nouveau: Calculate reserved VRAM for PRAMIN value before use.
  drm/nouveau: fix nouveau_vma object leak
  drm/nouveau: fix nouveau_mem object leak
  drm/nouveau: fix fetching vbios from above 4GiB vram addresses

...

This commit is contained in:

Dave Airlie 2011-06-27 18:10:59 +10:00

parent c706d7b986 60f7ab0665

commit d52589b785

5 changed files with 47 additions and 45 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

11

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

4

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

30

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

25

drivers/gpu/drm/nouveau/nv04_instmem.c

View file

22

drivers/gpu/drm/nouveau/nvc0_graph.c

View file