rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

radeon-si_calculate_leakage-use-div64.patch: fix compile error on i686

Browse Source 
and some arm stuff
This commit is contained in:
Kyle McMartin 2013-08-02 11:22:55 -04:00
parent c8491a786b
commit b8530490d3
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-arm-generic
View File

@ -82,3 +82,5 @@ CONFIG_MDIO_GPIO=m
# CONFIG_DRM_SHMOBILE is not set # CONFIG_DRM_SHMOBILE is not set
# CONFIG_MMC_DW_SOCFPGA is not set # CONFIG_MMC_DW_SOCFPGA is not set
# CONFIG_ARM_SMMU is not set # CONFIG_ARM_SMMU is not set
# CONFIG_LOCK_STAT is not set

4
config-armv7
View File

@ -198,8 +198,8 @@ CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=m CONFIG_MMC_OMAP_HS=m
CONFIG_RTC_DRV_MAX8907=m CONFIG_RTC_DRV_MAX8907=m
# CONFIG_RTC_DRV_TWL92330 is not set # CONFIG_RTC_DRV_TWL92330 is not set
CONFIG_RTC_DRV_TWL4030=m CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_OMAP=y
# Note needs to be compiled in until we build MMC modular # Note needs to be compiled in until we build MMC modular
CONFIG_DMA_OMAP=m CONFIG_DMA_OMAP=m
CONFIG_OMAP_IOVMM=m CONFIG_OMAP_IOVMM=m

9
kernel.spec
View File

@ -653,6 +653,7 @@ Patch1001: devel-sysrq-secure-boot-20130717.patch
# virt + ksm patches # virt + ksm patches
# DRM # DRM
Patch1701: radeon-si_calculate_leakage-use-div64.patch
#atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch #atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
#Patch1800: drm-vgem.patch #Patch1800: drm-vgem.patch
@ -1392,6 +1393,9 @@ ApplyPatch devel-sysrq-secure-boot-20130717.patch
ApplyOptionalPatch drm-intel-next.patch ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-i915-dp-stfu.patch ApplyPatch drm-i915-dp-stfu.patch
# Radeon DRM
ApplyPatch radeon-si_calculate_leakage-use-div64.patch
# silence the ACPI blacklist code # silence the ACPI blacklist code
ApplyPatch silence-acpi-blacklist.patch ApplyPatch silence-acpi-blacklist.patch
@ -2258,6 +2262,11 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Fri Aug 02 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc3.git2.1
- radeon-si_calculate_leakage-use-div64.patch: fix a compile error on i686.
- arm: disable CONFIG_LOCK_STAT, bloats .data massively, revisit shortly.
- arm: build-in more rtc drivers.
* Fri Aug 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git2.1 * Fri Aug 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git2.1
- Linux v3.11-rc3-207-g64ccccf - Linux v3.11-rc3-207-g64ccccf

13
radeon-si_calculate_leakage-use-div64.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index 7ad22e8..4182557 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -1767,7 +1767,7 @@ static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coe
s64 temperature, t_slope, t_intercept, av, bv, t_ref;
s64 tmp;
- i_leakage = drm_int2fixp(ileakage) / 100;
+ i_leakage = div64_s64(drm_int2fixp(ileakage), 100);
vddc = div64_s64(drm_int2fixp(v), 1000);
temperature = div64_s64(drm_int2fixp(t), 1000);