projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_bo.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index e87e24b9c0af6a92820002cea29121f042b01751..424dff5d0aba4751c9bcab8c6f641071ce28ec38 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bo.c
@@
-956,7
+956,7
@@
nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
break;
}
- if (dev_priv->card_type
=
= NV_C0)
+ if (dev_priv->card_type
>
= NV_C0)
page_shift = node->page_shift;
else
page_shift = 12;
This page took
0.025669 seconds
and
5
git commands to generate.