Commit ed21c047 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove gtt_base_align handling 



Not used any more.

Signed-off-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 3490bdb5

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -564,7 +564,6 @@ struct amdgpu_mc { 
	unsigned		vram_width;

	u64			real_vram_size;

	int			vram_mtrr;

	u64                     gtt_base_align;

	u64                     mc_mask;

	const struct firmware   *fw;	/* MC firmware */

	uint32_t                fw_version;

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

+3 −3
Original line number Diff line number Diff line
@@ -696,8 +696,8 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) 
{

	u64 size_af, size_bf;



	size_af = ((adev->mc.mc_mask - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align;

	size_bf = mc->vram_start & ~mc->gtt_base_align;

	size_af = adev->mc.mc_mask - mc->vram_end;

	size_bf = mc->vram_start;

	if (size_bf > size_af) {

		if (mc->gtt_size > size_bf) {

			dev_warn(adev->dev, "limiting GTT\n");
@@ -709,7 +709,7 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) 
			dev_warn(adev->dev, "limiting GTT\n");

			mc->gtt_size = size_af;

		}

		mc->gtt_start = (mc->vram_end + 1 + mc->gtt_base_align) & ~mc->gtt_base_align;

		mc->gtt_start = mc->vram_end + 1;

	}

	mc->gtt_end = mc->gtt_start + mc->gtt_size - 1;

	dev_info(adev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",

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

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev, 
		mc->mc_vram_size = 0xFFC0000000ULL;

	}

	amdgpu_vram_location(adev, &adev->mc, base);

	adev->mc.gtt_base_align = 0;

	amdgpu_gtt_location(adev, mc);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev, 
		mc->mc_vram_size = 0xFFC0000000ULL;

	}

	amdgpu_vram_location(adev, &adev->mc, base);

	adev->mc.gtt_base_align = 0;

	amdgpu_gtt_location(adev, mc);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, 
		mc->mc_vram_size = 0xFFC0000000ULL;

	}

	amdgpu_vram_location(adev, &adev->mc, base);

	adev->mc.gtt_base_align = 0;

	amdgpu_gtt_location(adev, mc);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE