projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv10_fence.c
diff --git
a/drivers/gpu/drm/nouveau/nv10_fence.c
b/drivers/gpu/drm/nouveau/nv10_fence.c
index 5e1ea1cdce75e907ccc75b25830be9b969daa339..2c35213da27588745129ceb9b52b72a3f8a8e8da 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/
drivers/gpu/drm/nouveau/nv10_fence.c
@@
-50,7
+50,7
@@
nv10_fence_sync(struct nouveau_fence *fence,
u32
nv10_fence_read(struct nouveau_channel *chan)
{
- return nvif_rd32(
chan
, 0x0048);
+ return nvif_rd32(
&chan->user
, 0x0048);
}
void