diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-06-29 04:07:20 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-07-27 18:56:10 +1000 |
| commit | d108142c0840ce389cd9898aa76943b3fb430b83 (patch) | |
| tree | f9813092cb8d50c633c806a81effa79f86dc1286 /drivers/gpu/drm/nouveau/nv04_fbcon.c | |
| parent | d31b11d85814ff669cfeb93c0f85b9d659a85ef8 (diff) | |
| download | blackbird-op-linux-d108142c0840ce389cd9898aa76943b3fb430b83.tar.gz blackbird-op-linux-d108142c0840ce389cd9898aa76943b3fb430b83.zip | |
drm/nouveau/fbcon/nv11-: correctly account for ring space usage
The RING_SPACE macro accounts how much space is used up so it's
important to ask it for the right amount. Incorrect accounting of this
can cause page faults down the line as writes are attempted outside of
the ring.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index 4ef602c5469d..495c57644ced 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c @@ -203,7 +203,7 @@ nv04_fbcon_accel_init(struct fb_info *info) if (ret) return ret; - if (RING_SPACE(chan, 49)) { + if (RING_SPACE(chan, 49 + (device->info.chipset >= 0x11 ? 4 : 0))) { nouveau_fbcon_gpu_lockup(info); return 0; } |
