lkml.org 
[lkml]   [2015]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 74/96] drm/nouveau/gem: return only valid domain when there's only one
    Date
    3.13.11-ckt30 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 2a6c521bb41ce862e43db46f52e7681d33e8d771 upstream.

    On nv50+, we restrict the valid domains to just the one where the buffer
    was originally created. However after the buffer is evicted to system
    memory, we might move it back to a different domain that was not
    originally valid. When sharing the buffer and retrieving its GEM_INFO
    data, we still want the domain that will be valid for this buffer in a
    pushbuf, not the one where it currently happens to be.

    This resolves fdo#92504 and several others. These are due to suspend
    evicting all buffers, making it more likely that they temporarily end up
    in the wrong place.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92504
    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/nouveau_gem.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
    index 78a27f8..a99f387 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_gem.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
    @@ -196,11 +196,12 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,
    struct nouveau_bo *nvbo = nouveau_gem_object(gem);
    struct nouveau_vma *vma;

    - if (nvbo->bo.mem.mem_type == TTM_PL_TT)
    + if (is_power_of_2(nvbo->valid_domains))
    + rep->domain = nvbo->valid_domains;
    + else if (nvbo->bo.mem.mem_type == TTM_PL_TT)
    rep->domain = NOUVEAU_GEM_DOMAIN_GART;
    else
    rep->domain = NOUVEAU_GEM_DOMAIN_VRAM;
    -
    rep->offset = nvbo->bo.offset;
    if (cli->base.vm) {
    vma = nouveau_bo_vma_find(nvbo, cli->base.vm);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-13 23:21    [W:4.039 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site