diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-05-14 02:20:04 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-05-14 02:20:04 +0300 |
| commit | 08f0cfbf739a5086995f0779bbcb607163128a9a (patch) | |
| tree | 22bb159329b3cc39afac10a7d7dbca51915bade5 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 1db7aa269ada089c7b8be8d1477a4d3925dc5969 (diff) | |
| parent | 5c1efb5f7682e2072ca5ce12cd616d432604ecc0 (diff) | |
| download | linux-08f0cfbf739a5086995f0779bbcb607163128a9a.tar.xz | |
Merge tag 'amd-drm-fixes-5.13-2021-05-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.13-2021-05-13:
amdgpu:
- Fixes for flexible array conversions
- Fix sysfs attribute init
- Harvesting fixes
- VCN CG/PG fixes for Picasso
radeon:
- Fixes for flexible array conversions
- Fix for flickering on Oland with multiple 4K displays
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210513163228.3963-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index dc3a69296321..264176a01e16 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1006,6 +1006,7 @@ struct amdgpu_device { struct amdgpu_df df; struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM]; + uint32_t harvest_ip_mask; int num_ip_blocks; struct mutex mn_lock; DECLARE_HASHTABLE(mn_hash, 7); |