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

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

drm/amdgpu: rename fiji_smumgr.h to fiji_smum.h 



This conflicts with fiji_smumgr.h from powerplay
in DKMS environment

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 dbd29f0d

drivers/gpu/drm/amd/amdgpu/fiji_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 "fiji_smumgr.h"

#include "fiji_smum.h"





MODULE_FIRMWARE("amdgpu/fiji_smc.bin");

MODULE_FIRMWARE("amdgpu/fiji_smc.bin");

drivers/gpu/drm/amd/amdgpu/fiji_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 "fiji_ppsmc.h"

#include "fiji_ppsmc.h"

#include "fiji_smumgr.h"

#include "fiji_smum.h"

#include "smu_ucode_xfer_vi.h"

#include "smu_ucode_xfer_vi.h"

#include "amdgpu_ucode.h"

#include "amdgpu_ucode.h"