diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 17:35:23 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 17:35:23 -0500 |
| commit | 1e8ad3d8da4763b238d09244d4d1177aa640c0d3 (patch) | |
| tree | 726ad9e44d1ae8bd550c983b58b7697ef1c67c66 /drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | |
| parent | 894ebc414d4688da732a185954ca23c5d11900d0 (diff) | |
| parent | 187368a5c7ad6c41159b85025a87d6d136eb8d4b (diff) | |
Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next
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/amdgpu_bios.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index d9def01f276e..821f7cc2051f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | |||
| @@ -100,7 +100,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) | |||
| 100 | resource_size_t size = 256 * 1024; /* ??? */ | 100 | resource_size_t size = 256 * 1024; /* ??? */ |
| 101 | 101 | ||
| 102 | if (!(adev->flags & AMD_IS_APU)) | 102 | if (!(adev->flags & AMD_IS_APU)) |
| 103 | if (!amdgpu_card_posted(adev)) | 103 | if (amdgpu_need_post(adev)) |
| 104 | return false; | 104 | return false; |
| 105 | 105 | ||
| 106 | adev->bios = NULL; | 106 | adev->bios = NULL; |