* [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic()
@ 2019-11-05 17:14 ` Ville Syrjala
0 siblings, 0 replies; 14+ messages in thread
From: Ville Syrjala @ 2019-11-05 17:14 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The uapi vs. hw state split introduced a bug in
intel_crtc_disable_noatomic() where it's not frobbing an already
freed temp crtc state instead of adjusting the crtc state we
are really left with. Fix that by making a cleaner separation
beteen the two.
This causes explosions on any machine that boots up with pipes
already running but not hooked up to any encoder (typical
behaviour for gen2-4 VBIOS).
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 876fc25968bf..1f93860fb897 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
struct intel_bw_state *bw_state =
to_intel_bw_state(dev_priv->bw_obj.state);
+ struct intel_crtc_state *crtc_state =
+ to_intel_crtc_state(crtc->state);
enum intel_display_power_domain domain;
struct intel_plane *plane;
u64 domains;
struct drm_atomic_state *state;
- struct intel_crtc_state *crtc_state;
+ struct intel_crtc_state *temp_crtc_state;
int ret;
if (!intel_crtc->active)
@@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
state->acquire_ctx = ctx;
/* Everything's already locked, -EDEADLK can't happen. */
- crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);
+ temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);
ret = drm_atomic_add_affected_connectors(state, crtc);
- WARN_ON(IS_ERR(crtc_state) || ret);
+ WARN_ON(IS_ERR(temp_crtc_state) || ret);
- dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state));
+ dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state));
drm_atomic_state_put(state);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Intel-gfx] [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-05 17:14 ` Ville Syrjala 0 siblings, 0 replies; 14+ messages in thread From: Ville Syrjala @ 2019-11-05 17:14 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> The uapi vs. hw state split introduced a bug in intel_crtc_disable_noatomic() where it's not frobbing an already freed temp crtc state instead of adjusting the crtc state we are really left with. Fix that by making a cleaner separation beteen the two. This causes explosions on any machine that boots up with pipes already running but not hooked up to any encoder (typical behaviour for gen2-4 VBIOS). Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 876fc25968bf..1f93860fb897 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, struct drm_i915_private *dev_priv = to_i915(crtc->dev); struct intel_bw_state *bw_state = to_intel_bw_state(dev_priv->bw_obj.state); + struct intel_crtc_state *crtc_state = + to_intel_crtc_state(crtc->state); enum intel_display_power_domain domain; struct intel_plane *plane; u64 domains; struct drm_atomic_state *state; - struct intel_crtc_state *crtc_state; + struct intel_crtc_state *temp_crtc_state; int ret; if (!intel_crtc->active) @@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, state->acquire_ctx = ctx; /* Everything's already locked, -EDEADLK can't happen. */ - crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); + temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); ret = drm_atomic_add_affected_connectors(state, crtc); - WARN_ON(IS_ERR(crtc_state) || ret); + WARN_ON(IS_ERR(temp_crtc_state) || ret); - dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state)); + dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state)); drm_atomic_state_put(state); -- 2.23.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/2] drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types @ 2019-11-05 17:14 ` Ville Syrjala 0 siblings, 0 replies; 14+ messages in thread From: Ville Syrjala @ 2019-11-05 17:14 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> It's hard to see what is going on when the function mixes drm_ and intel_ types. Switch to intel_ types. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 65 ++++++++++---------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 1f93860fb897..8e75e7028403 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7183,46 +7183,46 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state, i830_enable_pipe(dev_priv, pipe); } -static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, +static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, struct drm_modeset_acquire_ctx *ctx) { struct intel_encoder *encoder; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct drm_i915_private *dev_priv = to_i915(crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct intel_bw_state *bw_state = to_intel_bw_state(dev_priv->bw_obj.state); struct intel_crtc_state *crtc_state = - to_intel_crtc_state(crtc->state); + to_intel_crtc_state(crtc->base.state); enum intel_display_power_domain domain; struct intel_plane *plane; - u64 domains; struct drm_atomic_state *state; struct intel_crtc_state *temp_crtc_state; + enum pipe pipe = crtc->pipe; + u64 domains; int ret; - if (!intel_crtc->active) + if (!crtc_state->hw.active) return; - for_each_intel_plane_on_crtc(&dev_priv->drm, intel_crtc, plane) { + for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, plane) { const struct intel_plane_state *plane_state = to_intel_plane_state(plane->base.state); if (plane_state->uapi.visible) - intel_plane_disable_noatomic(intel_crtc, plane); + intel_plane_disable_noatomic(crtc, plane); } - state = drm_atomic_state_alloc(crtc->dev); + state = drm_atomic_state_alloc(&dev_priv->drm); if (!state) { DRM_DEBUG_KMS("failed to disable [CRTC:%d:%s], out of memory", - crtc->base.id, crtc->name); + crtc->base.base.id, crtc->base.name); return; } state->acquire_ctx = ctx; /* Everything's already locked, -EDEADLK can't happen. */ - temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); - ret = drm_atomic_add_affected_connectors(state, crtc); + temp_crtc_state = intel_atomic_get_crtc_state(state, crtc); + ret = drm_atomic_add_affected_connectors(state, &crtc->base); WARN_ON(IS_ERR(temp_crtc_state) || ret); @@ -7231,35 +7231,36 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, drm_atomic_state_put(state); DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n", - crtc->base.id, crtc->name); - - WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state, NULL) < 0); - crtc->state->active = false; - intel_crtc->active = false; - crtc->enabled = false; - crtc->state->connector_mask = 0; - crtc->state->encoder_mask = 0; + crtc->base.base.id, crtc->base.name); + + crtc->active = false; + crtc->base.enabled = false; + + WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0); + crtc_state->uapi.active = false; + crtc_state->uapi.connector_mask = 0; + crtc_state->uapi.encoder_mask = 0; intel_crtc_free_hw_state(crtc_state); memset(&crtc_state->hw, 0, sizeof(crtc_state->hw)); - for_each_encoder_on_crtc(crtc->dev, crtc, encoder) + for_each_encoder_on_crtc(&dev_priv->drm, &crtc->base, encoder) encoder->base.crtc = NULL; - intel_fbc_disable(intel_crtc); - intel_update_watermarks(intel_crtc); - intel_disable_shared_dpll(to_intel_crtc_state(crtc->state)); + intel_fbc_disable(crtc); + intel_update_watermarks(crtc); + intel_disable_shared_dpll(crtc_state); - domains = intel_crtc->enabled_power_domains; + domains = crtc->enabled_power_domains; for_each_power_domain(domain, domains) intel_display_power_put_unchecked(dev_priv, domain); - intel_crtc->enabled_power_domains = 0; + crtc->enabled_power_domains = 0; - dev_priv->active_pipes &= ~BIT(intel_crtc->pipe); - dev_priv->min_cdclk[intel_crtc->pipe] = 0; - dev_priv->min_voltage_level[intel_crtc->pipe] = 0; + dev_priv->active_pipes &= ~BIT(pipe); + dev_priv->min_cdclk[pipe] = 0; + dev_priv->min_voltage_level[pipe] = 0; - bw_state->data_rate[intel_crtc->pipe] = 0; - bw_state->num_active_planes[intel_crtc->pipe] = 0; + bw_state->data_rate[pipe] = 0; + bw_state->num_active_planes[pipe] = 0; } /* @@ -17240,7 +17241,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, /* Adjust the state of the output pipe according to whether we * have active connectors/encoders. */ if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc)) - intel_crtc_disable_noatomic(&crtc->base, ctx); + intel_crtc_disable_noatomic(crtc, ctx); if (crtc_state->hw.active || HAS_GMCH(dev_priv)) { /* -- 2.23.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types @ 2019-11-05 17:14 ` Ville Syrjala 0 siblings, 0 replies; 14+ messages in thread From: Ville Syrjala @ 2019-11-05 17:14 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> It's hard to see what is going on when the function mixes drm_ and intel_ types. Switch to intel_ types. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 65 ++++++++++---------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 1f93860fb897..8e75e7028403 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7183,46 +7183,46 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state, i830_enable_pipe(dev_priv, pipe); } -static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, +static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, struct drm_modeset_acquire_ctx *ctx) { struct intel_encoder *encoder; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct drm_i915_private *dev_priv = to_i915(crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct intel_bw_state *bw_state = to_intel_bw_state(dev_priv->bw_obj.state); struct intel_crtc_state *crtc_state = - to_intel_crtc_state(crtc->state); + to_intel_crtc_state(crtc->base.state); enum intel_display_power_domain domain; struct intel_plane *plane; - u64 domains; struct drm_atomic_state *state; struct intel_crtc_state *temp_crtc_state; + enum pipe pipe = crtc->pipe; + u64 domains; int ret; - if (!intel_crtc->active) + if (!crtc_state->hw.active) return; - for_each_intel_plane_on_crtc(&dev_priv->drm, intel_crtc, plane) { + for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, plane) { const struct intel_plane_state *plane_state = to_intel_plane_state(plane->base.state); if (plane_state->uapi.visible) - intel_plane_disable_noatomic(intel_crtc, plane); + intel_plane_disable_noatomic(crtc, plane); } - state = drm_atomic_state_alloc(crtc->dev); + state = drm_atomic_state_alloc(&dev_priv->drm); if (!state) { DRM_DEBUG_KMS("failed to disable [CRTC:%d:%s], out of memory", - crtc->base.id, crtc->name); + crtc->base.base.id, crtc->base.name); return; } state->acquire_ctx = ctx; /* Everything's already locked, -EDEADLK can't happen. */ - temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); - ret = drm_atomic_add_affected_connectors(state, crtc); + temp_crtc_state = intel_atomic_get_crtc_state(state, crtc); + ret = drm_atomic_add_affected_connectors(state, &crtc->base); WARN_ON(IS_ERR(temp_crtc_state) || ret); @@ -7231,35 +7231,36 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, drm_atomic_state_put(state); DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n", - crtc->base.id, crtc->name); - - WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state, NULL) < 0); - crtc->state->active = false; - intel_crtc->active = false; - crtc->enabled = false; - crtc->state->connector_mask = 0; - crtc->state->encoder_mask = 0; + crtc->base.base.id, crtc->base.name); + + crtc->active = false; + crtc->base.enabled = false; + + WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0); + crtc_state->uapi.active = false; + crtc_state->uapi.connector_mask = 0; + crtc_state->uapi.encoder_mask = 0; intel_crtc_free_hw_state(crtc_state); memset(&crtc_state->hw, 0, sizeof(crtc_state->hw)); - for_each_encoder_on_crtc(crtc->dev, crtc, encoder) + for_each_encoder_on_crtc(&dev_priv->drm, &crtc->base, encoder) encoder->base.crtc = NULL; - intel_fbc_disable(intel_crtc); - intel_update_watermarks(intel_crtc); - intel_disable_shared_dpll(to_intel_crtc_state(crtc->state)); + intel_fbc_disable(crtc); + intel_update_watermarks(crtc); + intel_disable_shared_dpll(crtc_state); - domains = intel_crtc->enabled_power_domains; + domains = crtc->enabled_power_domains; for_each_power_domain(domain, domains) intel_display_power_put_unchecked(dev_priv, domain); - intel_crtc->enabled_power_domains = 0; + crtc->enabled_power_domains = 0; - dev_priv->active_pipes &= ~BIT(intel_crtc->pipe); - dev_priv->min_cdclk[intel_crtc->pipe] = 0; - dev_priv->min_voltage_level[intel_crtc->pipe] = 0; + dev_priv->active_pipes &= ~BIT(pipe); + dev_priv->min_cdclk[pipe] = 0; + dev_priv->min_voltage_level[pipe] = 0; - bw_state->data_rate[intel_crtc->pipe] = 0; - bw_state->num_active_planes[intel_crtc->pipe] = 0; + bw_state->data_rate[pipe] = 0; + bw_state->num_active_planes[pipe] = 0; } /* @@ -17240,7 +17241,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, /* Adjust the state of the output pipe according to whether we * have active connectors/encoders. */ if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc)) - intel_crtc_disable_noatomic(&crtc->base, ctx); + intel_crtc_disable_noatomic(crtc, ctx); if (crtc_state->hw.active || HAS_GMCH(dev_priv)) { /* -- 2.23.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types @ 2019-12-02 15:24 ` Lucas De Marchi 0 siblings, 0 replies; 14+ messages in thread From: Lucas De Marchi @ 2019-12-02 15:24 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx On Tue, Nov 05, 2019 at 07:14:47PM +0200, Ville Syrjälä wrote: >From: Ville Syrjälä <ville.syrjala@linux.intel.com> > >It's hard to see what is going on when the function mixes drm_ >and intel_ types. Switch to intel_ types. > >Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi >--- > drivers/gpu/drm/i915/display/intel_display.c | 65 ++++++++++---------- > 1 file changed, 33 insertions(+), 32 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c >index 1f93860fb897..8e75e7028403 100644 >--- a/drivers/gpu/drm/i915/display/intel_display.c >+++ b/drivers/gpu/drm/i915/display/intel_display.c >@@ -7183,46 +7183,46 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state, > i830_enable_pipe(dev_priv, pipe); > } > >-static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, >+static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, > struct drm_modeset_acquire_ctx *ctx) > { > struct intel_encoder *encoder; >- struct intel_crtc *intel_crtc = to_intel_crtc(crtc); >- struct drm_i915_private *dev_priv = to_i915(crtc->dev); >+ struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > struct intel_bw_state *bw_state = > to_intel_bw_state(dev_priv->bw_obj.state); > struct intel_crtc_state *crtc_state = >- to_intel_crtc_state(crtc->state); >+ to_intel_crtc_state(crtc->base.state); > enum intel_display_power_domain domain; > struct intel_plane *plane; >- u64 domains; > struct drm_atomic_state *state; > struct intel_crtc_state *temp_crtc_state; >+ enum pipe pipe = crtc->pipe; >+ u64 domains; > int ret; > >- if (!intel_crtc->active) >+ if (!crtc_state->hw.active) > return; > >- for_each_intel_plane_on_crtc(&dev_priv->drm, intel_crtc, plane) { >+ for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, plane) { > const struct intel_plane_state *plane_state = > to_intel_plane_state(plane->base.state); > > if (plane_state->uapi.visible) >- intel_plane_disable_noatomic(intel_crtc, plane); >+ intel_plane_disable_noatomic(crtc, plane); > } > >- state = drm_atomic_state_alloc(crtc->dev); >+ state = drm_atomic_state_alloc(&dev_priv->drm); > if (!state) { > DRM_DEBUG_KMS("failed to disable [CRTC:%d:%s], out of memory", >- crtc->base.id, crtc->name); >+ crtc->base.base.id, crtc->base.name); > return; > } > > state->acquire_ctx = ctx; > > /* Everything's already locked, -EDEADLK can't happen. */ >- temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); >- ret = drm_atomic_add_affected_connectors(state, crtc); >+ temp_crtc_state = intel_atomic_get_crtc_state(state, crtc); >+ ret = drm_atomic_add_affected_connectors(state, &crtc->base); > > WARN_ON(IS_ERR(temp_crtc_state) || ret); > >@@ -7231,35 +7231,36 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > drm_atomic_state_put(state); > > DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n", >- crtc->base.id, crtc->name); >- >- WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state, NULL) < 0); >- crtc->state->active = false; >- intel_crtc->active = false; >- crtc->enabled = false; >- crtc->state->connector_mask = 0; >- crtc->state->encoder_mask = 0; >+ crtc->base.base.id, crtc->base.name); >+ >+ crtc->active = false; >+ crtc->base.enabled = false; >+ >+ WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0); >+ crtc_state->uapi.active = false; >+ crtc_state->uapi.connector_mask = 0; >+ crtc_state->uapi.encoder_mask = 0; > intel_crtc_free_hw_state(crtc_state); > memset(&crtc_state->hw, 0, sizeof(crtc_state->hw)); > >- for_each_encoder_on_crtc(crtc->dev, crtc, encoder) >+ for_each_encoder_on_crtc(&dev_priv->drm, &crtc->base, encoder) > encoder->base.crtc = NULL; > >- intel_fbc_disable(intel_crtc); >- intel_update_watermarks(intel_crtc); >- intel_disable_shared_dpll(to_intel_crtc_state(crtc->state)); >+ intel_fbc_disable(crtc); >+ intel_update_watermarks(crtc); >+ intel_disable_shared_dpll(crtc_state); > >- domains = intel_crtc->enabled_power_domains; >+ domains = crtc->enabled_power_domains; > for_each_power_domain(domain, domains) > intel_display_power_put_unchecked(dev_priv, domain); >- intel_crtc->enabled_power_domains = 0; >+ crtc->enabled_power_domains = 0; > >- dev_priv->active_pipes &= ~BIT(intel_crtc->pipe); >- dev_priv->min_cdclk[intel_crtc->pipe] = 0; >- dev_priv->min_voltage_level[intel_crtc->pipe] = 0; >+ dev_priv->active_pipes &= ~BIT(pipe); >+ dev_priv->min_cdclk[pipe] = 0; >+ dev_priv->min_voltage_level[pipe] = 0; > >- bw_state->data_rate[intel_crtc->pipe] = 0; >- bw_state->num_active_planes[intel_crtc->pipe] = 0; >+ bw_state->data_rate[pipe] = 0; >+ bw_state->num_active_planes[pipe] = 0; > } > > /* >@@ -17240,7 +17241,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > /* Adjust the state of the output pipe according to whether we > * have active connectors/encoders. */ > if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc)) >- intel_crtc_disable_noatomic(&crtc->base, ctx); >+ intel_crtc_disable_noatomic(crtc, ctx); > > if (crtc_state->hw.active || HAS_GMCH(dev_priv)) { > /* >-- >2.23.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types @ 2019-12-02 15:24 ` Lucas De Marchi 0 siblings, 0 replies; 14+ messages in thread From: Lucas De Marchi @ 2019-12-02 15:24 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx On Tue, Nov 05, 2019 at 07:14:47PM +0200, Ville Syrjälä wrote: >From: Ville Syrjälä <ville.syrjala@linux.intel.com> > >It's hard to see what is going on when the function mixes drm_ >and intel_ types. Switch to intel_ types. > >Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi >--- > drivers/gpu/drm/i915/display/intel_display.c | 65 ++++++++++---------- > 1 file changed, 33 insertions(+), 32 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c >index 1f93860fb897..8e75e7028403 100644 >--- a/drivers/gpu/drm/i915/display/intel_display.c >+++ b/drivers/gpu/drm/i915/display/intel_display.c >@@ -7183,46 +7183,46 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state, > i830_enable_pipe(dev_priv, pipe); > } > >-static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, >+static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, > struct drm_modeset_acquire_ctx *ctx) > { > struct intel_encoder *encoder; >- struct intel_crtc *intel_crtc = to_intel_crtc(crtc); >- struct drm_i915_private *dev_priv = to_i915(crtc->dev); >+ struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > struct intel_bw_state *bw_state = > to_intel_bw_state(dev_priv->bw_obj.state); > struct intel_crtc_state *crtc_state = >- to_intel_crtc_state(crtc->state); >+ to_intel_crtc_state(crtc->base.state); > enum intel_display_power_domain domain; > struct intel_plane *plane; >- u64 domains; > struct drm_atomic_state *state; > struct intel_crtc_state *temp_crtc_state; >+ enum pipe pipe = crtc->pipe; >+ u64 domains; > int ret; > >- if (!intel_crtc->active) >+ if (!crtc_state->hw.active) > return; > >- for_each_intel_plane_on_crtc(&dev_priv->drm, intel_crtc, plane) { >+ for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, plane) { > const struct intel_plane_state *plane_state = > to_intel_plane_state(plane->base.state); > > if (plane_state->uapi.visible) >- intel_plane_disable_noatomic(intel_crtc, plane); >+ intel_plane_disable_noatomic(crtc, plane); > } > >- state = drm_atomic_state_alloc(crtc->dev); >+ state = drm_atomic_state_alloc(&dev_priv->drm); > if (!state) { > DRM_DEBUG_KMS("failed to disable [CRTC:%d:%s], out of memory", >- crtc->base.id, crtc->name); >+ crtc->base.base.id, crtc->base.name); > return; > } > > state->acquire_ctx = ctx; > > /* Everything's already locked, -EDEADLK can't happen. */ >- temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); >- ret = drm_atomic_add_affected_connectors(state, crtc); >+ temp_crtc_state = intel_atomic_get_crtc_state(state, crtc); >+ ret = drm_atomic_add_affected_connectors(state, &crtc->base); > > WARN_ON(IS_ERR(temp_crtc_state) || ret); > >@@ -7231,35 +7231,36 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > drm_atomic_state_put(state); > > DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n", >- crtc->base.id, crtc->name); >- >- WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state, NULL) < 0); >- crtc->state->active = false; >- intel_crtc->active = false; >- crtc->enabled = false; >- crtc->state->connector_mask = 0; >- crtc->state->encoder_mask = 0; >+ crtc->base.base.id, crtc->base.name); >+ >+ crtc->active = false; >+ crtc->base.enabled = false; >+ >+ WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, NULL) < 0); >+ crtc_state->uapi.active = false; >+ crtc_state->uapi.connector_mask = 0; >+ crtc_state->uapi.encoder_mask = 0; > intel_crtc_free_hw_state(crtc_state); > memset(&crtc_state->hw, 0, sizeof(crtc_state->hw)); > >- for_each_encoder_on_crtc(crtc->dev, crtc, encoder) >+ for_each_encoder_on_crtc(&dev_priv->drm, &crtc->base, encoder) > encoder->base.crtc = NULL; > >- intel_fbc_disable(intel_crtc); >- intel_update_watermarks(intel_crtc); >- intel_disable_shared_dpll(to_intel_crtc_state(crtc->state)); >+ intel_fbc_disable(crtc); >+ intel_update_watermarks(crtc); >+ intel_disable_shared_dpll(crtc_state); > >- domains = intel_crtc->enabled_power_domains; >+ domains = crtc->enabled_power_domains; > for_each_power_domain(domain, domains) > intel_display_power_put_unchecked(dev_priv, domain); >- intel_crtc->enabled_power_domains = 0; >+ crtc->enabled_power_domains = 0; > >- dev_priv->active_pipes &= ~BIT(intel_crtc->pipe); >- dev_priv->min_cdclk[intel_crtc->pipe] = 0; >- dev_priv->min_voltage_level[intel_crtc->pipe] = 0; >+ dev_priv->active_pipes &= ~BIT(pipe); >+ dev_priv->min_cdclk[pipe] = 0; >+ dev_priv->min_voltage_level[pipe] = 0; > >- bw_state->data_rate[intel_crtc->pipe] = 0; >- bw_state->num_active_planes[intel_crtc->pipe] = 0; >+ bw_state->data_rate[pipe] = 0; >+ bw_state->num_active_planes[pipe] = 0; > } > > /* >@@ -17240,7 +17241,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > /* Adjust the state of the output pipe according to whether we > * have active connectors/encoders. */ > if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc)) >- intel_crtc_disable_noatomic(&crtc->base, ctx); >+ intel_crtc_disable_noatomic(crtc, ctx); > > if (crtc_state->hw.active || HAS_GMCH(dev_priv)) { > /* >-- >2.23.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-05 18:00 ` Patchwork 0 siblings, 0 replies; 14+ messages in thread From: Patchwork @ 2019-11-05 18:00 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() URL : https://patchwork.freedesktop.org/series/69009/ State : success == Summary == CI Bug Log - changes from CI_DRM_7262 -> Patchwork_15136 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html Known issues ------------ Here are the changes found in Patchwork_15136 that come from known issues: ### IGT changes ### #### Possible fixes #### * igt@gem_exec_parallel@basic: - {fi-tgl-u}: [INCOMPLETE][1] ([fdo#111887]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-tgl-u/igt@gem_exec_parallel@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-tgl-u/igt@gem_exec_parallel@basic.html * igt@gem_flink_basic@double-flink: - fi-icl-u3: [DMESG-WARN][3] ([fdo#107724]) -> [PASS][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-icl-u3/igt@gem_flink_basic@double-flink.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-icl-u3/igt@gem_flink_basic@double-flink.html * igt@i915_pm_rpm@module-reload: - fi-icl-u3: [DMESG-WARN][5] ([fdo#106107]) -> [PASS][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-icl-u3/igt@i915_pm_rpm@module-reload.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-icl-u3/igt@i915_pm_rpm@module-reload.html #### Warnings #### * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [FAIL][7] ([fdo#111045] / [fdo#111096]) -> [FAIL][8] ([fdo#111407]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407 [fdo#111887]: https://bugs.freedesktop.org/show_bug.cgi?id=111887 Participating hosts (51 -> 44) ------------------------------ Additional (1): fi-cml-u2 Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_7262 -> Patchwork_15136 CI-20190529: 20190529 CI_DRM_7262: 6d9033858175fc0e1ef5f77d6bd60356e6b70ee4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5263: 8a5d44dc5e51622cd43f23c2cf24d44c24a0564d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_15136: e43dc751f4224d09cd8be6be3b28e951d75d93cc @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == e43dc751f422 drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types f9bbc8e16ab0 drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-05 18:00 ` Patchwork 0 siblings, 0 replies; 14+ messages in thread From: Patchwork @ 2019-11-05 18:00 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() URL : https://patchwork.freedesktop.org/series/69009/ State : success == Summary == CI Bug Log - changes from CI_DRM_7262 -> Patchwork_15136 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html Known issues ------------ Here are the changes found in Patchwork_15136 that come from known issues: ### IGT changes ### #### Possible fixes #### * igt@gem_exec_parallel@basic: - {fi-tgl-u}: [INCOMPLETE][1] ([fdo#111887]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-tgl-u/igt@gem_exec_parallel@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-tgl-u/igt@gem_exec_parallel@basic.html * igt@gem_flink_basic@double-flink: - fi-icl-u3: [DMESG-WARN][3] ([fdo#107724]) -> [PASS][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-icl-u3/igt@gem_flink_basic@double-flink.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-icl-u3/igt@gem_flink_basic@double-flink.html * igt@i915_pm_rpm@module-reload: - fi-icl-u3: [DMESG-WARN][5] ([fdo#106107]) -> [PASS][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-icl-u3/igt@i915_pm_rpm@module-reload.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-icl-u3/igt@i915_pm_rpm@module-reload.html #### Warnings #### * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [FAIL][7] ([fdo#111045] / [fdo#111096]) -> [FAIL][8] ([fdo#111407]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407 [fdo#111887]: https://bugs.freedesktop.org/show_bug.cgi?id=111887 Participating hosts (51 -> 44) ------------------------------ Additional (1): fi-cml-u2 Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_7262 -> Patchwork_15136 CI-20190529: 20190529 CI_DRM_7262: 6d9033858175fc0e1ef5f77d6bd60356e6b70ee4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5263: 8a5d44dc5e51622cd43f23c2cf24d44c24a0564d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_15136: e43dc751f4224d09cd8be6be3b28e951d75d93cc @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == e43dc751f422 drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types f9bbc8e16ab0 drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 11:27 ` Patchwork 0 siblings, 0 replies; 14+ messages in thread From: Patchwork @ 2019-11-06 11:27 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() URL : https://patchwork.freedesktop.org/series/69009/ State : success == Summary == CI Bug Log - changes from CI_DRM_7262_full -> Patchwork_15136_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_15136_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_busy@busy-vcs1: - shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +12 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_busy@busy-vcs1.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb3/igt@gem_busy@busy-vcs1.html * igt@gem_exec_schedule@fifo-bsd1: - shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +15 similar issues [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_exec_schedule@fifo-bsd1.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@gem_exec_schedule@fifo-bsd1.html * igt@gem_exec_schedule@preemptive-hang-bsd: - shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112146]) +4 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@gem_exec_schedule@preemptive-hang-bsd.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html * igt@gem_persistent_relocs@forked-faulting-reloc-thrashing: - shard-iclb: [PASS][7] -> [TIMEOUT][8] ([fdo#112068 ]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb5/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html * igt@gem_softpin@noreloc-s3: - shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +2 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-apl6/igt@gem_softpin@noreloc-s3.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-apl4/igt@gem_softpin@noreloc-s3.html * igt@gem_userptr_blits@sync-unmap: - shard-snb: [PASS][11] -> [DMESG-WARN][12] ([fdo#111870]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-snb6/igt@gem_userptr_blits@sync-unmap.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-snb6/igt@gem_userptr_blits@sync-unmap.html * igt@kms_flip@flip-vs-expired-vblank: - shard-skl: [PASS][13] -> [FAIL][14] ([fdo#105363]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl3/igt@kms_flip@flip-vs-expired-vblank.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl10/igt@kms_flip@flip-vs-expired-vblank.html * igt@kms_flip@flip-vs-suspend-interruptible: - shard-skl: [PASS][15] -> [INCOMPLETE][16] ([fdo#109507]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render: - shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +1 similar issue [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render.html * igt@kms_psr2_su@page_flip: - shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@kms_psr2_su@page_flip.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@kms_psr2_su@page_flip.html * igt@kms_psr@psr2_cursor_render: - shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +1 similar issue [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@kms_psr@psr2_cursor_render.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@kms_psr@psr2_cursor_render.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([fdo#108566]) +4 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html #### Possible fixes #### * igt@gem_ctx_isolation@vcs0-s3: - {shard-tglb}: [INCOMPLETE][25] ([fdo#111832]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb4/igt@gem_ctx_isolation@vcs0-s3.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb1/igt@gem_ctx_isolation@vcs0-s3.html * igt@gem_ctx_isolation@vcs1-none: - shard-iclb: [SKIP][27] ([fdo#109276] / [fdo#112080]) -> [PASS][28] +3 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@gem_ctx_isolation@vcs1-none.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_ctx_isolation@vcs1-none.html * igt@gem_ctx_shared@exec-single-timeline-bsd: - shard-iclb: [SKIP][29] ([fdo#110841]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html * igt@gem_exec_schedule@reorder-wide-bsd: - shard-iclb: [SKIP][31] ([fdo#112146]) -> [PASS][32] +5 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@gem_exec_schedule@reorder-wide-bsd.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb3/igt@gem_exec_schedule@reorder-wide-bsd.html * igt@gem_exec_suspend@basic-s3: - shard-kbl: [DMESG-WARN][33] ([fdo#108566]) -> [PASS][34] +3 similar issues [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-kbl3/igt@gem_exec_suspend@basic-s3.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-kbl3/igt@gem_exec_suspend@basic-s3.html * {igt@i915_pm_dc@dc6-psr}: - shard-iclb: [FAIL][35] ([fdo#110548]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@i915_pm_dc@dc6-psr.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb6/igt@i915_pm_dc@dc6-psr.html * igt@i915_suspend@debugfs-reader: - {shard-tglb}: [INCOMPLETE][37] ([fdo#111832] / [fdo#111850]) -> [PASS][38] +1 similar issue [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb3/igt@i915_suspend@debugfs-reader.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb8/igt@i915_suspend@debugfs-reader.html * igt@i915_suspend@sysfs-reader: - shard-snb: [DMESG-WARN][39] ([fdo#102365]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-snb1/igt@i915_suspend@sysfs-reader.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-snb7/igt@i915_suspend@sysfs-reader.html * igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent: - shard-skl: [FAIL][41] ([fdo#103232]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl6/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl5/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-skl: [FAIL][43] ([fdo#105363]) -> [PASS][44] [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html - shard-glk: [FAIL][45] ([fdo#105363]) -> [PASS][46] [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt: - shard-iclb: [FAIL][47] ([fdo#103167]) -> [PASS][48] +7 similar issues [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html * igt@kms_frontbuffer_tracking@fbc-suspend: - {shard-tglb}: [INCOMPLETE][49] ([fdo#111832] / [fdo#111850] / [fdo#111884]) -> [PASS][50] [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-suspend.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_frontbuffer_tracking@fbc-tilingchange: - {shard-tglb}: [FAIL][51] ([fdo#103167]) -> [PASS][52] +1 similar issue [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-tilingchange.html [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-tilingchange.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-apl: [DMESG-WARN][53] ([fdo#108566]) -> [PASS][54] [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min: - shard-skl: [FAIL][55] ([fdo#108145]) -> [PASS][56] +1 similar issue [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html * igt@kms_plane_lowres@pipe-a-tiling-y: - shard-iclb: [FAIL][57] ([fdo#103166]) -> [PASS][58] [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-y.html [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-y.html * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60] +1 similar issue [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html * igt@perf_pmu@init-busy-vcs1: - shard-iclb: [SKIP][61] ([fdo#112080]) -> [PASS][62] +5 similar issues [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@perf_pmu@init-busy-vcs1.html [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@perf_pmu@init-busy-vcs1.html * igt@prime_busy@hang-bsd2: - shard-iclb: [SKIP][63] ([fdo#109276]) -> [PASS][64] +13 similar issues [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb7/igt@prime_busy@hang-bsd2.html [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@prime_busy@hang-bsd2.html #### Warnings #### * igt@gem_mocs_settings@mocs-isolation-bsd2: - shard-iclb: [FAIL][65] ([fdo#111330]) -> [SKIP][66] ([fdo#109276]) [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_mocs_settings@mocs-isolation-bsd2.html [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb7/igt@gem_mocs_settings@mocs-isolation-bsd2.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo# 111852 ]: https://bugs.freedesktop.org/show_bug.cgi?id= 111852 [fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365 [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548 [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329 [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 [fdo#111606]: https://bugs.freedesktop.org/show_bug.cgi?id=111606 [fdo#111647]: https://bugs.freedesktop.org/show_bug.cgi?id=111647 [fdo#111677]: https://bugs.freedesktop.org/show_bug.cgi?id=111677 [fdo#111703]: https://bugs.freedesktop.org/show_bug.cgi?id=111703 [fdo#111831]: https://bugs.freedesktop.org/show_bug.cgi?id=111831 [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832 [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850 [fdo#111855]: https://bugs.freedesktop.org/show_bug.cgi?id=111855 [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870 [fdo#111884]: https://bugs.freedesktop.org/show_bug.cgi?id=111884 [fdo#111998]: https://bugs.freedesktop.org/show_bug.cgi?id=111998 [fdo#112068 ]: https://bugs.freedesktop.org/show_bug.cgi?id=112068 [fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080 [fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146 [fdo#112217]: https://bugs.freedesktop.org/show_bug.cgi?id=112217 [fdo#112218]: https://bugs.freedesktop.org/show_bug.cgi?id=112218 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_7262 -> Patchwork_15136 CI-20190529: 20190529 CI_DRM_7262: 6d9033858175fc0e1ef5f77d6bd60356e6b70ee4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5263: 8a5d44dc5e51622cd43f23c2cf24d44c24a0564d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_15136: e43dc751f4224d09cd8be6be3b28e951d75d93cc @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 11:27 ` Patchwork 0 siblings, 0 replies; 14+ messages in thread From: Patchwork @ 2019-11-06 11:27 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() URL : https://patchwork.freedesktop.org/series/69009/ State : success == Summary == CI Bug Log - changes from CI_DRM_7262_full -> Patchwork_15136_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_15136_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_busy@busy-vcs1: - shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +12 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_busy@busy-vcs1.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb3/igt@gem_busy@busy-vcs1.html * igt@gem_exec_schedule@fifo-bsd1: - shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +15 similar issues [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_exec_schedule@fifo-bsd1.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@gem_exec_schedule@fifo-bsd1.html * igt@gem_exec_schedule@preemptive-hang-bsd: - shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112146]) +4 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@gem_exec_schedule@preemptive-hang-bsd.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html * igt@gem_persistent_relocs@forked-faulting-reloc-thrashing: - shard-iclb: [PASS][7] -> [TIMEOUT][8] ([fdo#112068 ]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb5/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html * igt@gem_softpin@noreloc-s3: - shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +2 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-apl6/igt@gem_softpin@noreloc-s3.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-apl4/igt@gem_softpin@noreloc-s3.html * igt@gem_userptr_blits@sync-unmap: - shard-snb: [PASS][11] -> [DMESG-WARN][12] ([fdo#111870]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-snb6/igt@gem_userptr_blits@sync-unmap.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-snb6/igt@gem_userptr_blits@sync-unmap.html * igt@kms_flip@flip-vs-expired-vblank: - shard-skl: [PASS][13] -> [FAIL][14] ([fdo#105363]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl3/igt@kms_flip@flip-vs-expired-vblank.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl10/igt@kms_flip@flip-vs-expired-vblank.html * igt@kms_flip@flip-vs-suspend-interruptible: - shard-skl: [PASS][15] -> [INCOMPLETE][16] ([fdo#109507]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render: - shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +1 similar issue [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-render.html * igt@kms_psr2_su@page_flip: - shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@kms_psr2_su@page_flip.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@kms_psr2_su@page_flip.html * igt@kms_psr@psr2_cursor_render: - shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +1 similar issue [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@kms_psr@psr2_cursor_render.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@kms_psr@psr2_cursor_render.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([fdo#108566]) +4 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html #### Possible fixes #### * igt@gem_ctx_isolation@vcs0-s3: - {shard-tglb}: [INCOMPLETE][25] ([fdo#111832]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb4/igt@gem_ctx_isolation@vcs0-s3.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb1/igt@gem_ctx_isolation@vcs0-s3.html * igt@gem_ctx_isolation@vcs1-none: - shard-iclb: [SKIP][27] ([fdo#109276] / [fdo#112080]) -> [PASS][28] +3 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@gem_ctx_isolation@vcs1-none.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@gem_ctx_isolation@vcs1-none.html * igt@gem_ctx_shared@exec-single-timeline-bsd: - shard-iclb: [SKIP][29] ([fdo#110841]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html * igt@gem_exec_schedule@reorder-wide-bsd: - shard-iclb: [SKIP][31] ([fdo#112146]) -> [PASS][32] +5 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb2/igt@gem_exec_schedule@reorder-wide-bsd.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb3/igt@gem_exec_schedule@reorder-wide-bsd.html * igt@gem_exec_suspend@basic-s3: - shard-kbl: [DMESG-WARN][33] ([fdo#108566]) -> [PASS][34] +3 similar issues [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-kbl3/igt@gem_exec_suspend@basic-s3.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-kbl3/igt@gem_exec_suspend@basic-s3.html * {igt@i915_pm_dc@dc6-psr}: - shard-iclb: [FAIL][35] ([fdo#110548]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@i915_pm_dc@dc6-psr.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb6/igt@i915_pm_dc@dc6-psr.html * igt@i915_suspend@debugfs-reader: - {shard-tglb}: [INCOMPLETE][37] ([fdo#111832] / [fdo#111850]) -> [PASS][38] +1 similar issue [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb3/igt@i915_suspend@debugfs-reader.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb8/igt@i915_suspend@debugfs-reader.html * igt@i915_suspend@sysfs-reader: - shard-snb: [DMESG-WARN][39] ([fdo#102365]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-snb1/igt@i915_suspend@sysfs-reader.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-snb7/igt@i915_suspend@sysfs-reader.html * igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent: - shard-skl: [FAIL][41] ([fdo#103232]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl6/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl5/igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent.html * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-skl: [FAIL][43] ([fdo#105363]) -> [PASS][44] [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html - shard-glk: [FAIL][45] ([fdo#105363]) -> [PASS][46] [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt: - shard-iclb: [FAIL][47] ([fdo#103167]) -> [PASS][48] +7 similar issues [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html * igt@kms_frontbuffer_tracking@fbc-suspend: - {shard-tglb}: [INCOMPLETE][49] ([fdo#111832] / [fdo#111850] / [fdo#111884]) -> [PASS][50] [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-suspend.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_frontbuffer_tracking@fbc-tilingchange: - {shard-tglb}: [FAIL][51] ([fdo#103167]) -> [PASS][52] +1 similar issue [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-tilingchange.html [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-tilingchange.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-apl: [DMESG-WARN][53] ([fdo#108566]) -> [PASS][54] [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min: - shard-skl: [FAIL][55] ([fdo#108145]) -> [PASS][56] +1 similar issue [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html * igt@kms_plane_lowres@pipe-a-tiling-y: - shard-iclb: [FAIL][57] ([fdo#103166]) -> [PASS][58] [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-y.html [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-y.html * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60] +1 similar issue [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html * igt@perf_pmu@init-busy-vcs1: - shard-iclb: [SKIP][61] ([fdo#112080]) -> [PASS][62] +5 similar issues [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb8/igt@perf_pmu@init-busy-vcs1.html [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@perf_pmu@init-busy-vcs1.html * igt@prime_busy@hang-bsd2: - shard-iclb: [SKIP][63] ([fdo#109276]) -> [PASS][64] +13 similar issues [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb7/igt@prime_busy@hang-bsd2.html [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb4/igt@prime_busy@hang-bsd2.html #### Warnings #### * igt@gem_mocs_settings@mocs-isolation-bsd2: - shard-iclb: [FAIL][65] ([fdo#111330]) -> [SKIP][66] ([fdo#109276]) [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7262/shard-iclb1/igt@gem_mocs_settings@mocs-isolation-bsd2.html [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/shard-iclb7/igt@gem_mocs_settings@mocs-isolation-bsd2.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo# 111852 ]: https://bugs.freedesktop.org/show_bug.cgi?id= 111852 [fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365 [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548 [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329 [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 [fdo#111606]: https://bugs.freedesktop.org/show_bug.cgi?id=111606 [fdo#111647]: https://bugs.freedesktop.org/show_bug.cgi?id=111647 [fdo#111677]: https://bugs.freedesktop.org/show_bug.cgi?id=111677 [fdo#111703]: https://bugs.freedesktop.org/show_bug.cgi?id=111703 [fdo#111831]: https://bugs.freedesktop.org/show_bug.cgi?id=111831 [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832 [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850 [fdo#111855]: https://bugs.freedesktop.org/show_bug.cgi?id=111855 [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870 [fdo#111884]: https://bugs.freedesktop.org/show_bug.cgi?id=111884 [fdo#111998]: https://bugs.freedesktop.org/show_bug.cgi?id=111998 [fdo#112068 ]: https://bugs.freedesktop.org/show_bug.cgi?id=112068 [fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080 [fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146 [fdo#112217]: https://bugs.freedesktop.org/show_bug.cgi?id=112217 [fdo#112218]: https://bugs.freedesktop.org/show_bug.cgi?id=112218 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_7262 -> Patchwork_15136 CI-20190529: 20190529 CI_DRM_7262: 6d9033858175fc0e1ef5f77d6bd60356e6b70ee4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5263: 8a5d44dc5e51622cd43f23c2cf24d44c24a0564d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_15136: e43dc751f4224d09cd8be6be3b28e951d75d93cc @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15136/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 11:53 ` Maarten Lankhorst 0 siblings, 0 replies; 14+ messages in thread From: Maarten Lankhorst @ 2019-11-06 11:53 UTC (permalink / raw) To: Ville Syrjala, intel-gfx Op 05-11-2019 om 18:14 schreef Ville Syrjala: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The uapi vs. hw state split introduced a bug in > intel_crtc_disable_noatomic() where it's not frobbing an already > freed temp crtc state instead of adjusting the crtc state we > are really left with. Fix that by making a cleaner separation > beteen the two. > > This causes explosions on any machine that boots up with pipes > already running but not hooked up to any encoder (typical > behaviour for gen2-4 VBIOS). > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 876fc25968bf..1f93860fb897 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > struct intel_bw_state *bw_state = > to_intel_bw_state(dev_priv->bw_obj.state); > + struct intel_crtc_state *crtc_state = > + to_intel_crtc_state(crtc->state); > enum intel_display_power_domain domain; > struct intel_plane *plane; > u64 domains; > struct drm_atomic_state *state; > - struct intel_crtc_state *crtc_state; > + struct intel_crtc_state *temp_crtc_state; > int ret; > > if (!intel_crtc->active) > @@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > state->acquire_ctx = ctx; > > /* Everything's already locked, -EDEADLK can't happen. */ > - crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > + temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > ret = drm_atomic_add_affected_connectors(state, crtc); > > - WARN_ON(IS_ERR(crtc_state) || ret); > + WARN_ON(IS_ERR(temp_crtc_state) || ret); > > - dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state)); > + dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state)); > > drm_atomic_state_put(state); > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 11:53 ` Maarten Lankhorst 0 siblings, 0 replies; 14+ messages in thread From: Maarten Lankhorst @ 2019-11-06 11:53 UTC (permalink / raw) To: Ville Syrjala, intel-gfx Op 05-11-2019 om 18:14 schreef Ville Syrjala: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The uapi vs. hw state split introduced a bug in > intel_crtc_disable_noatomic() where it's not frobbing an already > freed temp crtc state instead of adjusting the crtc state we > are really left with. Fix that by making a cleaner separation > beteen the two. > > This causes explosions on any machine that boots up with pipes > already running but not hooked up to any encoder (typical > behaviour for gen2-4 VBIOS). > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 876fc25968bf..1f93860fb897 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > struct intel_bw_state *bw_state = > to_intel_bw_state(dev_priv->bw_obj.state); > + struct intel_crtc_state *crtc_state = > + to_intel_crtc_state(crtc->state); > enum intel_display_power_domain domain; > struct intel_plane *plane; > u64 domains; > struct drm_atomic_state *state; > - struct intel_crtc_state *crtc_state; > + struct intel_crtc_state *temp_crtc_state; > int ret; > > if (!intel_crtc->active) > @@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > state->acquire_ctx = ctx; > > /* Everything's already locked, -EDEADLK can't happen. */ > - crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > + temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > ret = drm_atomic_add_affected_connectors(state, crtc); > > - WARN_ON(IS_ERR(crtc_state) || ret); > + WARN_ON(IS_ERR(temp_crtc_state) || ret); > > - dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state)); > + dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state)); > > drm_atomic_state_put(state); > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 13:45 ` Ville Syrjälä 0 siblings, 0 replies; 14+ messages in thread From: Ville Syrjälä @ 2019-11-06 13:45 UTC (permalink / raw) To: Maarten Lankhorst; +Cc: intel-gfx On Wed, Nov 06, 2019 at 12:53:45PM +0100, Maarten Lankhorst wrote: > Op 05-11-2019 om 18:14 schreef Ville Syrjala: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > The uapi vs. hw state split introduced a bug in > > intel_crtc_disable_noatomic() where it's not frobbing an already s/not/now/ and pushed to dinq. Thanks for the review. > > freed temp crtc state instead of adjusting the crtc state we > > are really left with. Fix that by making a cleaner separation > > beteen the two. > > > > This causes explosions on any machine that boots up with pipes > > already running but not hooked up to any encoder (typical > > behaviour for gen2-4 VBIOS). > > > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index 876fc25968bf..1f93860fb897 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > struct intel_bw_state *bw_state = > > to_intel_bw_state(dev_priv->bw_obj.state); > > + struct intel_crtc_state *crtc_state = > > + to_intel_crtc_state(crtc->state); > > enum intel_display_power_domain domain; > > struct intel_plane *plane; > > u64 domains; > > struct drm_atomic_state *state; > > - struct intel_crtc_state *crtc_state; > > + struct intel_crtc_state *temp_crtc_state; > > int ret; > > > > if (!intel_crtc->active) > > @@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > > state->acquire_ctx = ctx; > > > > /* Everything's already locked, -EDEADLK can't happen. */ > > - crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > > + temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > > ret = drm_atomic_add_affected_connectors(state, crtc); > > > > - WARN_ON(IS_ERR(crtc_state) || ret); > > + WARN_ON(IS_ERR(temp_crtc_state) || ret); > > > > - dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state)); > > + dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state)); > > > > drm_atomic_state_put(state); > > > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() @ 2019-11-06 13:45 ` Ville Syrjälä 0 siblings, 0 replies; 14+ messages in thread From: Ville Syrjälä @ 2019-11-06 13:45 UTC (permalink / raw) To: Maarten Lankhorst; +Cc: intel-gfx On Wed, Nov 06, 2019 at 12:53:45PM +0100, Maarten Lankhorst wrote: > Op 05-11-2019 om 18:14 schreef Ville Syrjala: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > The uapi vs. hw state split introduced a bug in > > intel_crtc_disable_noatomic() where it's not frobbing an already s/not/now/ and pushed to dinq. Thanks for the review. > > freed temp crtc state instead of adjusting the crtc state we > > are really left with. Fix that by making a cleaner separation > > beteen the two. > > > > This causes explosions on any machine that boots up with pipes > > already running but not hooked up to any encoder (typical > > behaviour for gen2-4 VBIOS). > > > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index 876fc25968bf..1f93860fb897 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -7191,11 +7191,13 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > struct intel_bw_state *bw_state = > > to_intel_bw_state(dev_priv->bw_obj.state); > > + struct intel_crtc_state *crtc_state = > > + to_intel_crtc_state(crtc->state); > > enum intel_display_power_domain domain; > > struct intel_plane *plane; > > u64 domains; > > struct drm_atomic_state *state; > > - struct intel_crtc_state *crtc_state; > > + struct intel_crtc_state *temp_crtc_state; > > int ret; > > > > if (!intel_crtc->active) > > @@ -7219,12 +7221,12 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, > > state->acquire_ctx = ctx; > > > > /* Everything's already locked, -EDEADLK can't happen. */ > > - crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > > + temp_crtc_state = intel_atomic_get_crtc_state(state, intel_crtc); > > ret = drm_atomic_add_affected_connectors(state, crtc); > > > > - WARN_ON(IS_ERR(crtc_state) || ret); > > + WARN_ON(IS_ERR(temp_crtc_state) || ret); > > > > - dev_priv->display.crtc_disable(crtc_state, to_intel_atomic_state(state)); > > + dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state)); > > > > drm_atomic_state_put(state); > > > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-12-02 15:24 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-05 17:14 [PATCH 1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() Ville Syrjala 2019-11-05 17:14 ` [Intel-gfx] " Ville Syrjala 2019-11-05 17:14 ` [PATCH 2/2] drm/i915: Switch intel_crtc_disable_noatomic() to intel_ types Ville Syrjala 2019-11-05 17:14 ` [Intel-gfx] " Ville Syrjala 2019-12-02 15:24 ` Lucas De Marchi 2019-12-02 15:24 ` [Intel-gfx] " Lucas De Marchi 2019-11-05 18:00 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() Patchwork 2019-11-05 18:00 ` [Intel-gfx] " Patchwork 2019-11-06 11:27 ` ✓ Fi.CI.IGT: " Patchwork 2019-11-06 11:27 ` [Intel-gfx] " Patchwork 2019-11-06 11:53 ` [PATCH 1/2] " Maarten Lankhorst 2019-11-06 11:53 ` [Intel-gfx] " Maarten Lankhorst 2019-11-06 13:45 ` Ville Syrjälä 2019-11-06 13:45 ` [Intel-gfx] " Ville Syrjälä
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.