Commit 0e4b291b authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amd/pm: update driver if file for sienna cichlid 



Update drive if file for sienna_cichlid.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7cbbc745

drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h

+15 −5
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
// *** IMPORTANT ***

// SMU TEAM: Always increment the interface version if 

// any structure is changed in this file

#define SMU11_DRIVER_IF_VERSION 0x35

#define SMU11_DRIVER_IF_VERSION 0x37



#define PPTABLE_Sienna_Cichlid_SMU_VERSION 5

#define PPTABLE_Sienna_Cichlid_SMU_VERSION 6



#define NUM_GFXCLK_DPM_LEVELS  16

#define NUM_SMNCLK_DPM_LEVELS  2
@@ -169,7 +169,7 @@ typedef enum { 
#define DPM_OVERRIDE_DISABLE_DFLL_PLL_SHUTDOWN       0x00000200

#define DPM_OVERRIDE_DISABLE_MEMORY_TEMPERATURE_READ 0x00000400

#define DPM_OVERRIDE_DISABLE_VOLT_LINK_VCN_DCEFCLK   0x00000800

#define DPM_OVERRIDE_ENABLE_FAST_FCLK_TIMER          0x00001000

#define DPM_OVERRIDE_DISABLE_FAST_FCLK_TIMER         0x00001000

#define DPM_OVERRIDE_DISABLE_VCN_PG                  0x00002000

#define DPM_OVERRIDE_DISABLE_FMAX_VMAX               0x00004000
@@ -793,8 +793,18 @@ typedef struct { 


  // SECTION: Sku Reserved

  uint8_t          CustomerVariant;

  uint8_t          Spare[3];

  uint32_t         SkuReserved[14];



  //VC BTC parameters are only applicable to VDD_GFX domain

  uint8_t          VcBtcEnabled;

  uint16_t         VcBtcVminT0;                 // T0_VMIN

  uint16_t         VcBtcFixedVminAgingOffset;   // FIXED_VMIN_AGING_OFFSET 

  uint16_t         VcBtcVmin2PsmDegrationGb;    // VMIN_TO_PSM_DEGRADATION_GB 

  uint32_t         VcBtcPsmA;                   // A_PSM

  uint32_t         VcBtcPsmB;                   // B_PSM

  uint32_t         VcBtcVminA;                  // A_VMIN

  uint32_t         VcBtcVminB;                  // B_VMIN  

  

  uint32_t         SkuReserved[9];





  // MAJOR SECTION: BOARD PARAMETERS

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define SMU11_DRIVER_IF_VERSION_NV10 0x36

#define SMU11_DRIVER_IF_VERSION_NV12 0x36

#define SMU11_DRIVER_IF_VERSION_NV14 0x36

#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x35

#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x37

#define SMU11_DRIVER_IF_VERSION_Navy_Flounder 0x4



/* MP Apertures */

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+0 −5
Original line number Diff line number Diff line
@@ -2291,11 +2291,6 @@ static void sienna_cichlid_dump_pptable(struct smu_context *smu) 
	dev_info(smu->adev->dev, "SkuReserved[6] = 0x%x\n", pptable->SkuReserved[6]);

	dev_info(smu->adev->dev, "SkuReserved[7] = 0x%x\n", pptable->SkuReserved[7]);

	dev_info(smu->adev->dev, "SkuReserved[8] = 0x%x\n", pptable->SkuReserved[8]);

	dev_info(smu->adev->dev, "SkuReserved[9] = 0x%x\n", pptable->SkuReserved[9]);

	dev_info(smu->adev->dev, "SkuReserved[10] = 0x%x\n", pptable->SkuReserved[10]);

	dev_info(smu->adev->dev, "SkuReserved[11] = 0x%x\n", pptable->SkuReserved[11]);

	dev_info(smu->adev->dev, "SkuReserved[12] = 0x%x\n", pptable->SkuReserved[12]);

	dev_info(smu->adev->dev, "SkuReserved[13] = 0x%x\n", pptable->SkuReserved[13]);



	dev_info(smu->adev->dev, "GamingClk[0] = 0x%x\n", pptable->GamingClk[0]);

	dev_info(smu->adev->dev, "GamingClk[1] = 0x%x\n", pptable->GamingClk[1]);