diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2015-07-10 14:16:24 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-07-23 11:09:44 -0400 |
commit | 6a585777c832f45c05d1aa8a4872b2b292a908c2 (patch) | |
tree | f909593e9d40f7bf19f8c8d3c5f822af0575b090 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 5e6775abb5ce7ada76fa17c67857576176d0b60f (diff) |
drm/amdgpu: implement VCE 3.0 harvesting support (v4)
For boards with bad VCE blocks, only configure the working
block.
v2: use the harvest info for pipe setup
v3: fix mask check as noted by Leo
v4: add dGPU support
Reviewed-by: Christian König <christian.koenig@amd.com> (v2)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 01657830b470..e9fde72cf038 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1614,6 +1614,9 @@ struct amdgpu_uvd { | |||
1614 | #define AMDGPU_MAX_VCE_HANDLES 16 | 1614 | #define AMDGPU_MAX_VCE_HANDLES 16 |
1615 | #define AMDGPU_VCE_FIRMWARE_OFFSET 256 | 1615 | #define AMDGPU_VCE_FIRMWARE_OFFSET 256 |
1616 | 1616 | ||
1617 | #define AMDGPU_VCE_HARVEST_VCE0 (1 << 0) | ||
1618 | #define AMDGPU_VCE_HARVEST_VCE1 (1 << 1) | ||
1619 | |||
1617 | struct amdgpu_vce { | 1620 | struct amdgpu_vce { |
1618 | struct amdgpu_bo *vcpu_bo; | 1621 | struct amdgpu_bo *vcpu_bo; |
1619 | uint64_t gpu_addr; | 1622 | uint64_t gpu_addr; |
@@ -1626,6 +1629,7 @@ struct amdgpu_vce { | |||
1626 | const struct firmware *fw; /* VCE firmware */ | 1629 | const struct firmware *fw; /* VCE firmware */ |
1627 | struct amdgpu_ring ring[AMDGPU_MAX_VCE_RINGS]; | 1630 | struct amdgpu_ring ring[AMDGPU_MAX_VCE_RINGS]; |
1628 | struct amdgpu_irq_src irq; | 1631 | struct amdgpu_irq_src irq; |
1632 | unsigned harvest_config; | ||
1629 | }; | 1633 | }; |
1630 | 1634 | ||
1631 | /* | 1635 | /* |