* [PATCH] drm/radeon:WARNING opportunity for max()
@ 2021-11-16 5:50 zhaoxiao
2021-11-16 7:22 ` Christian König
0 siblings, 1 reply; 3+ messages in thread
From: zhaoxiao @ 2021-11-16 5:50 UTC (permalink / raw)
To: airlied, daniel
Cc: alexander.deucher, christian.koenig, Xinhui.Pan, amd-gfx,
dri-devel, linux-kernel, zhaoxiao
Fix following coccicheck warning:
drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max()
drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max()
Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com>
---
drivers/gpu/drm/radeon/r100.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 2dd85ba1faa2..c65ee6f44af2 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
if (rdev->mc.aper_size > config_aper_size)
config_aper_size = rdev->mc.aper_size;
- if (config_aper_size > rdev->mc.real_vram_size)
- rdev->mc.mc_vram_size = config_aper_size;
- else
- rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
+ rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size);
}
}
@@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev)
mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full;
mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full;
- if (mc_latency_mclk.full > mc_latency_sclk.full)
- disp_latency.full = mc_latency_mclk.full;
- else
- disp_latency.full = mc_latency_sclk.full;
+ disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full);
/* setup Max GRPH_STOP_REQ default value */
if (ASIC_IS_RV100(rdev))
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon:WARNING opportunity for max()
2021-11-16 5:50 [PATCH] drm/radeon:WARNING opportunity for max() zhaoxiao
@ 2021-11-16 7:22 ` Christian König
0 siblings, 0 replies; 3+ messages in thread
From: Christian König @ 2021-11-16 7:22 UTC (permalink / raw)
To: zhaoxiao, airlied, daniel
Cc: alexander.deucher, Xinhui.Pan, amd-gfx, dri-devel, linux-kernel
Am 16.11.21 um 06:50 schrieb zhaoxiao:
> Fix following coccicheck warning:
> drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max()
> drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max()
>
> Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com>
In general feel free to add my Acked-by, but I'm not sure if we want
such cleanups in a driver which is only in maintenance mode.
If you do this as part of a general and automated cleanup then it is
probably ok.
Regards,
Christian.
> ---
> drivers/gpu/drm/radeon/r100.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 2dd85ba1faa2..c65ee6f44af2 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
> if (rdev->mc.aper_size > config_aper_size)
> config_aper_size = rdev->mc.aper_size;
>
> - if (config_aper_size > rdev->mc.real_vram_size)
> - rdev->mc.mc_vram_size = config_aper_size;
> - else
> - rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
> + rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size);
> }
> }
>
> @@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev)
> mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full;
> mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full;
>
> - if (mc_latency_mclk.full > mc_latency_sclk.full)
> - disp_latency.full = mc_latency_mclk.full;
> - else
> - disp_latency.full = mc_latency_sclk.full;
> + disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full);
>
> /* setup Max GRPH_STOP_REQ default value */
> if (ASIC_IS_RV100(rdev))
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] drm/radeon:WARNING opportunity for max()
@ 2021-11-16 5:48 zhaoxiao
0 siblings, 0 replies; 3+ messages in thread
From: zhaoxiao @ 2021-11-16 5:48 UTC (permalink / raw)
To: linux-kernel; +Cc: zhaoxiao
Fix following coccicheck warning:
drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max()
drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max()
Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com>
---
drivers/gpu/drm/radeon/r100.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 2dd85ba1faa2..c65ee6f44af2 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
if (rdev->mc.aper_size > config_aper_size)
config_aper_size = rdev->mc.aper_size;
- if (config_aper_size > rdev->mc.real_vram_size)
- rdev->mc.mc_vram_size = config_aper_size;
- else
- rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
+ rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size);
}
}
@@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev)
mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full;
mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full;
- if (mc_latency_mclk.full > mc_latency_sclk.full)
- disp_latency.full = mc_latency_mclk.full;
- else
- disp_latency.full = mc_latency_sclk.full;
+ disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full);
/* setup Max GRPH_STOP_REQ default value */
if (ASIC_IS_RV100(rdev))
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-16 7:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-16 5:50 [PATCH] drm/radeon:WARNING opportunity for max() zhaoxiao
2021-11-16 7:22 ` Christian König
-- strict thread matches above, loose matches on Subject: below --
2021-11-16 5:48 zhaoxiao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).