lkml.org 
[lkml]   [2015]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 094/130] drm/nouveau/fbcon/nv11-: correctly account for ring space usage
    Date
    3.19.8-ckt6 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ilia Mirkin <imirkin@alum.mit.edu>

    commit d108142c0840ce389cd9898aa76943b3fb430b83 upstream.

    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>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
    index 4ef602c..495c576 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;
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-08-28 01:01    [W:3.393 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site