Jerome Glisse
57de4ba959
drm/ttm: simplify memory accounting for ttm user v2 ...
Provide helper function to compute the kernel memory size needed
for each buffer object. Move all the accounting inside ttm, simplifying
driver and avoiding code duplication accross them.
v2 fix accounting of ghost object, one would have thought that i
would have run into the issue since a longtime but it seems
ghost object are rare when you have plenty of vram ;)
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-12-06 10:40:11 +00:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
Merge Qualcom Hexagon architecture
2011-11-01 07:48:13 -07:00
crypto: Add a report function pointer to crypto_type
2011-10-21 14:24:03 +02:00
drm/ttm: simplify memory accounting for ttm user v2
2011-12-06 10:40:11 +00:00
swiotlb: Expose swiotlb_nr_tlb function to modules
2011-12-06 10:38:03 +00:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
[media] altera-stapl: it is time to move out from staging
2011-09-23 15:00:57 -03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-07 10:55:33 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-11-01 10:51:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2011-10-28 16:44:18 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2011-11-06 19:00:42 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
2011-10-15 00:19:52 +00:00
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2011-11-06 20:15:05 -08:00
57de4ba959