Skip to content

L
linux
Commit 1cd73ff7 authored by Alex Deucher's avatar Alex Deucher
Browse files
Options

drm/radeon: fix-up some float to fixed conversion thinkos 

Spotted by Brad Smith when porting to OpenBSD.
Noticed-by: default avatarBrad Smith <brad@comstyle.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d45fd24d
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 19 deletions
drivers/gpu/drm/radeon/rs690.c
View file @ 1cd73ff7
...@@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, ...@@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full && if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
rdev->pm.sideport_bandwidth.full) rdev->pm.sideport_bandwidth.full)
max_bandwidth = rdev->pm.sideport_bandwidth; max_bandwidth = rdev->pm.sideport_bandwidth;
read_delay_latency.full = dfixed_const(370 * 800 * 1000); read_delay_latency.full = dfixed_const(370 * 800);
read_delay_latency.full = dfixed_div(read_delay_latency, a.full = dfixed_const(1000);
rdev->pm.igp_sideport_mclk); b.full = dfixed_div(rdev->pm.igp_sideport_mclk, a);
read_delay_latency.full = dfixed_div(read_delay_latency, b);
read_delay_latency.full = dfixed_mul(read_delay_latency, a);
} else { } else {
if (max_bandwidth.full > rdev->pm.k8_bandwidth.full && if (max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full) rdev->pm.k8_bandwidth.full)
...@@ -488,14 +490,10 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev, ...@@ -488,14 +490,10 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm0->priority_mark.full > priority_mark02.full) if (wm0->priority_mark.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark.full; priority_mark02.full = wm0->priority_mark.full;
if (dfixed_trunc(priority_mark02) < 0)
priority_mark02.full = 0;
if (wm0->priority_mark_max.full > priority_mark02.full) if (wm0->priority_mark_max.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark_max.full; priority_mark02.full = wm0->priority_mark_max.full;
if (wm1->priority_mark.full > priority_mark12.full) if (wm1->priority_mark.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark.full; priority_mark12.full = wm1->priority_mark.full;
if (dfixed_trunc(priority_mark12) < 0)
priority_mark12.full = 0;
if (wm1->priority_mark_max.full > priority_mark12.full) if (wm1->priority_mark_max.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark_max.full; priority_mark12.full = wm1->priority_mark_max.full;
*d1mode_priority_a_cnt = dfixed_trunc(priority_mark02); *d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
...@@ -526,8 +524,6 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev, ...@@ -526,8 +524,6 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm0->priority_mark.full > priority_mark02.full) if (wm0->priority_mark.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark.full; priority_mark02.full = wm0->priority_mark.full;
if (dfixed_trunc(priority_mark02) < 0)
priority_mark02.full = 0;
if (wm0->priority_mark_max.full > priority_mark02.full) if (wm0->priority_mark_max.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark_max.full; priority_mark02.full = wm0->priority_mark_max.full;
*d1mode_priority_a_cnt = dfixed_trunc(priority_mark02); *d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
...@@ -555,8 +551,6 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev, ...@@ -555,8 +551,6 @@ static void rs690_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm1->priority_mark.full > priority_mark12.full) if (wm1->priority_mark.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark.full; priority_mark12.full = wm1->priority_mark.full;
if (dfixed_trunc(priority_mark12) < 0)
priority_mark12.full = 0;
if (wm1->priority_mark_max.full > priority_mark12.full) if (wm1->priority_mark_max.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark_max.full; priority_mark12.full = wm1->priority_mark_max.full;
*d2mode_priority_a_cnt = dfixed_trunc(priority_mark12); *d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
......
drivers/gpu/drm/radeon/rv515.c
View file @ 1cd73ff7
...@@ -1155,14 +1155,10 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev, ...@@ -1155,14 +1155,10 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm0->priority_mark.full > priority_mark02.full) if (wm0->priority_mark.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark.full; priority_mark02.full = wm0->priority_mark.full;
if (dfixed_trunc(priority_mark02) < 0)
priority_mark02.full = 0;
if (wm0->priority_mark_max.full > priority_mark02.full) if (wm0->priority_mark_max.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark_max.full; priority_mark02.full = wm0->priority_mark_max.full;
if (wm1->priority_mark.full > priority_mark12.full) if (wm1->priority_mark.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark.full; priority_mark12.full = wm1->priority_mark.full;
if (dfixed_trunc(priority_mark12) < 0)
priority_mark12.full = 0;
if (wm1->priority_mark_max.full > priority_mark12.full) if (wm1->priority_mark_max.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark_max.full; priority_mark12.full = wm1->priority_mark_max.full;
*d1mode_priority_a_cnt = dfixed_trunc(priority_mark02); *d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
...@@ -1193,8 +1189,6 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev, ...@@ -1193,8 +1189,6 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm0->priority_mark.full > priority_mark02.full) if (wm0->priority_mark.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark.full; priority_mark02.full = wm0->priority_mark.full;
if (dfixed_trunc(priority_mark02) < 0)
priority_mark02.full = 0;
if (wm0->priority_mark_max.full > priority_mark02.full) if (wm0->priority_mark_max.full > priority_mark02.full)
priority_mark02.full = wm0->priority_mark_max.full; priority_mark02.full = wm0->priority_mark_max.full;
*d1mode_priority_a_cnt = dfixed_trunc(priority_mark02); *d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
...@@ -1222,8 +1216,6 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev, ...@@ -1222,8 +1216,6 @@ static void rv515_compute_mode_priority(struct radeon_device *rdev,
} }
if (wm1->priority_mark.full > priority_mark12.full) if (wm1->priority_mark.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark.full; priority_mark12.full = wm1->priority_mark.full;
if (dfixed_trunc(priority_mark12) < 0)
priority_mark12.full = 0;
if (wm1->priority_mark_max.full > priority_mark12.full) if (wm1->priority_mark_max.full > priority_mark12.full)
priority_mark12.full = wm1->priority_mark_max.full; priority_mark12.full = wm1->priority_mark_max.full;
*d2mode_priority_a_cnt = dfixed_trunc(priority_mark12); *d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7