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

drm/amd/powerplay: update driver if file for sienna_cichlid 



Update sienna_cichlid driver if header file to match pptable changes.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 969c8d16

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

+8 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
// *** IMPORTANT ***

// SMU TEAM: Always increment the interface version if 

// any structure is changed in this file

#define SMU11_DRIVER_IF_VERSION 0x31

#define SMU11_DRIVER_IF_VERSION 0x32



#define PPTABLE_Sienna_Cichlid_SMU_VERSION 4
@@ -865,8 +865,7 @@ typedef struct { 
  uint16_t     DfllGfxclkSpreadFreq;      // kHz

  

  // UCLK Spread Spectrum

  uint8_t      UclkSpreadEnabled;   // on or off

  uint8_t      UclkSpreadPercent;   // Q4.4

  uint16_t     UclkSpreadPadding;

  uint16_t     UclkSpreadFreq;      // kHz



  // FCLK Spread Spectrum
@@ -896,8 +895,11 @@ typedef struct { 
  uint8_t      VddqOffEnabled;

  uint8_t      PaddingUmcFlags[2];



  // UCLK Spread Spectrum

  uint8_t      UclkSpreadPercent[16];   



  // SECTION: Board Reserved

  uint32_t     BoardReserved[15];

  uint32_t     BoardReserved[11];



  // SECTION: Structure Padding
@@ -936,10 +938,12 @@ typedef struct { 
  int16_t                OverDrivePct;         // %

  uint16_t               FanMaximumRpm;

  uint16_t               FanMinimumPwm;

  uint16_t               FanAcousticLimitRpm;

  uint16_t               FanTargetTemperature; // Degree Celcius 

  uint8_t                FanLinearPwmPoints[NUM_OD_FAN_MAX_POINTS];

  uint8_t                FanLinearTempPoints[NUM_OD_FAN_MAX_POINTS];

  uint16_t               MaxOpTemp;            // Degree Celcius

  uint16_t               Padding_16[1];

  uint8_t                FanZeroRpmEnable;

  uint8_t                FanZeroRpmStopTemp;

  uint8_t                FanMode;

drivers/gpu/drm/amd/powerplay/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 0x33

#define SMU11_DRIVER_IF_VERSION_NV14 0x36

#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x31

#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x32



/* MP Apertures */

#define MP0_Public			0x03800000

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

+1 −6
Original line number Diff line number Diff line
@@ -2404,8 +2404,7 @@ static void sienna_cichlid_dump_pptable(struct smu_context *smu) 
	dev_info(smu->adev->dev, "DfllGfxclkSpreadPercent = 0x%x\n", pptable->DfllGfxclkSpreadPercent);

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



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

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

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

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



	dev_info(smu->adev->dev, "FclkSpreadEnabled = 0x%x\n", pptable->FclkSpreadEnabled);
@@ -2450,10 +2449,6 @@ static void sienna_cichlid_dump_pptable(struct smu_context *smu) 
	dev_info(smu->adev->dev, "BoardReserved[8] = 0x%x\n", pptable->BoardReserved[8]);

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

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

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

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

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

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



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

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