浏览代码

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

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Rex Zhu 8 年之前
父节点
当前提交
0ef5b226c4
共有 2 个文件被更改,包括 11 次插入13 次删除
  1. 0 13
      drivers/gpu/drm/amd/amdgpu/vi.c
  2. 11 0
      drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c

+ 0 - 13
drivers/gpu/drm/amd/amdgpu/vi.c

@@ -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
  */
  */

+ 11 - 0
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c

@@ -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)
 {
 {