diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-18 06:56:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-18 06:56:35 +1000 |
| commit | 00fd14ff3017f64a9a03a08291e4be0d87bedc17 (patch) | |
| tree | 6bcf54e0168c22c6ad51f49529b7b31e5947c508 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | ce519c1baa6a7e24ec7a9e59c77c18e607e910ed (diff) | |
| parent | c238bfe0be9ef7420f7669a69e27c8c8f4d8a568 (diff) | |
Merge branch 'drm-fixes-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- GPUVM fixes for vega/RV and shadow buffers
- TTM fixes for hugepages
- TTM fix for refcount imbalance in error path
- DC AUX fix for some active DP-DVI dongles
- DC fix for multihead VT switch regression
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190415051703.3377-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 5d8b30fd4534..79fb302fb954 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3165,6 +3165,7 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) /* No need to recover an evicted BO */ if (shadow->tbo.mem.mem_type != TTM_PL_TT || + shadow->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET || shadow->parent->tbo.mem.mem_type != TTM_PL_VRAM) continue; |