Skip to contentSkip to conversation

drm/radeon: replace nested min calls with min3

PATCH Applied Thorsten Blum 2 participants 2 messages Apr 7 – Apr 13

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon: replace nested min calls with min3

In dce6_available_bandwidth() and dce8_available_bandwidth(), replace nested min() calls with min3().

---
 drivers/gpu/drm/radeon/cik.c | 2 +-
 drivers/gpu/drm/radeon/si.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -1
index 51a3e0fc2f56..a13635443833 100644
@@ -9063,7 +9063,7 @@ static u32 dce8_available_bandwidth(struct dce8_wm_params *wm)
 	u32 data_return_bandwidth = dce8_data_return_bandwidth(wm);
 	u32 dmif_req_bandwidth = dce8_dmif_request_bandwidth(wm);
 
-	return min(dram_bandwidth, min(data_return_bandwidth, dmif_req_bandwidth));
+	return min3(dram_bandwidth, data_return_bandwidth, dmif_req_bandwidth);
 }
 
 /**
drivers/gpu/drm/radeon/si.c +1 -1
index 26197aceb001..4681ff28630a 100644
@@ -2150,7 +2150,7 @@ static u32 dce6_available_bandwidth(struct dce6_wm_params *wm)
 	u32 data_return_bandwidth = dce6_data_return_bandwidth(wm);
 	u32 dmif_req_bandwidth = dce6_dmif_request_bandwidth(wm);
 
-	return min(dram_bandwidth, min(data_return_bandwidth, dmif_req_bandwidth));
+	return min3(dram_bandwidth, data_return_bandwidth, dmif_req_bandwidth);
 }
 
 static u32 dce6_average_bandwidth(struct dce6_wm_params *wm)
Applied
#1 lore raw

Applied. Thanks!

Quoted 36 lines · Thorsten Blum

In dce6_available_bandwidth() and dce8_available_bandwidth(), replace nested min() calls with min3().

---
 drivers/gpu/drm/radeon/cik.c | 2 +-
 drivers/gpu/drm/radeon/si.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -1
index 51a3e0fc2f56..a13635443833 100644
@@ -9063,7 +9063,7 @@ static u32 dce8_available_bandwidth(struct dce8_wm_params *wm)
        u32 data_return_bandwidth = dce8_data_return_bandwidth(wm);
        u32 dmif_req_bandwidth = dce8_dmif_request_bandwidth(wm);
 
-       return min(dram_bandwidth, min(data_return_bandwidth, dmif_req_bandwidth));
+       return min3(dram_bandwidth, data_return_bandwidth, dmif_req_bandwidth);
 }
 
 /**
drivers/gpu/drm/radeon/si.c +1 -1
index 26197aceb001..4681ff28630a 100644
@@ -2150,7 +2150,7 @@ static u32 dce6_available_bandwidth(struct dce6_wm_params *wm)
        u32 data_return_bandwidth = dce6_data_return_bandwidth(wm);
        u32 dmif_req_bandwidth = dce6_dmif_request_bandwidth(wm);
 
-       return min(dram_bandwidth, min(data_return_bandwidth, dmif_req_bandwidth));
+       return min3(dram_bandwidth, data_return_bandwidth, dmif_req_bandwidth);
 }
 
 static u32 dce6_average_bandwidth(struct dce6_wm_params *wm)