[PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[Nicholas Kazlauskas]

[Why]
The old logic for checking which output depth to use relied on using
the current connector state rather than the new proposed state. This
was a problem when performing atomic commits since we weren't verifying
it against the incoming max_requested_bpc.

But switching this to only use the new state and not the current state
breaks filtering modes - it'll always assume that the maximum bpc
supported by the display is in use, which will cause certain modes
like 1440p@144Hz to be filtered even when using 8bpc.

[How]
Still use the connector->state if we aren't passed an explicit state.
This will respect the max_bpc the user currently has when filtering
modes.

Also remember to reset the default max_requested_bpc to 8 whenever
connector reset is called to retain old behavior when using the new
property.

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
 1 file changed, 4 insertions(+)

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 a698c8f272ed..f627c17a1039 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3046,6 +3046,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector,
 {
 	uint32_t bpc = connector->display_info.bpc;
 
+	if (!state)
+		state = connector->state;
+
 	if (state) {
 		bpc = state->max_bpc;
 		/* Round down to the nearest even number. */
@@ -3820,6 +3823,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
 		state->underscan_enable = false;
 		state->underscan_hborder = 0;
 		state->underscan_vborder = 0;
+		state->base.max_requested_bpc = 8;
 
 		__drm_atomic_helper_connector_reset(connector, &state->base);
 	}
-- 
2.17.1

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

Re: [PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[Deucher, Alexander]

[-- Attachment #1.1: Type: text/plain, Size: 2929 bytes --]

Maybe add a reference to the bug report?
Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Nicholas Kazlauskas <nicholas.kazlauskas-5C7GfCeVMHo@public.gmane.org>
Sent: Wednesday, June 5, 2019 12:33 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Li, Sun peng (Leo); Wentland, Harry; Kazlauskas, Nicholas
Subject: [PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[Why]
The old logic for checking which output depth to use relied on using
the current connector state rather than the new proposed state. This
was a problem when performing atomic commits since we weren't verifying
it against the incoming max_requested_bpc.

But switching this to only use the new state and not the current state
breaks filtering modes - it'll always assume that the maximum bpc
supported by the display is in use, which will cause certain modes
like 1440p@144Hz to be filtered even when using 8bpc.

[How]
Still use the connector->state if we aren't passed an explicit state.
This will respect the max_bpc the user currently has when filtering
modes.

Also remember to reset the default max_requested_bpc to 8 whenever
connector reset is called to retain old behavior when using the new
property.

Cc: Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>
Cc: Leo Li <sunpeng.li-5C7GfCeVMHo@public.gmane.org>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
 1 file changed, 4 insertions(+)

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 a698c8f272ed..f627c17a1039 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3046,6 +3046,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector,
 {
         uint32_t bpc = connector->display_info.bpc;

+       if (!state)
+               state = connector->state;
+
         if (state) {
                 bpc = state->max_bpc;
                 /* Round down to the nearest even number. */
@@ -3820,6 +3823,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
                 state->underscan_enable = false;
                 state->underscan_hborder = 0;
                 state->underscan_vborder = 0;
+               state->base.max_requested_bpc = 8;

                 __drm_atomic_helper_connector_reset(connector, &state->base);
         }
--
2.17.1

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

[-- Attachment #1.2: Type: text/html, Size: 4959 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

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

Re: [PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[Kazlauskas, Nicholas]

On 6/5/19 1:30 PM, Deucher, Alexander wrote:
> Maybe add a reference to the bug report?
> Acked-by: Alex Deucher <alexander.deucher@amd.com>

Oh right, I can add the bugzilla when this gets reviewed and I push. Thanks!

Nicholas Kazlauskas

> ------------------------------------------------------------------------
> *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of 
> Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> *Sent:* Wednesday, June 5, 2019 12:33 PM
> *To:* amd-gfx@lists.freedesktop.org
> *Cc:* Li, Sun peng (Leo); Wentland, Harry; Kazlauskas, Nicholas
> *Subject:* [PATCH] drm/amd/display: Use current connector state if NULL 
> when checking bpc
> [Why]
> The old logic for checking which output depth to use relied on using
> the current connector state rather than the new proposed state. This
> was a problem when performing atomic commits since we weren't verifying
> it against the incoming max_requested_bpc.
> 
> But switching this to only use the new state and not the current state
> breaks filtering modes - it'll always assume that the maximum bpc
> supported by the display is in use, which will cause certain modes
> like 1440p@144Hz to be filtered even when using 8bpc.
> 
> [How]
> Still use the connector->state if we aren't passed an explicit state.
> This will respect the max_bpc the user currently has when filtering
> modes.
> 
> Also remember to reset the default max_requested_bpc to 8 whenever
> connector reset is called to retain old behavior when using the new
> property.
> 
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Leo Li <sunpeng.li@amd.com>
> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> ---
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> 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 a698c8f272ed..f627c17a1039 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3046,6 +3046,9 @@ convert_color_depth_from_display_info(const struct 
> drm_connector *connector,
>   {
>           uint32_t bpc = connector->display_info.bpc;
> 
> +       if (!state)
> +               state = connector->state;
> +
>           if (state) {
>                   bpc = state->max_bpc;
>                   /* Round down to the nearest even number. */
> @@ -3820,6 +3823,7 @@ void amdgpu_dm_connector_funcs_reset(struct 
> drm_connector *connector)
>                   state->underscan_enable = false;
>                   state->underscan_hborder = 0;
>                   state->underscan_vborder = 0;
> +               state->base.max_requested_bpc = 8;
> 
>                   __drm_atomic_helper_connector_reset(connector, 
> &state->base);
>           }
> -- 
> 2.17.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

Re: [PATCH] drm/amd/display: Use current connector state if NULL when checking bpc

[Harry Wentland]

On 2019-06-05 12:33 p.m., Nicholas Kazlauskas wrote:
> [Why]
> The old logic for checking which output depth to use relied on using
> the current connector state rather than the new proposed state. This
> was a problem when performing atomic commits since we weren't verifying
> it against the incoming max_requested_bpc.
> 
> But switching this to only use the new state and not the current state
> breaks filtering modes - it'll always assume that the maximum bpc
> supported by the display is in use, which will cause certain modes
> like 1440p@144Hz to be filtered even when using 8bpc.
> 
> [How]
> Still use the connector->state if we aren't passed an explicit state.
> This will respect the max_bpc the user currently has when filtering
> modes.
> 
> Also remember to reset the default max_requested_bpc to 8 whenever
> connector reset is called to retain old behavior when using the new
> property.
> 
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Leo Li <sunpeng.li@amd.com>
> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> 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 a698c8f272ed..f627c17a1039 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3046,6 +3046,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector,
>  {
>  	uint32_t bpc = connector->display_info.bpc;
>  
> +	if (!state)
> +		state = connector->state;
> +
>  	if (state) {
>  		bpc = state->max_bpc;
>  		/* Round down to the nearest even number. */
> @@ -3820,6 +3823,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
>  		state->underscan_enable = false;
>  		state->underscan_hborder = 0;
>  		state->underscan_vborder = 0;
> +		state->base.max_requested_bpc = 8;
>  
>  		__drm_atomic_helper_connector_reset(connector, &state->base);
>  	}
> 
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx