Commit 1c5ae3ba authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/radeon/btc_dpm: Move 'evergreen_get_pi's prototype to shared header 



Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/radeon/rv770_dpm.c:62:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes]
 62 | struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev)
 | ^~~~~~~~~~~~~~~~

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e67ceb96

drivers/gpu/drm/radeon/btc_dpm.c

+1 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "btc_dpm.h"

#include "btcd.h"

#include "cypress_dpm.h"

#include "evergreen.h"

#include "r600_dpm.h"

#include "rv770.h"

#include "radeon.h"
@@ -49,8 +50,6 @@ 
#ifndef BTC_MGCG_SEQUENCE

#define BTC_MGCG_SEQUENCE  300



struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);



extern int ni_mc_load_microcode(struct radeon_device *rdev);



//********* BARTS **************//

drivers/gpu/drm/radeon/cypress_dpm.c

+1 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include "atom.h"

#include "cypress_dpm.h"

#include "evergreen.h"

#include "evergreend.h"

#include "r600_dpm.h"

#include "rv770.h"
@@ -44,8 +45,6 @@ 
#define MC_CG_SEQ_YCLK_SUSPEND      0x04

#define MC_CG_SEQ_YCLK_RESUME       0x0a



struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);



static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev,

						 bool enable)

{

drivers/gpu/drm/radeon/evergreen.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define __RADEON_EVERGREEN_H__



struct evergreen_mc_save;

struct evergreen_power_info;

struct radeon_device;



bool evergreen_is_display_hung(struct radeon_device *rdev);
@@ -47,5 +48,6 @@ u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); 
void evergreen_print_gpu_status_regs(struct radeon_device *rdev);

u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev);

int evergreen_rlc_resume(struct radeon_device *rdev);

struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);



#endif				/* __RADEON_EVERGREEN_H__ */

drivers/gpu/drm/radeon/ni_dpm.c

+1 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/seq_file.h>



#include "atom.h"

#include "evergreen.h"

#include "ni_dpm.h"

#include "nid.h"

#include "r600_dpm.h"
@@ -720,8 +721,6 @@ static const u32 cayman_sysls_enable[] = 
};

#define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32))



struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);



extern int ni_mc_load_microcode(struct radeon_device *rdev);



struct ni_power_info *ni_get_pi(struct radeon_device *rdev)

drivers/gpu/drm/radeon/rv770_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "rv770_dpm.h"

#include "cypress_dpm.h"

#include "atom.h"

#include "evergreen.h"

#include <linux/seq_file.h>



#define MC_CG_ARB_FREQ_F0           0x0a