[1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic()
diff mbox series

Message ID 20191105171447.22111-1-ville.syrjala@linux.intel.com
State New
Headers show
Series
  • [1/2] drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic()
Related show

Commit Message

Ville Syrjälä Nov. 5, 2019, 5:14 p.m. UTC
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(-)

Comments

Maarten Lankhorst Nov. 6, 2019, 11:53 a.m. UTC | #1
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>
Ville Syrjälä Nov. 6, 2019, 1:45 p.m. UTC | #2
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>
>

Patch
diff mbox series

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);