drm/amdgpu: simplify Raven, Raven2, and Picasso handling

Treat them all as Raven rather than adding a new picasso
asic type.  This simplifies a lot of code and also handles the
case of rv2 chips with the 0x15d8 pci id.  It also fixes dmcu
fw handling for picasso.

Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index a74498ce87ff..a73674f9a0f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -63,14 +63,13 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
 
         switch (adev->asic_type) {
         case CHIP_RAVEN:
-        if (adev->rev_id >= 8)
+                if (adev->rev_id >= 8)
                         fw_name = FIRMWARE_RAVEN2;
+                else if (adev->pdev->device == 0x15d8)
+                        fw_name = FIRMWARE_PICASSO;
                 else
                         fw_name = FIRMWARE_RAVEN;
                 break;
-        case CHIP_PICASSO:
-                fw_name = FIRMWARE_PICASSO;
-                break;
         default:
                 return -EINVAL;
         }