drm/radeon: rework fallback handling v2

Let the CS module decide if we can fall back to VRAM or not.

v2: remove unintended change

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 730d335..3db6b02 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -358,8 +358,9 @@ struct radeon_bo_list {
        struct ttm_validate_buffer tv;
        struct radeon_bo        *bo;
        uint64_t                gpu_offset;
-       unsigned                rdomain;
-       unsigned                wdomain;
+       bool                    written;
+       unsigned                domain;
+       unsigned                alt_domain;
        u32                     tiling_flags;
 };
 

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index a3dd04d..c9ee4c0 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -53,6 +53,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
        }
        for (i = 0; i < p->nrelocs; i++) {
                struct drm_radeon_cs_reloc *r;
+               uint32_t domain;
 
                duplicate = false;
                r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4];
@@ -63,28 +64,34 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                                break;
                        }
                }
-               if (!duplicate) {
-                       p->relocs[i].gobj = drm_gem_object_lookup(ddev,
-                                                                 p->filp,
-                                                                 r->handle);
-                       if (p->relocs[i].gobj == NULL) {
-                               DRM_ERROR("gem object lookup failed 0x%x\n",
-                                         r->handle);
-                               return -ENOENT;
-                       }
-                       p->relocs_ptr[i] = &p->relocs[i];
-                       p->relocs[i].robj = gem_to_radeon_bo(p->relocs[i].gobj);
-                       p->relocs[i].lobj.bo = p->relocs[i].robj;
-                       p->relocs[i].lobj.wdomain = r->write_domain;
-                       p->relocs[i].lobj.rdomain = r->read_domains;
-                       p->relocs[i].lobj.tv.bo = &p->relocs[i].robj->tbo;
-                       p->relocs[i].handle = r->handle;
-                       p->relocs[i].flags = r->flags;
-                       radeon_bo_list_add_object(&p->relocs[i].lobj,
-                                                 &p->validated);
-
-               } else
+               if (duplicate) {
                        p->relocs[i].handle = 0;
+                       continue;
+               }
+
+               p->relocs[i].gobj = drm_gem_object_lookup(ddev, p->filp,
+                                                         r->handle);
+               if (p->relocs[i].gobj == NULL) {
+                       DRM_ERROR("gem object lookup failed 0x%x\n",
+                                 r->handle);
+                       return -ENOENT;
+               }
+               p->relocs_ptr[i] = &p->relocs[i];
+               p->relocs[i].robj = gem_to_radeon_bo(p->relocs[i].gobj);
+               p->relocs[i].lobj.bo = p->relocs[i].robj;
+               p->relocs[i].lobj.written = !!r->write_domain;
+
+               domain = r->write_domain ? r->write_domain : r->read_domains;
+               p->relocs[i].lobj.domain = domain;
+               if (domain == RADEON_GEM_DOMAIN_VRAM)
+                       domain |= RADEON_GEM_DOMAIN_GTT;
+               p->relocs[i].lobj.alt_domain = domain;
+
+               p->relocs[i].lobj.tv.bo = &p->relocs[i].robj->tbo;
+               p->relocs[i].handle = r->handle;
+
+               radeon_bo_list_add_object(&p->relocs[i].lobj,
+                                         &p->validated);
        }
        return radeon_bo_list_validate(&p->validated);
 }

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 58e026a..4466477 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -341,7 +341,7 @@ void radeon_bo_fini(struct radeon_device *rdev)
 void radeon_bo_list_add_object(struct radeon_bo_list *lobj,
                                struct list_head *head)
 {
-       if (lobj->wdomain) {
+       if (lobj->written) {
                list_add(&lobj->tv.head, head);
        } else {
                list_add_tail(&lobj->tv.head, head);
@@ -362,15 +362,15 @@ int radeon_bo_list_validate(struct list_head *head)
        list_for_each_entry(lobj, head, tv.head) {
                bo = lobj->bo;
                if (!bo->pin_count) {
-                       domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain;
+                       domain = lobj->domain;
                        
                retry:
                        radeon_ttm_placement_from_domain(bo, domain);
                        r = ttm_bo_validate(&bo->tbo, &bo->placement,
                                                true, false);
                        if (unlikely(r)) {
-                               if (r != -ERESTARTSYS && domain == RADEON_GEM_DOMAIN_VRAM) {
-                                       domain |= RADEON_GEM_DOMAIN_GTT;
+                               if (r != -ERESTARTSYS && domain != lobj->alt_domain) {
+                                       domain = lobj->alt_domain;
                                        goto retry;
                                }
                                return r;