drm/amd/display: Use kvfree() to free coeff in build_regamma()
PATCH 1/2 drm/amd/display: Use kvfree() to free coeff in build_regamma()
Use kvfree() instead of kfree() to free coeff in build_regamma() because the memory is allocated with kvzalloc().
--- drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +1 -1
@@ -843,7 +843,7 @@ static bool build_regamma(struct pwl_float_data_ex *rgb_regamma, pow_buffer_ptr =-1 ;// reset back to no optimize ret = true; release: -kfree (coeff); +kvfree (coeff);return ret; }
Signature · 1 line
2.26.2
PATCH 2/2 drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp()
Use kfree() instead of kvfree() to free rgb_user in calculate_user_regamma_ramp() because the memory is allocated with kcalloc().
---
Looks like this kvfree is from merge conflict between 1fafef9dfe12 ("Merge drm-fixes-for-v4.17-rc6-urgent into drm-next") and 6396bb221514 ("treewide: kzalloc() -> kcalloc()"). I'm not adding cc to stable because the bug looks harmless. You can squash the commits if you want.
drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +1 -1
@@ -1777,7 +1777,7 @@ bool calculate_user_regamma_ramp(struct dc_transfer_func *output_tf,kfree (rgb_regamma); rgb_regamma_alloc_fail: -kvfree (rgb_user); +kfree (rgb_user); rgb_user_alloc_fail:return ret; }
Signature · 1 line
2.26.2
Alex Deucher
AppliedQuoted 7 lines · Denis Efremov
Use
kvfree()instead ofkfree()to free coeff inbuild_regamma()because the memory is allocated withkvzalloc().Fixes e752058b8671 ("drm/amd/display: Optimize gamma calculations")Signed-off-by Denis Efremov <[email protected]>
Applied the series. Thanks!
Alex
Quoted 24 lines
--- drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/modules/color/color_gamma.c +1
-2@@ -843,7 +843,7 @@ static bool build_regamma(struct pwl_float_data_ex *rgb_regamma, pow_buffer_ptr =-1 ;// reset back to no optimize ret = true; release: -kfree (coeff); +kvfree (coeff);return ret; } --2.26.2
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx