diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2978-drm-amdgpu-rename-amdgpu_-_location-functions.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2978-drm-amdgpu-rename-amdgpu_-_location-functions.patch | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2978-drm-amdgpu-rename-amdgpu_-_location-functions.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2978-drm-amdgpu-rename-amdgpu_-_location-functions.patch new file mode 100644 index 00000000..d9c0d834 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2978-drm-amdgpu-rename-amdgpu_-_location-functions.patch @@ -0,0 +1,148 @@ +From cd26b7fb2dc26d70acc9d52b9efebe6d796210d9 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Thu, 14 Dec 2017 16:33:36 -0500 +Subject: [PATCH 2978/4131] drm/amdgpu: rename amdgpu_*_location functions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +add device to the name for consistency. + +Acked-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu.h + +Change-Id: I3102a1a3a23f14fa9e4d8a2735d0a4643fb93cd4 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++++---- + 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 ++-- + 6 files changed, 18 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index b5b0d1c..4be9e18 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1972,8 +1972,10 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, + u64 num_vis_bytes); + void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain); + bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo); +-void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base); +-void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc); ++void amdgpu_device_vram_location(struct amdgpu_device *adev, ++ struct amdgpu_mc *mc, u64 base); ++void amdgpu_device_gart_location(struct amdgpu_device *adev, ++ struct amdgpu_mc *mc); + #if !defined(BUILD_AS_DKMS) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev); + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 15c5fd8..545f4cf 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -534,7 +534,7 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb) + } + + /** +- * amdgpu_vram_location - try to find VRAM location ++ * 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 +@@ -542,7 +542,8 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb) + * Function will try to place VRAM at base address provided + * as parameter. + */ +-void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base) ++void amdgpu_device_vram_location(struct amdgpu_device *adev, ++ struct amdgpu_mc *mc, u64 base) + { + uint64_t limit = (uint64_t)amdgpu_vram_limit << 20; + +@@ -556,7 +557,7 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 + } + + /** +- * amdgpu_gart_location - try to find GTT location ++ * amdgpu_device_gart_location - try to find GTT location + * @adev: amdgpu device structure holding all necessary informations + * @mc: memory controller structure holding memory informations + * +@@ -567,7 +568,8 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 + * + * FIXME: when reducing GTT size align new size on power of 2. + */ +-void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) ++void amdgpu_device_gart_location(struct amdgpu_device *adev, ++ struct amdgpu_mc *mc) + { + u64 size_af, size_bf; + +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +index edf42a4..14360d4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +@@ -222,8 +222,8 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev, + u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF; + base <<= 24; + +- amdgpu_vram_location(adev, &adev->mc, base); +- amdgpu_gart_location(adev, mc); ++ amdgpu_device_vram_location(adev, &adev->mc, base); ++ amdgpu_device_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 dc4c683..c28195c 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_vram_location(adev, &adev->mc, base); +- amdgpu_gart_location(adev, mc); ++ amdgpu_device_vram_location(adev, &adev->mc, base); ++ amdgpu_device_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 59dbefe..26ef404 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +@@ -406,8 +406,8 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, + base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF; + base <<= 24; + +- amdgpu_vram_location(adev, &adev->mc, base); +- amdgpu_gart_location(adev, mc); ++ amdgpu_device_vram_location(adev, &adev->mc, base); ++ amdgpu_device_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 5383c3d..8b823b6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -653,8 +653,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_vram_location(adev, &adev->mc, base); +- amdgpu_gart_location(adev, mc); ++ amdgpu_device_vram_location(adev, &adev->mc, base); ++ amdgpu_device_gart_location(adev, mc); + /* base offset of vram pages */ + if (adev->flags & AMD_IS_APU) + adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev); +-- +2.7.4 + |