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

Commit dbd29f0d authored by Jammy Zhou's avatar Jammy Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: rename tonga_smumgr.h to tonga_smum.h 



This conflicts with the tonga_smumgr.h from powerplay
in DKMS environement

Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJordan Lazare <Jordan.Lazare@amd.com>
parent 6bd48d24

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/firmware.h>

#include <linux/firmware.h>

#include "drmP.h"

#include "drmP.h"

#include "amdgpu.h"

#include "amdgpu.h"

#include "tonga_smumgr.h"

#include "tonga_smum.h"





MODULE_FIRMWARE("amdgpu/tonga_smc.bin");

MODULE_FIRMWARE("amdgpu/tonga_smc.bin");

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "drmP.h"

#include "drmP.h"

#include "amdgpu.h"

#include "amdgpu.h"

#include "tonga_ppsmc.h"

#include "tonga_ppsmc.h"

#include "tonga_smumgr.h"

#include "tonga_smum.h"

#include "smu_ucode_xfer_vi.h"

#include "smu_ucode_xfer_vi.h"

#include "amdgpu_ucode.h"

#include "amdgpu_ucode.h"