1 files changed, 27 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3594704a6f9b..ad20747bace8 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -80,6 +80,13 @@ MODULE_FIRMWARE("amdgpu/raven_mec.bin");
 MODULE_FIRMWARE("amdgpu/raven_mec2.bin");
 MODULE_FIRMWARE("amdgpu/raven_rlc.bin");
 
+MODULE_FIRMWARE("amdgpu/picasso_ce.bin");
+MODULE_FIRMWARE("amdgpu/picasso_pfp.bin");
+MODULE_FIRMWARE("amdgpu/picasso_me.bin");
+MODULE_FIRMWARE("amdgpu/picasso_mec.bin");
+MODULE_FIRMWARE("amdgpu/picasso_mec2.bin");
+MODULE_FIRMWARE("amdgpu/picasso_rlc.bin");
+
 static const struct soc15_reg_golden golden_settings_gc_9_0[] =
 {
         SOC15_REG_GOLDEN_VALUE(GC, 0, mmDB_DEBUG2, 0xf00fffff, 0x00000400),
@@ -240,6 +247,7 @@ static const u32 GFX_RLC_SRM_INDEX_CNTL_DATA_OFFSETS[] =
 #define VEGA10_GB_ADDR_CONFIG_GOLDEN 0x2a114042
 #define VEGA12_GB_ADDR_CONFIG_GOLDEN 0x24104041
 #define RAVEN_GB_ADDR_CONFIG_GOLDEN 0x24000042
+#define PICASSO_GB_ADDR_CONFIG_GOLDEN 0x24000042
 
 static void gfx_v9_0_set_ring_funcs(struct amdgpu_device *adev);
 static void gfx_v9_0_set_irq_funcs(struct amdgpu_device *adev);
@@ -279,6 +287,7 @@ static void gfx_v9_0_init_golden_registers(struct amdgpu_device *adev)
                                                 ARRAY_SIZE(golden_settings_gc_9_0_vg20));
                 break;
         case CHIP_RAVEN:
+        case CHIP_PICASSO:
                 soc15_program_register_sequence(adev,
                                                  golden_settings_gc_9_1,
                                                  ARRAY_SIZE(golden_settings_gc_9_1));
@@ -566,6 +575,9 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)
         case CHIP_RAVEN:
                 chip_name = "raven";
                 break;
+        case CHIP_PICASSO:
+                chip_name = "picasso";
+                break;
         default:
                 BUG();
         }
@@ -1019,7 +1031,7 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device *adev)
                 amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
         }
 
-        if (adev->asic_type == CHIP_RAVEN) {
+        if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_PICASSO) {
                 /* TODO: double check the cp_table_size for RV */
                 adev->gfx.rlc.cp_table_size = ALIGN(96 * 5 * 4, 2048) + (64 * 1024); /* JT + GDS */
                 r = amdgpu_bo_create_reserved(adev, adev->gfx.rlc.cp_table_size,
@@ -1268,6 +1280,14 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev)
                 adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
                 gb_addr_config = RAVEN_GB_ADDR_CONFIG_GOLDEN;
                 break;
+        case CHIP_PICASSO:
+                adev->gfx.config.max_hw_contexts = 8;
+                adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;
+                adev->gfx.config.sc_prim_fifo_size_backend = 0x100;
+                adev->gfx.config.sc_hiz_tile_fifo_size = 0x30;
+                adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
+                gb_addr_config = PICASSO_GB_ADDR_CONFIG_GOLDEN;
+                break;
         default:
                 BUG();
                 break;
@@ -1546,6 +1566,7 @@ static int gfx_v9_0_sw_init(void *handle)
         case CHIP_VEGA12:
         case CHIP_VEGA20:
         case CHIP_RAVEN:
+        case CHIP_PICASSO:
                 adev->gfx.mec.num_mec = 2;
                 break;
         default:
@@ -1707,7 +1728,7 @@ static int gfx_v9_0_sw_fini(void *handle)
         amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj,
                                 &adev->gfx.rlc.clear_state_gpu_addr,
                                 (void **)&adev->gfx.rlc.cs_ptr);
-        if (adev->asic_type == CHIP_RAVEN) {
+        if ((adev->asic_type == CHIP_RAVEN) || (adev->asic_type == CHIP_PICASSO)) {
                 amdgpu_bo_free_kernel(&adev->gfx.rlc.cp_table_obj,
                                 &adev->gfx.rlc.cp_table_gpu_addr,
                                 (void **)&adev->gfx.rlc.cp_table_ptr);
@@ -2373,7 +2394,7 @@ static int gfx_v9_0_rlc_resume(struct amdgpu_device *adev)
                         return r;
         }
 
-        if (adev->asic_type == CHIP_RAVEN) {
+        if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_PICASSO) {
                 if (amdgpu_lbpw != 0)
                         gfx_v9_0_enable_lbpw(adev, true);
                 else
@@ -3777,6 +3798,7 @@ static int gfx_v9_0_set_powergating_state(void *handle,
 
         switch (adev->asic_type) {
         case CHIP_RAVEN:
+        case CHIP_PICASSO:
                 if (!enable) {
                         amdgpu_gfx_off_ctrl(adev, false);
                         cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
@@ -3831,6 +3853,7 @@ static int gfx_v9_0_set_clockgating_state(void *handle,
         case CHIP_VEGA12:
         case CHIP_VEGA20:
         case CHIP_RAVEN:
+        case CHIP_PICASSO:
                 gfx_v9_0_update_gfx_clock_gating(adev,
                                                  state == AMD_CG_STATE_GATE ? true : false);
                 break;
@@ -4840,6 +4863,7 @@ static void gfx_v9_0_set_rlc_funcs(struct amdgpu_device *adev)
         case CHIP_VEGA12:
         case CHIP_VEGA20:
         case CHIP_RAVEN:
+        case CHIP_PICASSO:
                 adev->gfx.rlc.funcs = &gfx_v9_0_rlc_funcs;
                 break;
         default: