git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'egalax' into for-linus
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_debugfs.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index
8ff9ef5
..
a251886
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@
-137,10
+137,9
@@
nouveau_debugfs_memory_info(struct seq_file *m, void *data)
{
struct drm_info_node *node = (struct drm_info_node *) m->private;
struct drm_minor *minor = node->minor;
{
struct drm_info_node *node = (struct drm_info_node *) m->private;
struct drm_minor *minor = node->minor;
- struct drm_
device *dev = minor->dev
;
+ struct drm_
nouveau_private *dev_priv = minor->dev->dev_private
;
- seq_printf(m, "VRAM total: %dKiB\n",
- (int)(nouveau_mem_fb_amount(dev) >> 10));
+ seq_printf(m, "VRAM total: %dKiB\n", (int)(dev_priv->vram_size >> 10));
return 0;
}
return 0;
}