[PATCH] drm/amd/display: Remove assignments in if clauses.

[Mark Yacoub]

Fixes Commit a46b6bd5 (drm/amd/display: Verify Gamma & Degamma LUT sizes
in amdgpu_dm_atomic_check)

Tested on Zork: IGT:kms_color

Signed-off-by: Mark Yacoub <markyac...@chromium.org>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c       | 3 ++-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 91e13ae388b7f..c0cc4ca5fdf60 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7792,7 +7792,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                    old_crtc_state->vrr_enabled == new_crtc_state->vrr_enabled)
                        continue;
 
-               if ((ret = amdgpu_dm_verify_lut_sizes(new_crtc_state)))
+               ret = amdgpu_dm_verify_lut_sizes(new_crtc_state);
+               if (ret)
                        goto fail;
 
                if (!new_crtc_state->enable)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index 9543b10e7e0bf..6acc460a3e982 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -342,7 +342,8 @@ int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state 
*crtc)
        bool is_legacy;
        int r;
 
-       if ((r = amdgpu_dm_verify_lut_sizes(&crtc->base)))
+       r = amdgpu_dm_verify_lut_sizes(&crtc->base);
+       if (r)
                return r;
 
        degamma_lut = __extract_blob_lut(crtc->base.degamma_lut, &degamma_size);
-- 
2.32.0.93.g670b81a890-goog

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx