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

Commit 60508d3d authored by Alex Xie's avatar Alex Xie Committed by Alex Deucher
Browse files

drm/amdgpu: Fix 32bit x86 compilation warning 



drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c:187:2: warning: right shift count >= width of type [enabled by default]
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c:173:2: warning: right shift count >= width of type [enabled by default]
drivers/gpu/drm/amd/amdgpu/vega10_ih.c:106:3: warning: right shift count >= width of type [enabled by default]

v2: Add a space between "&" and "0xff"

Reported by: kbuild-all@01.org

Signed-off-by: default avatarAlex Xie <AlexBin.Xie@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c7217b2a

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) 
		(u32)(adev->dummy_page.addr >> 12));

	WREG32(SOC15_REG_OFFSET(GC, 0,

				mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32),

		(u32)(adev->dummy_page.addr >> 44));

		(u32)((u64)adev->dummy_page.addr >> 44));



	tmp = RREG32(SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL2));

	tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL2,

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

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) 
		(u32)(adev->dummy_page.addr >> 12));

	WREG32(SOC15_REG_OFFSET(MMHUB, 0,

				mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32),

		(u32)(adev->dummy_page.addr >> 44));

		(u32)((u64)adev->dummy_page.addr >> 44));



	tmp = RREG32(SOC15_REG_OFFSET(MMHUB, 0, mmVM_L2_PROTECTION_FAULT_CNTL2));

	tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL2,

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) 
	/* Ring Buffer base. [39:8] of 40-bit address of the beginning of the ring buffer*/

	if (adev->irq.ih.use_bus_addr) {

		WREG32(SOC15_REG_OFFSET(OSSSYS, 0, mmIH_RB_BASE), adev->irq.ih.rb_dma_addr >> 8);

		WREG32(SOC15_REG_OFFSET(OSSSYS, 0, mmIH_RB_BASE_HI), (adev->irq.ih.rb_dma_addr >> 40) &0xff);

		WREG32(SOC15_REG_OFFSET(OSSSYS, 0, mmIH_RB_BASE_HI), ((u64)adev->irq.ih.rb_dma_addr >> 40) & 0xff);

		ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_SPACE, 1);

	} else {

		WREG32(SOC15_REG_OFFSET(OSSSYS, 0, mmIH_RB_BASE), adev->irq.ih.gpu_addr >> 8);