diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-24 08:35:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-24 08:35:23 +1000 |
| commit | 1e8ad3d8da4763b238d09244d4d1177aa640c0d3 (patch) | |
| tree | 726ad9e44d1ae8bd550c983b58b7697ef1c67c66 /drivers/gpu/drm/amd/amdgpu/vi.c | |
| parent | 894ebc414d4688da732a185954ca23c5d11900d0 (diff) | |
| parent | 187368a5c7ad6c41159b85025a87d6d136eb8d4b (diff) | |
Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-nextdrm-for-v4.11
Some ttm/amd fixes.
* 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/powerplay: fix PSI feature on Polars12.
drm/amdgpu: refuse to reserve io mem for split VRAM buffers
drm/ttm: fix use-after-free races in vm fault handling
drm/amd/amdgpu: post card if there is real hw resetting performed
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 4922fff08c3c..50bdb24ef8d6 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -721,6 +721,7 @@ static int vi_gpu_pci_config_reset(struct amdgpu_device *adev) if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) { /* enable BM */ pci_set_master(adev->pdev); + adev->has_hw_reset = true; return 0; } udelay(1); |