aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch')
-rw-r--r--common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch b/common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch
deleted file mode 100644
index 934863d7..00000000
--- a/common/recipes-kernel/linux/files/0960-drm-amd-amdgpu-fix-64-bit-division.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 331e94f82101f319170bedc5f4b79f73227cfa2d Mon Sep 17 00:00:00 2001
-From: Slava Grigorev <slava.grigorev@amd.com>
-Date: Tue, 22 Mar 2016 23:34:29 -0400
-Subject: [PATCH 0960/1110] drm/amd/amdgpu: fix 64-bit division
-
-Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++--
- drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 7 +++++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-index b043dd6..d0ec83f 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-@@ -942,14 +942,14 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
- goto out;
- }
-
-- tmp = (unsigned int *)((uint64_t)rlc_hdr +
-+ tmp = (unsigned int *)((uintptr_t)rlc_hdr +
- le32_to_cpu(rlc_hdr->reg_list_format_array_offset_bytes));
- for (i = 0 ; i < (rlc_hdr->reg_list_format_size_bytes >> 2); i++)
- adev->gfx.rlc.register_list_format[i] = le32_to_cpu(tmp[i]);
-
- adev->gfx.rlc.register_restore = adev->gfx.rlc.register_list_format + i;
-
-- tmp = (unsigned int *)((uint64_t)rlc_hdr +
-+ tmp = (unsigned int *)((uintptr_t)rlc_hdr +
- le32_to_cpu(rlc_hdr->reg_list_array_offset_bytes));
- for (i = 0 ; i < (rlc_hdr->reg_list_size_bytes >> 2); i++)
- adev->gfx.rlc.register_restore[i] = le32_to_cpu(tmp[i]);
-diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
-index 715bc3d..a5172d1 100644
---- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
-@@ -23,6 +23,7 @@
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/fb.h>
-+#include <asm/div64.h>
- #include "linux/delay.h"
- #include "pp_acpi.h"
- #include "hwmgr.h"
-@@ -981,7 +982,8 @@ static int polaris10_calculate_sclk_params(struct pp_hwmgr *hwmgr,
- sclk_setting->Fcw_int = (uint16_t)((clock << table->SclkFcwRangeTable[sclk_setting->PllRange].postdiv) / ref_clock);
- temp = clock << table->SclkFcwRangeTable[sclk_setting->PllRange].postdiv;
- temp <<= 0x10;
-- sclk_setting->Fcw_frac = (uint16_t)(0xFFFF & (temp / ref_clock));
-+ do_div(temp, ref_clock);
-+ sclk_setting->Fcw_frac = temp & 0xffff;
-
- pcc_target_percent = 10; /* Hardcode 10% for now. */
- pcc_target_freq = clock - (clock * pcc_target_percent / 100);
-@@ -995,7 +997,8 @@ static int polaris10_calculate_sclk_params(struct pp_hwmgr *hwmgr,
- sclk_setting->Fcw1_int = (uint16_t)((ss_target_freq << table->SclkFcwRangeTable[sclk_setting->PllRange].postdiv) / ref_clock);
- temp = ss_target_freq << table->SclkFcwRangeTable[sclk_setting->PllRange].postdiv;
- temp <<= 0x10;
-- sclk_setting->Fcw1_frac = (uint16_t)(0xFFFF & (temp / ref_clock));
-+ do_div(temp, ref_clock);
-+ sclk_setting->Fcw1_frac = temp & 0xffff;
- }
-
- return 0;
---
-2.7.4
-