diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:11:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:11:50 +1000 |
| commit | c703bf9e11c3314d068b974ef1af030ba5050e77 (patch) | |
| tree | a87638962f6bcf497527bce5aab66f50da6a7aaa /drivers/gpu/drm/amd/amdgpu/soc15.c | |
| parent | 96413c78d958e1047bf1cba78b91e1c7addc58b3 (diff) | |
| parent | 59d3191f14dc18881fec1172c7096b7863622803 (diff) | |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 5.1:
- Powerplay fixes
- DC fixes
- Fix locking around indirect register access in some cases
- KFD MQD fix
- Disable BACO for vega20 for now (fixes pending)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190307202528.3148-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 99ebcf29dcb0..ed89a101f73f 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -461,7 +461,6 @@ static int soc15_asic_reset(struct amdgpu_device *adev) switch (adev->asic_type) { case CHIP_VEGA10: - case CHIP_VEGA20: soc15_asic_get_baco_capability(adev, &baco_reset); break; default: |