Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef5b226 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: move vi smu firmware declares to powerplay. 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 78bbe771

drivers/gpu/drm/amd/amdgpu/vi.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -20,9 +20,7 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 *

 */

 */

#include <linux/firmware.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/module.h>

#include "drmP.h"

#include "drmP.h"

#include "amdgpu.h"

#include "amdgpu.h"

#include "amdgpu_atombios.h"

#include "amdgpu_atombios.h"
@@ -79,17 +77,6 @@ 
#endif

#endif

#include "dce_virtual.h"

#include "dce_virtual.h"





MODULE_FIRMWARE("amdgpu/topaz_smc.bin");

MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");

MODULE_FIRMWARE("amdgpu/tonga_smc.bin");

MODULE_FIRMWARE("amdgpu/tonga_k_smc.bin");

MODULE_FIRMWARE("amdgpu/fiji_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");

MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");

MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");



/*

/*

 * Indirect registers accessor

 * Indirect registers accessor

 */

 */

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */

 */

#include <linux/types.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <drm/amdgpu_drm.h>

#include <drm/amdgpu_drm.h>

#include "pp_instance.h"

#include "pp_instance.h"
@@ -29,6 +30,16 @@ 
#include "cgs_common.h"

#include "cgs_common.h"

#include "linux/delay.h"

#include "linux/delay.h"





MODULE_FIRMWARE("amdgpu/topaz_smc.bin");

MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");

MODULE_FIRMWARE("amdgpu/tonga_smc.bin");

MODULE_FIRMWARE("amdgpu/tonga_k_smc.bin");

MODULE_FIRMWARE("amdgpu/fiji_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");

MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");

MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");

MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");





int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)

int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)

{

{