Skip to contentSkip to conversation

drm/msm: Avoid rounding up to one jiffy

PATCH Superseded Rob Clark 2 participants 2 messages Jan 9, 2025 – Jan 13, 2025

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm/msm: Avoid rounding up to one jiffy

From: Rob Clark <[email protected]>

If userspace is trying to achieve a timeout of zero, let 'em have it. Only round up if the timeout is greater than zero.

Fixes 4969bccd5f4e ("drm/msm: Avoid rounding down to zero jiffies")
---
 drivers/gpu/drm/msm/msm_drv.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_drv.h +4 -6
index fee31680a6d5..451d258b9827 100644
@@ -537,16 +537,14 @@ static inline int align_pitch(int width, int bpp)
 static inline unsigned long timeout_to_jiffies(const ktime_t *timeout)
 {
 	ktime_t now = ktime_get();
-	s64 remaining_jiffies;
 
-	if (ktime_compare(*timeout, now) < 0) {
-		remaining_jiffies = 0;
+	if (ktime_compare(*timeout, now) <= 0) {
+		return 0;
 	} else {
 		ktime_t rem = ktime_sub(*timeout, now);
-		remaining_jiffies = ktime_divns(rem, NSEC_PER_SEC / HZ);
+		s64 remaining_jiffies = ktime_divns(rem, NSEC_PER_SEC / HZ);
+		return clamp(remaining_jiffies, 1LL, (s64)INT_MAX);
 	}
-
-	return clamp(remaining_jiffies, 1LL, (s64)INT_MAX);
 }
 
 /* Driver helpers */
Signature · 1 line
2.47.1
#1 lore raw
Quoted 16 lines · Rob Clark

From: Rob Clark <[email protected]>

If userspace is trying to achieve a timeout of zero, let 'em have it. Only round up if the timeout is greater than zero.

Fixes 4969bccd5f4e ("drm/msm: Avoid rounding down to zero jiffies")
---
 drivers/gpu/drm/msm/msm_drv.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_drv.h +0 -0
index fee31680a6d5..451d258b9827 100644

drivers/gpu/drm/msm/msm_drv.h static inline int align_pitch(int width, int bpp) · line 543

Quoted 10 lines
drivers/gpu/drm/msm/msm_drv.h +2 -3
@@ -537,16 +537,14 @@ static inline int align_pitch(int width, int bpp)
 static inline unsigned long timeout_to_jiffies(const ktime_t *timeout)
 {
 	ktime_t now = ktime_get();
-	s64 remaining_jiffies;
 
-	if (ktime_compare(*timeout, now) < 0) {
-		remaining_jiffies = 0;
+	if (ktime_compare(*timeout, now) <= 0) {
+		return 0;
 	} else {

For readability, we can now remove 'else' block and de-nest rest of the code.

-Akhil

Quoted 10 lines
drivers/gpu/drm/msm/msm_drv.h +2 -3
 		ktime_t rem = ktime_sub(*timeout, now);
-		remaining_jiffies = ktime_divns(rem, NSEC_PER_SEC / HZ);
+		s64 remaining_jiffies = ktime_divns(rem, NSEC_PER_SEC / HZ);
+		return clamp(remaining_jiffies, 1LL, (s64)INT_MAX);
 	}
-
-	return clamp(remaining_jiffies, 1LL, (s64)INT_MAX);
 }
 
 /* Driver helpers */