projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvc0_fbcon.c
diff --git
a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index
6124667
..
fcd2e5f
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/
drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@
-188,7
+188,7
@@
nvc0_fbcon_accel_init(struct fb_info *info)
return -EINVAL;
}
- ret = RING_SPACE(chan,
60
);
+ ret = RING_SPACE(chan,
58
);
if (ret) {
WARN_ON(1);
nouveau_fbcon_gpu_lockup(info);