drm/i915: A few DP stragglers
Subsystems (2)
cover drm/i915: A few DP stragglers
From: Ville Syrjälä <[email protected]>
Reposting a few trivial DP related stragglers, with Jim's irc r-b slapped on.
Ville Syrjälä (2):
drm/i915: Kill dp_encoder_is_mst
drm/i915: Simplify DP port limited color range bit platform checks
drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_dp.c | 7 ++----- drivers/gpu/drm/i915/intel_dp_mst.c | 1 - drivers/gpu/drm/i915/intel_drv.h | 1 - 4 files changed, 4 insertions(+), 9 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Kill dp_encoder_is_mst
From: Ville Syrjälä <[email protected]>
dp_encoder_is_mst flag in the crtc state can be replaced by intel_crtc_has_type(..., INTEL_OUTPUT_DP_MST). Let's do that.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_dp_mst.c | 1 - drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -5496,7 +5496,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,if (intel_crtc->config->has_pch_encoder)lpt_pch_enable (crtc); -if (intel_crtc->config->dp_encoder_is_mst) +if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);assert_vblank_disabled (crtc);
@@ -5619,7 +5619,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (!transcoder_is_dsi (cpu_transcoder))intel_disable_pipe (intel_crtc); -if (intel_crtc->config->dp_encoder_is_mst) +if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, false);if (!transcoder_is_dsi (cpu_transcoder))
drivers/gpu/drm/i915/intel_dp_mst.c +0 -1
@@ -43,7 +43,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;int mst_pbn; - pipe_config->dp_encoder_is_mst = true; pipe_config->has_pch_encoder = false; bpp =24 ;/*
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -652,7 +652,6 @@ struct intel_crtc_state {bool double_wide; -bool dp_encoder_is_mst;int pbn;struct intel_crtc_scaler_state scaler_state;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Simplify DP port limited color range bit platform checks
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Instead of checking for everything not supporting the limited color range bit in the DP port register, let's check for the one thing that does have it (g4x).
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +2 -5
@@ -1791,9 +1791,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder, trans_dp &= ~TRANS_DP_ENH_FRAMING ;I915_WRITE (TRANS_DP_CTL (crtc->pipe), trans_dp); }else { -if (!HAS_PCH_SPLIT (dev_priv) && !IS_VALLEYVIEW (dev_priv) && - !IS_CHERRYVIEW (dev_priv) && - pipe_config->limited_color_range) +if (IS_G4X (dev_priv) && pipe_config->limited_color_range) intel_dp->DP |=DP_COLOR_RANGE_16_235 ;if (adjusted_mode->flags &DRM_MODE_FLAG_PHSYNC )
@@ -2515,8 +2513,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.flags |= flags; -if (!HAS_PCH_SPLIT (dev_priv) && !IS_VALLEYVIEW (dev_priv) && - !IS_CHERRYVIEW (dev_priv) && tmp &DP_COLOR_RANGE_16_235 ) +if (IS_G4X (dev_priv) && tmp &DP_COLOR_RANGE_16_235 ) pipe_config->limited_color_range = true; pipe_config->lane_count =
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: A few DP stragglers
URL : https://patchwork.freedesktop.org/series/15299/
State : warning
== Summary ==
Series 15299v1 drm/i915: A few DP stragglers
https://patchwork.freedesktop.org/api/1.0/series/15299/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-b:
pass -> DMESG-WARN (fi-snb-2520m)fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
8670f0f0d91190e0d090ee910c73ed83c37cfef5 drm-intel-nightly: 2016y-11m-14d-16h-10m-52s UTC integration manifest 1c9d66a drm/i915: Simplify DP port limited color range bit platform checks
73f4bd0 drm/i915: Kill dp_encoder_is_mst
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2987/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers
Quoted 6 lines · Patchwork
== Series Details ==
Series: drm/i915: A few DP stragglers
URL : https://patchwork.freedesktop.org/series/15299/
State : warning
Quoted 8 lines
== Summary ==
Series 15299v1 drm/i915: A few DP stragglers
https://patchwork.freedesktop.org/api/1.0/series/15299/revisions/1/mbox/Test
kms_pipe_crc_basic:Subgroup nonblocking-crc-pipe-b: pass -> DMESG-WARN (fi-snb-2520m)
[ 468.452200] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 44
https://bugs.freedesktop.org/show_bug.cgi?id=98625
Quoted 25 lines
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
8670f0f0d91190e0d090ee910c73ed83c37cfef5drm-intel-nightly: 2016y-11m-14d-16h-10m-52s UTC integration manifest 1c9d66a drm/i915: Simplify DP port limited color range bit platform checks
73f4bd0 drm/i915: Killdp_encoder_is_mst== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2987/
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers
Quoted 12 lines · Ville Syrjälä
Quoted 11 lines · Patchwork
== Series Details ==
Series: drm/i915: A few DP stragglers
URL : https://patchwork.freedesktop.org/series/15299/
State : warning== Summary ==
Series 15299v1 drm/i915: A few DP stragglers
https://patchwork.freedesktop.org/api/1.0/series/15299/revisions/1/mbox/
Quoted 7 lines
Quoted 3 lines
Test
kms_pipe_crc_basic:Subgroup nonblocking-crc-pipe-b: pass -> DMESG-WARN (fi-snb-2520m)[ 468.452200] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 44
And series pushed to dinq. Thanks for the review.
Quoted 30 lines
Quoted 26 lines
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
8670f0f0d91190e0d090ee910c73ed83c37cfef5drm-intel-nightly: 2016y-11m-14d-16h-10m-52s UTC integration manifest 1c9d66a drm/i915: Simplify DP port limited color range bit platform checks
73f4bd0 drm/i915: Killdp_encoder_is_mst== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2987/
Signature · 2 lines
Ville Syrjälä Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx