drm/i915: fixed EDID/sink-based bpp clamping
Subsystems (2)
PATCH 1/2 drm/i915: fixed EDID/sink-based bpp clamping
Since this is run in the compute config stage we need to check the new_ pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection in
commit 4e53c2e010e531b4a014692199e978482d471c7e
Author: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100
drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from drm_ to intel_ types.
Also add a bit of debug output to help reconstructing what's going on.
--- drivers/gpu/drm/i915/intel_display.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_display.c +17 -11
@@ -7568,12 +7568,12 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) }static int -pipe_config_set_bpp (struct drm_crtc *crtc, +pipe_config_set_bpp (struct intel_crtc *crtc,struct drm_framebuffer *fb,struct intel_crtc_config *pipe_config) { -struct drm_device *dev = crtc->dev; -struct drm_connector *connector; +struct drm_device *dev = crtc->base.dev; +struct intel_connector *connector;int bpp;switch (fb->pixel_format) {
@@ -7616,20 +7616,25 @@ pipe_config_set_bpp(struct drm_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, - head) { -if (connector->encoder && connector->encoder->crtc != crtc) + base.head) { +if (!connector->new_encoder || + connector->new_encoder->new_crtc != crtc)continue ; +DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] checking for sink bpp constrains\n" , + connector->base.base.id, +drm_get_connector_name (&connector->base)); +/* Don't use an invalid EDID bpc value */ -if (connector->display_info.bpc && - connector->display_info.bpc *3 < bpp) { +if (connector->base.display_info.bpc && + connector->base.display_info.bpc *3 < bpp) {DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , - bpp, connector->display_info.bpc*3 ); - pipe_config->pipe_bpp = connector->display_info.bpc*3 ; + bpp, connector->base.display_info.bpc*3 ); + pipe_config->pipe_bpp = connector->base.display_info.bpc*3 ; }/* Clamp bpp to 8 on screens without EDID 1.4 */ -if (connector->display_info.bpc ==0 && bpp >24 ) { +if (connector->base.display_info.bpc ==0 && bpp >24 ) {DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , bpp); pipe_config->pipe_bpp =24 ;
@@ -7714,7 +7719,8 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, pipe_config->cpu_transcoder =to_intel_crtc (crtc)->pipe; pipe_config->shared_dpll =DPLL_ID_PRIVATE ; - plane_bpp =pipe_config_set_bpp (crtc, fb, pipe_config); + plane_bpp =pipe_config_set_bpp (to_intel_crtc (crtc), + fb, pipe_config);if (plane_bpp <0 ) goto fail;
Signature · 1 line
1.7.11.7
PATCH 2/2 drm/i915: enable 30bpp for DP outputs
We always limited the link bw calculations to 24bpp. Tested with my shiny new high-bpc screen, seems to work as advertised.
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -704,7 +704,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,/* Walk through all bpp values. Luckily they're all nicely spaced with 2 * bpc in between. */ - bpp =min_t (int,8 *3 , pipe_config->pipe_bpp); + bpp = pipe_config->pipe_bpp;if (is_edp (intel_dp) && dev_priv->vbt.edp_bpp) bpp =min_t (int, bpp, dev_priv->vbt.edp_bpp);
Signature · 1 line
1.7.11.7
Re: [PATCH 2/2] drm/i915: enable 30bpp for DP outputs
Quoted 4 lines · Daniel Vetter
We always limited the link bw calculations to 24bpp. Tested with my shiny new high-bpc screen, seems to work as advertised.
Signed-off-by Daniel Vetter <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65280
Quoted 20 lines
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -704,7 +704,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,/* Walk through all bpp values. Luckily they're all nicely spaced with 2 * bpc in between. */ - bpp =min_t (int,8 *3 , pipe_config->pipe_bpp); + bpp = pipe_config->pipe_bpp;if (is_edp (intel_dp) && dev_priv->vbt.edp_bpp) bpp =min_t (int, bpp, dev_priv->vbt.edp_bpp);Signature · 1 line
1.7.11.7
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Chris Wilson
Reviewed-byRe: [PATCH 2/2] drm/i915: enable 30bpp for DP outputs
Quoted 8 lines · Daniel Vetter
Quoted 4 lines · Daniel Vetter
We always limited the link bw calculations to 24bpp. Tested with my shiny new high-bpc screen, seems to work as advertised.
Signed-off-by Daniel Vetter <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65280
Tested-by shui yangwei <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Daniel Vetter
AppliedRe: [PATCH 2/2] drm/i915: enable 30bpp for DP outputs
Quoted 10 lines · Chris Wilson
Quoted 8 lines · Daniel Vetter
Quoted 4 lines · Daniel Vetter
We always limited the link bw calculations to 24bpp. Tested with my shiny new high-bpc screen, seems to work as advertised.
Signed-off-by Daniel Vetter <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65280
Tested-by shui yangwei <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Queued for -next, thanks for the review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 9 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection incommit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100
Quoted 6 lines
drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.Also add a bit of debug output to help reconstructing what's going on.
Baffling. It is really hard to tell what is going on, so perhaps it is worth investing in some more descriptive names. How about:
struct drm_display_info *desired = &connector->base.display_info ?
Or some other name? And an indication in the function name at which stage this is meant to run?
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 14 lines · Chris Wilson
Quoted 13 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection incommit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.
Quoted 8 lines
Quoted 2 lines
Also add a bit of debug output to help reconstructing what's going on.
Baffling. It is really hard to tell what is going on, so perhaps it is worth investing in some more descriptive names. How about:
structdrm_display_info*desired =&connector->base.display_info?
Or some other name? And an indication in the function name at which stage this is meant to run?
I guess renaming the function to pipe_config_compute_bpp would help (since it doesn't really set anything). And maybe extracting the sink based bpp limiting into it's own function since it's a bit magic.
I'll see whether I can polish this turd some more. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 1/1 drm/i915: fix EDID/sink-based bpp clamping
In reply to Chris WilsonSince this is run in the compute config stage we need to check the new_ pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection in
commit 4e53c2e010e531b4a014692199e978482d471c7e
Author: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100
drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from drm_ to intel_ types.
Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.
--- drivers/gpu/drm/i915/intel_display.c | 61 +++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_display.c +39 -22
@@ -7568,12 +7568,36 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) }static int -pipe_config_set_bpp (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct intel_crtc_config *pipe_config) +connected_sink_compute_bpp (struct intel_connector * connector, +struct intel_crtc_config *pipe_config) { -struct drm_device *dev = crtc->dev; -struct drm_connector *connector; +DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] checking for sink bpp constrains\n" , + connector->base.base.id, +drm_get_connector_name (&connector->base)); + +/* Don't use an invalid EDID bpc value */ +if (connector->base.display_info.bpc && + connector->base.display_info.bpc *3 < bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , + bpp, connector->base.display_info.bpc*3 ); + pipe_config->pipe_bpp = connector->base.display_info.bpc*3 ; + } + +/* Clamp bpp to 8 on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 && bpp >24 ) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , + bpp); + pipe_config->pipe_bpp =24 ; + } +} + +static int +compute_baseline_pipe_bpp (struct intel_crtc *crtc, +struct drm_framebuffer *fb, +struct intel_crtc_config *pipe_config) +{ +struct drm_device *dev = crtc->base.dev; +struct intel_connector *connector;int bpp;switch (fb->pixel_format) {
@@ -7616,24 +7640,12 @@ pipe_config_set_bpp(struct drm_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, - head) { -if (connector->encoder && connector->encoder->crtc != crtc) + base.head) { +if (!connector->new_encoder || + connector->new_encoder->new_crtc != crtc)continue ; -/* Don't use an invalid EDID bpc value */ -if (connector->display_info.bpc && - connector->display_info.bpc *3 < bpp) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , - bpp, connector->display_info.bpc*3 ); - pipe_config->pipe_bpp = connector->display_info.bpc*3 ; - } - -/* Clamp bpp to 8 on screens without EDID 1.4 */ -if (connector->display_info.bpc ==0 && bpp >24 ) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , - bpp); - pipe_config->pipe_bpp =24 ; - } +connected_sink_compute_bpp (pipe_config, connector); }return bpp;
@@ -7714,7 +7726,12 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, pipe_config->cpu_transcoder =to_intel_crtc (crtc)->pipe; pipe_config->shared_dpll =DPLL_ID_PRIVATE ; - plane_bpp =pipe_config_set_bpp (crtc, fb, pipe_config); +/* Compute a starting value for pipe_config->pipe_bpp taking the source +* plane pixel format and any sink constraints into account. Returns the +* source plane bpp so that dithering can be selected on mismatches +* after encoders and crtc also have had their say. */ + plane_bpp =compute_baseline_pipe_bpp (to_intel_crtc (crtc), + fb, pipe_config);if (plane_bpp <0 ) goto fail;
Signature · 1 line
1.7.11.7
PATCH 1/1 drm/i915: fix EDID/sink-based bpp clamping
In reply to Chris WilsonSince this is run in the compute config stage we need to check the new_ pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection in
commit 4e53c2e010e531b4a014692199e978482d471c7e
Author: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100
drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from drm_ to intel_ types.
Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.
v3: Actually make it compile.
--- drivers/gpu/drm/i915/intel_display.c | 63 +++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_display.c +41 -22
@@ -7567,13 +7567,39 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) } } +static void +connected_sink_compute_bpp (struct intel_connector * connector, +struct intel_crtc_config *pipe_config) +{ +int bpp = pipe_config->pipe_bpp; + +DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] checking for sink bpp constrains\n" , + connector->base.base.id, +drm_get_connector_name (&connector->base)); + +/* Don't use an invalid EDID bpc value */ +if (connector->base.display_info.bpc && + connector->base.display_info.bpc *3 < bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , + bpp, connector->base.display_info.bpc*3 ); + pipe_config->pipe_bpp = connector->base.display_info.bpc*3 ; + } + +/* Clamp bpp to 8 on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 && bpp >24 ) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , + bpp); + pipe_config->pipe_bpp =24 ; + } +} +static int -pipe_config_set_bpp (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct intel_crtc_config *pipe_config) +compute_baseline_pipe_bpp (struct intel_crtc *crtc, +struct drm_framebuffer *fb, +struct intel_crtc_config *pipe_config) { -struct drm_device *dev = crtc->dev; -struct drm_connector *connector; +struct drm_device *dev = crtc->base.dev; +struct intel_connector *connector;int bpp;switch (fb->pixel_format) {
@@ -7616,24 +7642,12 @@ pipe_config_set_bpp(struct drm_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, - head) { -if (connector->encoder && connector->encoder->crtc != crtc) + base.head) { +if (!connector->new_encoder || + connector->new_encoder->new_crtc != crtc)continue ; -/* Don't use an invalid EDID bpc value */ -if (connector->display_info.bpc && - connector->display_info.bpc *3 < bpp) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , - bpp, connector->display_info.bpc*3 ); - pipe_config->pipe_bpp = connector->display_info.bpc*3 ; - } - -/* Clamp bpp to 8 on screens without EDID 1.4 */ -if (connector->display_info.bpc ==0 && bpp >24 ) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , - bpp); - pipe_config->pipe_bpp =24 ; - } +connected_sink_compute_bpp (connector, pipe_config); }return bpp;
@@ -7714,7 +7728,12 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, pipe_config->cpu_transcoder =to_intel_crtc (crtc)->pipe; pipe_config->shared_dpll =DPLL_ID_PRIVATE ; - plane_bpp =pipe_config_set_bpp (crtc, fb, pipe_config); +/* Compute a starting value for pipe_config->pipe_bpp taking the source +* plane pixel format and any sink constraints into account. Returns the +* source plane bpp so that dithering can be selected on mismatches +* after encoders and crtc also have had their say. */ + plane_bpp =compute_baseline_pipe_bpp (to_intel_crtc (crtc), + fb, pipe_config);if (plane_bpp <0 ) goto fail;
Signature · 1 line
1.7.11.7
Re: [PATCH] drm/i915: fix EDID/sink-based bpp clamping
Quoted 22 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection incommit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.
Quoted 4 lines
v3: Actually make it compile.
Cc Chris Wilson <[email protected]>Signed-off-by Daniel Vetter <[email protected]>
It reads easier than the first (just now hides the bug fix ;-). I'm still worried that the confusion between connector->display_info and connector->base.display_info is far too easy to mistake. Can you describe succinctly the difference between the two, and ideally capture that in a new name for the intel_connector->display_info? -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH] drm/i915: fix EDID/sink-based bpp clamping
Quoted 25 lines · Chris Wilson
Quoted 24 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, not the current modeset layout. Also there was a little logic bug in properly skipping connectors. This has been broken when moving the pipe bpp selection incommit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.v3: Actually make it compile.
Quoted 8 lines
Quoted 2 lines
Cc Chris Wilson <[email protected]>Signed-off-by Daniel Vetter <[email protected]>It reads easier than the first (just now hides the bug fix ;-). I'm still worried that the confusion between
connector->display_infoandconnector->base.display_infois far too easy to mistake. Can you describe succinctly the difference between the two, and ideally capture that in a new name for theintel_connector->display_info?
The newly-added base is just due to the drm_connector->intel_connector switch. So I seem to have indeed burried the actual bugfix completely :(
I'll split the refactoring into a prep patch and resend. -Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 1/2 drm/i915: refactor sink bpp clamping
In reply to Chris WilsonAs a prep work to fix it up:
- Use intel_connector instead of drm_connector to avoid too much upcasting in the bugfix patch.
- Extract the connector bpp clamping from the loop-over-connectors logic.
- Bikeshed function names (to make it clearer that acompute_baseline_pipe_bpp runs in the compute stage of the modeset sequence) and add a comment to make it clearer what it does.
No functional change in this patch.
--- drivers/gpu/drm/i915/intel_display.c | 63 +++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_display.c +41 -22
@@ -7567,13 +7567,39 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) } } +static void +connected_sink_compute_bpp (struct intel_connector * connector, +struct intel_crtc_config *pipe_config) +{ +int bpp = pipe_config->pipe_bpp; + +DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] checking for sink bpp constrains\n" , + connector->base.base.id, +drm_get_connector_name (&connector->base)); + +/* Don't use an invalid EDID bpc value */ +if (connector->base.display_info.bpc && + connector->base.display_info.bpc *3 < bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , + bpp, connector->base.display_info.bpc*3 ); + pipe_config->pipe_bpp = connector->base.display_info.bpc*3 ; + } + +/* Clamp bpp to 8 on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 && bpp >24 ) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , + bpp); + pipe_config->pipe_bpp =24 ; + } +} +static int -pipe_config_set_bpp (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct intel_crtc_config *pipe_config) +compute_baseline_pipe_bpp (struct intel_crtc *crtc, +struct drm_framebuffer *fb, +struct intel_crtc_config *pipe_config) { -struct drm_device *dev = crtc->dev; -struct drm_connector *connector; +struct drm_device *dev = crtc->base.dev; +struct intel_connector *connector;int bpp;switch (fb->pixel_format) {
@@ -7616,24 +7642,12 @@ pipe_config_set_bpp(struct drm_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, - head) { -if (connector->encoder && connector->encoder->crtc != crtc) + base.head) { +if (connector->base.encoder && + connector->base.encoder->crtc != crtc)continue ; -/* Don't use an invalid EDID bpc value */ -if (connector->display_info.bpc && - connector->display_info.bpc *3 < bpp) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , - bpp, connector->display_info.bpc*3 ); - pipe_config->pipe_bpp = connector->display_info.bpc*3 ; - } - -/* Clamp bpp to 8 on screens without EDID 1.4 */ -if (connector->display_info.bpc ==0 && bpp >24 ) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , - bpp); - pipe_config->pipe_bpp =24 ; - } +connected_sink_compute_bpp (connector, pipe_config); }return bpp;
@@ -7714,7 +7728,12 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, pipe_config->cpu_transcoder =to_intel_crtc (crtc)->pipe; pipe_config->shared_dpll =DPLL_ID_PRIVATE ; - plane_bpp =pipe_config_set_bpp (crtc, fb, pipe_config); +/* Compute a starting value for pipe_config->pipe_bpp taking the source +* plane pixel format and any sink constraints into account. Returns the +* source plane bpp so that dithering can be selected on mismatches +* after encoders and crtc also have had their say. */ + plane_bpp =compute_baseline_pipe_bpp (to_intel_crtc (crtc), + fb, pipe_config);if (plane_bpp <0 ) goto fail;
Signature · 1 line
1.7.11.7
PATCH 2/2 drm/i915: fix EDID/sink-based bpp clamping
Since this is run in the compute config stage we need to check the new_ pointers, i.e the stage output routing, not the current modeset layout. Also there was a little logic bug in properly skipping
connectors: The old code did not skip any unused connectors and so clamped to whatever was left in there (usually 0 if that connector hasn't seen a EDID 1.4 screen ever since boot-up).
This has been broken when moving the pipe bpp selection in
commit 4e53c2e010e531b4a014692199e978482d471c7e
Author: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100
drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from drm_ to intel_ types.
Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.
v3: Actually make it compile.
v4: Split out all the prep refactoring to make the bugfix stick out really badly. Also elaborate a bit in the commit message about the nature of the bugfix.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -7643,8 +7643,8 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, base.head) { -if (connector->base.encoder && - connector->base.encoder->crtc != crtc) +if (!connector->new_encoder || + connector->new_encoder->new_crtc != crtc)continue ;connected_sink_compute_bpp (connector, pipe_config);
Signature · 1 line
1.7.11.7
Re: [PATCH 2/2] drm/i915: fix EDID/sink-based bpp clamping
Quoted 26 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, i.e the stage output routing, not the current modeset layout. Also there was a little logic bug in properly skipping
connectors: The old code did not skip any unused connectors and so clamped to whatever was left in there (usually 0 if that connector hasn't seen a EDID 1.4 screen ever since boot-up).This has been broken when moving the pipe bpp selection in
commit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.
Quoted 8 lines
v3: Actually make it compile.
v4: Split out all the prep refactoring to make the bugfix stick out really badly. Also elaborate a bit in the commit message about the nature of the bugfix.
Cc Chris Wilson <[email protected]>Signed-off-by Daniel Vetter <[email protected]>
Yes, that does show how badly I misread the first patch! For both, Reviewed-by: Chris Wilson <[email protected]> -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 2/2] drm/i915: fix EDID/sink-based bpp clamping
Quoted 33 lines · Chris Wilson
Quoted 32 lines · Daniel Vetter
Since this is run in the compute config stage we need to check the
new_pointers, i.e the stage output routing, not the current modeset layout. Also there was a little logic bug in properly skipping
connectors: The old code did not skip any unused connectors and so clamped to whatever was left in there (usually 0 if that connector hasn't seen a EDID 1.4 screen ever since boot-up).This has been broken when moving the pipe bpp selection in
commit
4e53c2e010e531b4a014692199e978482d471c7eAuthor: Daniel Vetter <[email protected]> Date: Wed Mar 27 00:44:58 2013 +0100drm/i915: precompute pipe bpp before touching the hw
To avoid too much casting switch from
drm_tointel_types.Also add a bit of debug output to help reconstructing what's going on.
v2: Try to clarify this a bit:
- s/pipe_config_set_bpp/compute_baseline_pipe_bpp/ to make it clearer at which stage this function is run. Also add a comment about what it does.
- Extract the sink clamping into it's own function.v3: Actually make it compile.
v4: Split out all the prep refactoring to make the bugfix stick out really badly. Also elaborate a bit in the commit message about the nature of the bugfix.
Quoted 5 lines
Quoted 2 lines
Cc Chris Wilson <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Yes, that does show how badly I misread the first patch! For both, Reviewed-by: Chris Wilson <[email protected]>
Both merged, thanks for the review. I'll ping QA to test the 30bpp patch, too.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2] drm/i915: refactor sink bpp clamping
In reply to Daniel VetterQuoted 10 lines · Daniel Vetter
As a prep work to fix it up:
- Useintel_connectorinstead ofdrm_connectorto avoid too much upcasting in the bugfix patch.
- Extract the connector bpp clamping from the loop-over-connectors logic.
- Bikeshed function names (to make it clearer thatacompute_baseline_pipe_bppruns in the compute stage of the modeset sequence) and add a comment to make it clearer what it does.No functional change in this patch.
Meh, I've missed that I've added the debug output here. I'll bikeshed the commit message when applying.
Quoted 102 lines
Cc Chris Wilson <[email protected]>Signed-off-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 63 +++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-)drivers/gpu/drm/i915/intel_display.c +41
-22@@ -7567,13 +7567,39 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) } } +static void +connected_sink_compute_bpp (struct intel_connector * connector, +struct intel_crtc_config *pipe_config) +{ +int bpp = pipe_config->pipe_bpp; + +DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] checking for sink bpp constrains\n" , + connector->base.base.id, +drm_get_connector_name (&connector->base)); + +/* Don't use an invalid EDID bpc value */ +if (connector->base.display_info.bpc && + connector->base.display_info.bpc *3 < bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , + bpp, connector->base.display_info.bpc*3 ); + pipe_config->pipe_bpp = connector->base.display_info.bpc*3 ; + } + +/* Clamp bpp to 8 on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 && bpp >24 ) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , + bpp); + pipe_config->pipe_bpp =24 ; + } +} +static int -pipe_config_set_bpp (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct intel_crtc_config *pipe_config) +compute_baseline_pipe_bpp (struct intel_crtc *crtc, +struct drm_framebuffer *fb, +struct intel_crtc_config *pipe_config) { -struct drm_device *dev = crtc->dev; -struct drm_connector *connector; +struct drm_device *dev = crtc->base.dev; +struct intel_connector *connector;int bpp;switch (fb->pixel_format) {@@ -7616,24 +7642,12 @@ pipe_config_set_bpp(struct drm_crtc *crtc,/* Clamp display bpp to EDID value */ list_for_each_entry (connector, &dev->mode_config.connector_list, - head) { -if (connector->encoder && connector->encoder->crtc != crtc) + base.head) { +if (connector->base.encoder && + connector->base.encoder->crtc != crtc)continue ; -/* Don't use an invalid EDID bpc value */ -if (connector->display_info.bpc && - connector->display_info.bpc *3 < bpp) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to EDID reported max of %d\n" , - bpp, connector->display_info.bpc*3 ); - pipe_config->pipe_bpp = connector->display_info.bpc*3 ; - } - -/* Clamp bpp to 8 on screens without EDID 1.4 */ -if (connector->display_info.bpc ==0 && bpp >24 ) { -DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of 24\n" , - bpp); - pipe_config->pipe_bpp =24 ; - } +connected_sink_compute_bpp (connector, pipe_config); }return bpp;@@ -7714,7 +7728,12 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, pipe_config->cpu_transcoder =to_intel_crtc (crtc)->pipe; pipe_config->shared_dpll =DPLL_ID_PRIVATE ; - plane_bpp =pipe_config_set_bpp (crtc, fb, pipe_config); +/* Compute a starting value for pipe_config->pipe_bpp taking the source +* plane pixel format and any sink constraints into account. Returns the +* source plane bpp so that dithering can be selected on mismatches +* after encoders and crtc also have had their say. */ + plane_bpp =compute_baseline_pipe_bpp (to_intel_crtc (crtc), + fb, pipe_config);if (plane_bpp <0 ) goto fail;Signature · 1 line
1.7.11.7
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch