* [PATCH 0/2] drm/i915: A few DP stragglers
@ 2016-11-14 17:44 ville.syrjala
2016-11-14 17:44 ` [PATCH 1/2] drm/i915: Kill dp_encoder_is_mst ville.syrjala
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: ville.syrjala @ 2016-11-14 17:44 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
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(-)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] drm/i915: Kill dp_encoder_is_mst 2016-11-14 17:44 [PATCH 0/2] drm/i915: A few DP stragglers ville.syrjala @ 2016-11-14 17:44 ` ville.syrjala 2016-11-14 17:44 ` [PATCH 2/2] drm/i915: Simplify DP port limited color range bit platform checks ville.syrjala 2016-11-14 18:16 ` ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers Patchwork 2 siblings, 0 replies; 6+ messages in thread From: ville.syrjala @ 2016-11-14 17:44 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> 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. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> --- 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(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 072a0b1bc9da..5617fb7b2f90 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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)) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 3ffbd69e4551..b029d1026a28 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -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; /* diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 003afb873b67..75252ecaa613 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -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; -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/i915: Simplify DP port limited color range bit platform checks 2016-11-14 17:44 [PATCH 0/2] drm/i915: A few DP stragglers ville.syrjala 2016-11-14 17:44 ` [PATCH 1/2] drm/i915: Kill dp_encoder_is_mst ville.syrjala @ 2016-11-14 17:44 ` ville.syrjala 2016-11-14 18:16 ` ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers Patchwork 2 siblings, 0 replies; 6+ messages in thread From: ville.syrjala @ 2016-11-14 17:44 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> 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). Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 56431e04c7a9..a1b0181f42c4 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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 = -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers 2016-11-14 17:44 [PATCH 0/2] drm/i915: A few DP stragglers ville.syrjala 2016-11-14 17:44 ` [PATCH 1/2] drm/i915: Kill dp_encoder_is_mst ville.syrjala 2016-11-14 17:44 ` [PATCH 2/2] drm/i915: Simplify DP port limited color range bit platform checks ville.syrjala @ 2016-11-14 18:16 ` Patchwork 2016-11-14 18:22 ` Ville Syrjälä 2 siblings, 1 reply; 6+ messages in thread From: Patchwork @ 2016-11-14 18:16 UTC (permalink / raw) To: ville.syrjala; +Cc: intel-gfx == 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 Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers 2016-11-14 18:16 ` ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers Patchwork @ 2016-11-14 18:22 ` Ville Syrjälä 2016-11-14 18:31 ` Ville Syrjälä 0 siblings, 1 reply; 6+ messages in thread From: Ville Syrjälä @ 2016-11-14 18:22 UTC (permalink / raw) To: intel-gfx On Mon, Nov 14, 2016 at 06:16:49PM -0000, Patchwork wrote: > == 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) [ 468.452200] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 44 https://bugs.freedesktop.org/show_bug.cgi?id=98625 > > 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/ -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers 2016-11-14 18:22 ` Ville Syrjälä @ 2016-11-14 18:31 ` Ville Syrjälä 0 siblings, 0 replies; 6+ messages in thread From: Ville Syrjälä @ 2016-11-14 18:31 UTC (permalink / raw) To: intel-gfx On Mon, Nov 14, 2016 at 08:22:42PM +0200, Ville Syrjälä wrote: > On Mon, Nov 14, 2016 at 06:16:49PM -0000, Patchwork wrote: > > == 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) > > [ 468.452200] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 44 > > https://bugs.freedesktop.org/show_bug.cgi?id=98625 And series pushed to dinq. Thanks for the review. > > > > > 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/ > > -- > Ville Syrjälä > Intel OTC -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-14 18:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-14 17:44 [PATCH 0/2] drm/i915: A few DP stragglers ville.syrjala 2016-11-14 17:44 ` [PATCH 1/2] drm/i915: Kill dp_encoder_is_mst ville.syrjala 2016-11-14 17:44 ` [PATCH 2/2] drm/i915: Simplify DP port limited color range bit platform checks ville.syrjala 2016-11-14 18:16 ` ✗ Fi.CI.BAT: warning for drm/i915: A few DP stragglers Patchwork 2016-11-14 18:22 ` Ville Syrjälä 2016-11-14 18:31 ` Ville Syrjälä
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).