drm/amdgpu: cleanup initializing gtt_size (011d4bbe) · Commits · 戴 / test

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -559,6 +559,7 @@ struct amdgpu_gart {
		const struct amdgpu_gart_funcs *gart_funcs;
		};

		void amdgpu_gart_set_defaults(struct amdgpu_device *adev);
		int amdgpu_gart_table_ram_alloc(struct amdgpu_device *adev);
		void amdgpu_gart_table_ram_free(struct amdgpu_device *adev);
		int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev);

+20 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,26 @@
		/*
		* Common GART table functions.
		*/

		/**
		* amdgpu_gart_set_defaults - set the default gtt_size
		*
		* @adev: amdgpu_device pointer
		*
		* Set the default gtt_size based on parameters and available VRAM.
		*/
		void amdgpu_gart_set_defaults(struct amdgpu_device *adev)
		{
		/* unless the user had overridden it, set the gart
		* size equal to the 1024 or vram, whichever is larger.
		*/
		if (amdgpu_gart_size == -1)
		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
		adev->mc.mc_vram_size);
		else
		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;
		}

		/**
		* amdgpu_gart_table_ram_alloc - allocate system ram for gart page table
		*

+1 −9

Original line number	Diff line number	Diff line
		@@ -321,15 +321,7 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev)
		adev->mc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;
		adev->mc.visible_vram_size = adev->mc.aper_size;

		/* unless the user had overridden it, set the gart
		* size equal to the 1024 or vram, whichever is larger.
		*/
		if (amdgpu_gart_size == -1)
		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
		adev->mc.mc_vram_size);
		else
		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

		amdgpu_gart_set_defaults(adev);
		gmc_v6_0_vram_gtt_location(adev, &adev->mc);

		return 0;

+1 −9

Original line number	Diff line number	Diff line
		@@ -373,15 +373,7 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)
		if (adev->mc.visible_vram_size > adev->mc.real_vram_size)
		adev->mc.visible_vram_size = adev->mc.real_vram_size;

		/* unless the user had overridden it, set the gart
		* size equal to the 1024 or vram, whichever is larger.
		*/
		if (amdgpu_gart_size == -1)
		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
		adev->mc.mc_vram_size);
		else
		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

		amdgpu_gart_set_defaults(adev);
		gmc_v7_0_vram_gtt_location(adev, &adev->mc);

		return 0;

+1 −9

Original line number	Diff line number	Diff line
		@@ -535,15 +535,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
		if (adev->mc.visible_vram_size > adev->mc.real_vram_size)
		adev->mc.visible_vram_size = adev->mc.real_vram_size;

		/* unless the user had overridden it, set the gart
		* size equal to the 1024 or vram, whichever is larger.
		*/
		if (amdgpu_gart_size == -1)
		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
		adev->mc.mc_vram_size);
		else
		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

		amdgpu_gart_set_defaults(adev);
		gmc_v8_0_vram_gtt_location(adev, &adev->mc);

		return 0;