aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch268
1 files changed, 268 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch
new file mode 100644
index 00000000..f7cd77cc
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5232-drm-amdgpu-move-amdgpu_device_-vram-gtt-_location.patch
@@ -0,0 +1,268 @@
+From 3f8b4df452587400e84c1decc0d85e6a5d3ec260 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Thu, 23 Aug 2018 15:20:43 +0200
+Subject: [PATCH 5232/5725] drm/amdgpu: move amdgpu_device_(vram|gtt)_location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move that into amdgpu_gmc.c since we are really deadling with GMC
+address space here.
+
+Change-Id: Ifbd4646af85e9452a5f06b3af5dc50c30a3002fd
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Raveendra Talabattula <raveendra.talabattula@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 65 ------------------------------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 64 +++++++++++++++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 ++
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-
+ 8 files changed, 76 insertions(+), 77 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index 9c59470..64b3990 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -1294,10 +1294,6 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev);
+
+ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,
+ u64 num_vis_bytes);
+-void amdgpu_device_vram_location(struct amdgpu_device *adev,
+- struct amdgpu_gmc *mc, u64 base);
+-void amdgpu_device_gart_location(struct amdgpu_device *adev,
+- struct amdgpu_gmc *mc);
+ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev);
+ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev,
+ const u32 *registers,
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index e850cde..02d9e4b 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -652,71 +652,6 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb)
+ }
+
+ /**
+- * amdgpu_device_vram_location - try to find VRAM location
+- *
+- * @adev: amdgpu device structure holding all necessary informations
+- * @mc: memory controller structure holding memory informations
+- * @base: base address at which to put VRAM
+- *
+- * Function will try to place VRAM at base address provided
+- * as parameter.
+- */
+-void amdgpu_device_vram_location(struct amdgpu_device *adev,
+- struct amdgpu_gmc *mc, u64 base)
+-{
+- uint64_t limit = (uint64_t)amdgpu_vram_limit << 20;
+-
+- mc->vram_start = base;
+- mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
+- if (limit && limit < mc->real_vram_size)
+- mc->real_vram_size = limit;
+- dev_info(adev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
+- mc->mc_vram_size >> 20, mc->vram_start,
+- mc->vram_end, mc->real_vram_size >> 20);
+-}
+-
+-/**
+- * amdgpu_device_gart_location - try to find GART location
+- *
+- * @adev: amdgpu device structure holding all necessary informations
+- * @mc: memory controller structure holding memory informations
+- *
+- * Function will place try to place GART before or after VRAM.
+- *
+- * If GART size is bigger than space left then we ajust GART size.
+- * Thus function will never fails.
+- */
+-void amdgpu_device_gart_location(struct amdgpu_device *adev,
+- struct amdgpu_gmc *mc)
+-{
+- u64 size_af, size_bf;
+-
+- mc->gart_size += adev->pm.smu_prv_buffer_size;
+-
+- size_af = adev->gmc.mc_mask - mc->vram_end;
+- size_bf = mc->vram_start;
+- if (size_bf > size_af) {
+- if (mc->gart_size > size_bf) {
+- dev_warn(adev->dev, "limiting GART\n");
+- mc->gart_size = size_bf;
+- }
+- mc->gart_start = 0;
+- } else {
+- if (mc->gart_size > size_af) {
+- dev_warn(adev->dev, "limiting GART\n");
+- mc->gart_size = size_af;
+- }
+- /* VCE doesn't like it when BOs cross a 4GB segment, so align
+- * the GART base on a 4GB boundary as well.
+- */
+- mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);
+- }
+- mc->gart_end = mc->gart_start + mc->gart_size - 1;
+- dev_info(adev->dev, "GART: %lluM 0x%016llX - 0x%016llX\n",
+- mc->gart_size >> 20, mc->gart_start, mc->gart_end);
+-}
+-
+-/**
+ * amdgpu_device_resize_fb_bar - try to resize FB BAR
+ *
+ * @adev: amdgpu_device pointer
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+index a249931..72dffa3 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+@@ -78,3 +78,67 @@ uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo)
+ }
+ return pd_addr;
+ }
++
++/**
++ * amdgpu_gmc_vram_location - try to find VRAM location
++ *
++ * @adev: amdgpu device structure holding all necessary informations
++ * @mc: memory controller structure holding memory informations
++ * @base: base address at which to put VRAM
++ *
++ * Function will try to place VRAM at base address provided
++ * as parameter.
++ */
++void amdgpu_gmc_vram_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc,
++ u64 base)
++{
++ uint64_t limit = (uint64_t)amdgpu_vram_limit << 20;
++
++ mc->vram_start = base;
++ mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
++ if (limit && limit < mc->real_vram_size)
++ mc->real_vram_size = limit;
++ dev_info(adev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
++ mc->mc_vram_size >> 20, mc->vram_start,
++ mc->vram_end, mc->real_vram_size >> 20);
++}
++
++/**
++ * amdgpu_gmc_gart_location - try to find GART location
++ *
++ * @adev: amdgpu device structure holding all necessary informations
++ * @mc: memory controller structure holding memory informations
++ *
++ * Function will place try to place GART before or after VRAM.
++ *
++ * If GART size is bigger than space left then we ajust GART size.
++ * Thus function will never fails.
++ */
++void amdgpu_gmc_gart_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
++{
++ u64 size_af, size_bf;
++
++ mc->gart_size += adev->pm.smu_prv_buffer_size;
++
++ size_af = adev->gmc.mc_mask - mc->vram_end;
++ size_bf = mc->vram_start;
++ if (size_bf > size_af) {
++ if (mc->gart_size > size_bf) {
++ dev_warn(adev->dev, "limiting GART\n");
++ mc->gart_size = size_bf;
++ }
++ mc->gart_start = 0;
++ } else {
++ if (mc->gart_size > size_af) {
++ dev_warn(adev->dev, "limiting GART\n");
++ mc->gart_size = size_af;
++ }
++ /* VCE doesn't like it when BOs cross a 4GB segment, so align
++ * the GART base on a 4GB boundary as well.
++ */
++ mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);
++ }
++ mc->gart_end = mc->gart_start + mc->gart_size - 1;
++ dev_info(adev->dev, "GART: %lluM 0x%016llX - 0x%016llX\n",
++ mc->gart_size >> 20, mc->gart_start, mc->gart_end);
++}
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+index aa0502e..81bb310 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+@@ -137,5 +137,9 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc)
+ void amdgpu_gmc_get_pde_for_bo(struct amdgpu_bo *bo, int level,
+ uint64_t *addr, uint64_t *flags);
+ uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo);
++void amdgpu_gmc_vram_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc,
++ u64 base);
++void amdgpu_gmc_gart_location(struct amdgpu_device *adev,
++ struct amdgpu_gmc *mc);
+
+ #endif
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+index d13110f..3911c52 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+@@ -223,8 +223,8 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev,
+ u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;
+ base <<= 24;
+
+- amdgpu_device_vram_location(adev, &adev->gmc, base);
+- amdgpu_device_gart_location(adev, mc);
++ amdgpu_gmc_vram_location(adev, &adev->gmc, base);
++ amdgpu_gmc_gart_location(adev, mc);
+ }
+
+ static void gmc_v6_0_mc_program(struct amdgpu_device *adev)
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+index 725de42..35fb090 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+@@ -241,8 +241,8 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev,
+ u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;
+ base <<= 24;
+
+- amdgpu_device_vram_location(adev, &adev->gmc, base);
+- amdgpu_device_gart_location(adev, mc);
++ amdgpu_gmc_vram_location(adev, &adev->gmc, base);
++ amdgpu_gmc_gart_location(adev, mc);
+ }
+
+ /**
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+index 7006eb4..bd3b859 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+@@ -410,8 +410,8 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev,
+ base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;
+ base <<= 24;
+
+- amdgpu_device_vram_location(adev, &adev->gmc, base);
+- amdgpu_device_gart_location(adev, mc);
++ amdgpu_gmc_vram_location(adev, &adev->gmc, base);
++ amdgpu_gmc_gart_location(adev, mc);
+ }
+
+ /**
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index bc815ebe..2ee8a84 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -748,8 +748,8 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
+ u64 base = 0;
+ if (!amdgpu_sriov_vf(adev))
+ base = mmhub_v1_0_get_fb_location(adev);
+- amdgpu_device_vram_location(adev, &adev->gmc, base);
+- amdgpu_device_gart_location(adev, mc);
++ amdgpu_gmc_vram_location(adev, &adev->gmc, base);
++ amdgpu_gmc_gart_location(adev, mc);
+ /* base offset of vram pages */
+ adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev);
+ }
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-16 11:10:17 +0000