]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/amdgpu: use pin rather than pin_restricted in a few cases
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 7 Dec 2016 21:14:38 +0000 (16:14 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 8 Dec 2016 19:12:19 +0000 (14:12 -0500)
We don't require a resticted pinning in these cases, so just
use plain pin.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

index 741144fcc7bc91face352a42aa9cd81c46dc3c4a..581601ca6b89dec1a8dfa39ec1f77b367b8bf4d4 100644 (file)
@@ -187,7 +187,7 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc,
                goto cleanup;
        }
 
-       r = amdgpu_bo_pin_restricted(new_abo, AMDGPU_GEM_DOMAIN_VRAM, 0, 0, &base);
+       r = amdgpu_bo_pin(new_abo, AMDGPU_GEM_DOMAIN_VRAM, &base);
        if (unlikely(r != 0)) {
                r = -EINVAL;
                DRM_ERROR("failed to pin new abo buffer before flip\n");
index f1c9e59a7c875d28d65cd5a7afe8d641de35597e..24629bec181a97f7a14cd33b788e374d2b789d8a 100644 (file)
@@ -171,7 +171,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
        }
 
 
-       ret = amdgpu_bo_pin_restricted(abo, AMDGPU_GEM_DOMAIN_VRAM, 0, 0, NULL);
+       ret = amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM, NULL);
        if (ret) {
                amdgpu_bo_unreserve(abo);
                goto out_unref;