drm/amd/display: Remove erroneous if statement in gamma set
diff mbox

Message ID 1524754003-11154-1-git-send-email-sunpeng.li@amd.com
State New
Headers show

Commit Message

Leo April 26, 2018, 2:46 p.m. UTC
From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>

The lines were removed as part of the original change. They may have
been missed during merge.

This is a fixup to:

    committ 265083076187e619aa9176aeb05ad630013429b4
    Author: Leo (Sunpeng) Li <sunpeng.li@amd.com>
    Date:   Fri Feb 2 10:18:56 2018 -0500

        drm/amd/display: Hookup color management functions
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Harry Wentland April 26, 2018, 6:17 p.m. UTC | #1
On 2018-04-26 10:46 AM, sunpeng.li@amd.com wrote:
> From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
> 
> The lines were removed as part of the original change. They may have
> been missed during merge.
> 
> This is a fixup to:
> 
>     committ 265083076187e619aa9176aeb05ad630013429b4
>     Author: Leo (Sunpeng) Li <sunpeng.li@amd.com>
>     Date:   Fri Feb 2 10:18:56 2018 -0500
> 
>         drm/amd/display: Hookup color management functions

Missing SOB?

With that fixed this is
Reviewed-by: Harry Wentland <harry.wentland@amd.com>

I would like Kevin to take a look before merging first. It looks like this line was unintentionally left when merging to amd-mainline-dkms-4.15 but would like to confirm that's the case.

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
>  1 file changed, 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 b7265f6..0d4a133 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2206,11 +2206,9 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
>  
>  	dc_plane_state->in_transfer_func = input_tf;
>  
> -	/* In case of gamma set, update gamma value */
>  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \
>  	defined(OS_NAME_RHEL_7_3) || \
>  	defined(OS_NAME_RHEL_7_4_5)
> -	if (crtc_state->gamma_lut)
>  	/*
>  	 * Always set input transfer function, since plane state is refreshed
>  	 * every time.
>

Patch
diff mbox

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 b7265f6..0d4a133 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2206,11 +2206,9 @@  static int fill_plane_attributes(struct amdgpu_device *adev,
 
 	dc_plane_state->in_transfer_func = input_tf;
 
-	/* In case of gamma set, update gamma value */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \
 	defined(OS_NAME_RHEL_7_3) || \
 	defined(OS_NAME_RHEL_7_4_5)
-	if (crtc_state->gamma_lut)
 	/*
 	 * Always set input transfer function, since plane state is refreshed
 	 * every time.