diff options
| author | James Zhu <James.Zhu@amd.com> | 2020-07-23 11:07:52 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-27 16:21:00 -0400 |
| commit | 156589f74d07fbf4083b05712a3d71f834fdf2af (patch) | |
| tree | 2edfc6b8c99439b5d73e6d53233697e554fc8338 /drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | |
| parent | 0a5baee415000a3e18730ac98e19d046c3cebbe6 (diff) | |
| download | linux-stable-156589f74d07fbf4083b05712a3d71f834fdf2af.tar.gz linux-stable-156589f74d07fbf4083b05712a3d71f834fdf2af.tar.bz2 linux-stable-156589f74d07fbf4083b05712a3d71f834fdf2af.zip | |
drm/amdgpu/jpeg3.0: remove extra asic type check
jpeg ip block is already selected based on ASIC type during set_ip_blocks.
Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c index 42f1a516005e..c41e5590a701 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c @@ -49,12 +49,11 @@ static int jpeg_v3_0_set_powergating_state(void *handle, static int jpeg_v3_0_early_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - if (adev->asic_type == CHIP_SIENNA_CICHLID) { - u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING); + u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING); + + if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) + return -ENOENT; - if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) - return -ENOENT; - } adev->jpeg.num_jpeg_inst = 1; jpeg_v3_0_set_dec_ring_funcs(adev); |