diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-26 14:49:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-26 14:49:44 +1000 |
| commit | 43106e25ab37580f54df99c512d1d66ae0fe1c67 (patch) | |
| tree | ff62b146f1c173d30e8cf767962cc87417edb71d /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |
| parent | 62884cd386b876638720ef88374b31a84ca7ee5f (diff) | |
| parent | 4a0144bfc6df1f7a89a04a3e8662f1f4375eb1fe (diff) | |
| download | kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.tar.gz kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.tar.bz2 kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.zip | |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
Just a few fixes for 4.15.
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
drm/amdgpu: don't flush the TLB before initializing GART
drm/amdgpu: minor cleanup for amdgpu_ttm_bind
drm/amdgpu/psp: prevent page fault by checking write_frame address(v4)
drm/amd/powerplay: retrieve the real-time coreClock values
drm/amd/powerplay: fix performance drop on Vega10
drm/amd/powerplay: add one smc message for Vega10
drm/amd/powerplay: fix amd_powerplay_reset()
amdgpu: add padding to the fence to handle ioctl.
drm/amdgpu:fix wb_clear
drm/amdgpu:fix vf_error_put
drm/amdgpu/sriov:now must reinit psp
drm/amdgpu: merge bios post checking functions
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index f4370081f6e6..fe818501c520 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c @@ -332,12 +332,13 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, adev->gart.pages[p] = pagelist[i]; #endif - if (adev->gart.ptr) { - r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags, - adev->gart.ptr); - if (r) - return r; - } + if (!adev->gart.ptr) + return 0; + + r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags, + adev->gart.ptr); + if (r) + return r; mb(); amdgpu_gart_flush_gpu_tlb(adev, 0); |