drm/i915/dp: fall back to 18 bpp when sink capability is unknown
Subsystems (2)
PATCH 1/1 drm/i915/dp: fall back to 18 bpp when sink capability is unknown
Per DP spec, the source device should fall back to 18 bpp, VESA range RGB when the sink capability is unknown. Fix the color depth clamping. 18 bpp color depth should ensure full color range in automatic mode.
The clamping has been HDMI specific since its introduction in
commit 996a2239f93b03c5972923f04b097f65565c5bed
Author: Daniel Vetter <[email protected]> Date: Fri Apr 19 11:24:34 2013 +0200
drm/i915: Disable high-bpc on pre-1.4 EDID screens
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=105331
--- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +15 -5
@@ -12171,11 +12171,21 @@ connected_sink_compute_bpp(struct intel_connector *connector, 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 ; +/* Clamp bpp to default limit on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 ) { +int type = connector->base.connector_type; +int clamp_bpp =24 ; + +/* Fall back to 18 bpp when DP sink capability is unknown. */ +if (type == DRM_MODE_CONNECTOR_DisplayPort || + type == DRM_MODE_CONNECTOR_eDP) + clamp_bpp =18 ; + +if (bpp > clamp_bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of %d\n" , + bpp, clamp_bpp); + pipe_config->pipe_bpp = clamp_bpp; + } } }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Jani Nikula
Per DP spec, the source device should fall back to 18 bpp, VESA range RGB when the sink capability is unknown. Fix the color depth clamping. 18 bpp color depth should ensure full color range in automatic mode.
The clamping has been HDMI specific since its introduction in
commit
996a2239f93b03c5972923f04b097f65565c5bedAuthor: Daniel Vetter <[email protected]> Date: Fri Apr 19 11:24:34 2013 +0200
Quoted 6 lines
drm/i915: Disable high-bpc on pre-1.4 EDID screens
Reported-by Dihan Wickremasuriya <[email protected]>Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=105331
Signed-off-by Jani Nikula <[email protected]>
Makes sense to me as far as the spec is concerned.
Quoted 37 lines
--- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_display.c +15
-5@@ -12171,11 +12171,21 @@ connected_sink_compute_bpp(struct intel_connector *connector, 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 ; +/* Clamp bpp to default limit on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 ) { +int type = connector->base.connector_type; +int clamp_bpp =24 ; + +/* Fall back to 18 bpp when DP sink capability is unknown. */ +if (type == DRM_MODE_CONNECTOR_DisplayPort || + type == DRM_MODE_CONNECTOR_eDP) + clamp_bpp =18 ; + +if (bpp > clamp_bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of %d\n" , + bpp, clamp_bpp); + pipe_config->pipe_bpp = clamp_bpp; + } } }Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Ville Syrjälä
Quoted 13 lines · Jani Nikula
Per DP spec, the source device should fall back to 18 bpp, VESA range RGB when the sink capability is unknown. Fix the color depth clamping. 18 bpp color depth should ensure full color range in automatic mode.
The clamping has been HDMI specific since its introduction in
commit
996a2239f93b03c5972923f04b097f65565c5bedAuthor: Daniel Vetter <[email protected]> Date: Fri Apr 19 11:24:34 2013 +0200drm/i915: Disable high-bpc on pre-1.4 EDID screens
Quoted 7 lines
Quoted 4 lines
Reported-by Dihan Wickremasuriya <[email protected]>Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=105331
Signed-off-by Jani Nikula <[email protected]>Makes sense to me as far as the spec is concerned.
Reviewed-by Ville Syrjälä <[email protected]>
Also got Tested-by in the bug. Pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
Quoted 38 lines
Quoted 38 lines
--- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_display.c +15
-5@@ -12171,11 +12171,21 @@ connected_sink_compute_bpp(struct intel_connector *connector, 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 ; +/* Clamp bpp to default limit on screens without EDID 1.4 */ +if (connector->base.display_info.bpc ==0 ) { +int type = connector->base.connector_type; +int clamp_bpp =24 ; + +/* Fall back to 18 bpp when DP sink capability is unknown. */ +if (type == DRM_MODE_CONNECTOR_DisplayPort || + type == DRM_MODE_CONNECTOR_eDP) + clamp_bpp =18 ; + +if (bpp > clamp_bpp) { +DRM_DEBUG_KMS ("clamping display bpp (was %d) to default limit of %d\n" , + bpp, clamp_bpp); + pipe_config->pipe_bpp = clamp_bpp; + } } }Signature · 1 line
2.1.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ failure: Fi.CI.BAT
In reply to Jani Nikula== Summary ==
== Summary ==
Built on 4d09810b01441f9124c072a866f608b748f92f6c drm-intel-nightly: 2016y-01m-13d-12h-32m-08s UTC integration manifest
Test gem_ctx_basic:
pass -> FAIL (hsw-gt2)
Test gem_storedw_loop:
Subgroup basic-render:
dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-c:
pass -> DMESG-WARN (bdw-ultra)bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:138 pass:131 dwarn:1 dfail:0 fail:0 skip:6 bsw-nuc-2 total:141 pass:115 dwarn:2 dfail:0 fail:0 skip:24 hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:141 pass:136 dwarn:0 dfail:0 fail:1 skip:4 hsw-xps12 total:138 pass:133 dwarn:1 dfail:0 fail:0 skip:4 ilk-hp8440p total:141 pass:100 dwarn:4 dfail:0 fail:0 skip:37 ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6 skl-i5k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8 skl-i7k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14 snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13
Results at /archive/results/CI_IGT_test/Patchwork_1170/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ failure: Fi.CI.BAT
Quoted 6 lines · Patchwork
== Summary ==
Built on
4d09810b01441f9124c072a866f608b748f92f6cdrm-intel-nightly: 2016y-01m-13d-12h-32m-08s UTC integration manifestTest
gem_ctx_basic:pass -> FAIL (hsw-gt2)
This seems to be a complete fluke. I looked at detailed results and there's simply no output. Long-term history doesn't show a failure either.
I think we can shrug this one off (for now at least).
Quoted 6 lines
Test
gem_storedw_loop:Subgroup basic-render: dmesg-warn -> PASS (skl-i7k-2) UNSTABLE Test kms_pipe_crc_basic: Subgroup read-crc-pipe-c: pass -> DMESG-WARN (bdw-ultra)
https://bugs.freedesktop.org/show_bug.cgi?id=93699
So looks good, I'll apply the patch.
-Daniel
Quoted 20 lines
bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:138 pass:131 dwarn:1 dfail:0 fail:0 skip:6 bsw-nuc-2 total:141 pass:115 dwarn:2 dfail:0 fail:0 skip:24 hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:141 pass:136 dwarn:0 dfail:0 fail:1 skip:4 hsw-xps12 total:138 pass:133 dwarn:1 dfail:0 fail:0 skip:4 ilk-hp8440p total:141 pass:100 dwarn:4 dfail:0 fail:0 skip:37 ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6 skl-i5k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8 skl-i7k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8 snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14 snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13Results at /archive/results/CI_IGT_test/Patchwork_1170/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ failure: Fi.CI.BAT
Quoted 20 lines · Daniel Vetter
Quoted 6 lines · Patchwork
== Summary ==
Built on
4d09810b01441f9124c072a866f608b748f92f6cdrm-intel-nightly: 2016y-01m-13d-12h-32m-08s UTC integration manifestTest
gem_ctx_basic:pass -> FAIL (hsw-gt2)This seems to be a complete fluke. I looked at detailed results and there's simply no output. Long-term history doesn't show a failure either.
I think we can shrug this one off (for now at least).
Quoted 6 lines
Test
gem_storedw_loop:Subgroup basic-render: dmesg-warn -> PASS (skl-i7k-2) UNSTABLE Test kms_pipe_crc_basic: Subgroup read-crc-pipe-c: pass -> DMESG-WARN (bdw-ultra)
Quoted 3 lines
https://bugs.freedesktop.org/show_bug.cgi?id=93699
So looks good, I'll apply the patch.
It still does a blocking context-close when all it need do is keep the last-context pinned until replaced.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx