All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes
@ 2014-11-21 19:00 ville.syrjala
  2014-11-21 19:57 ` Jesse Barnes
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ville.syrjala @ 2014-11-21 19:00 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

When doing a nop modeset we currently leave crtc->new_config point at
the already freed temporary pipe_config. That will anger the sanity
checks in intel_modeset_update_state() when the nop modeset gets
followed by a GPU reset on gen3/4 where the display block gets fully
reinitialized during the reset.

So leave crtc->new_config alone until we know a modeset is actually
required.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 853697f..3218455 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10907,7 +10907,6 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
 	}
 	intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
 			       "[modeset]");
-	to_intel_crtc(crtc)->new_config = pipe_config;
 
 out:
 	return pipe_config;
@@ -10933,6 +10932,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 
 	*saved_mode = crtc->mode;
 
+	if (modeset_pipes)
+		to_intel_crtc(crtc)->new_config = pipe_config;
+
 	/*
 	 * See if the config requires any additional preparation, e.g.
 	 * to adjust global state with pipes off.  We need to do this
@@ -11466,12 +11468,12 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
 		ret = PTR_ERR(pipe_config);
 		goto fail;
 	} else if (pipe_config) {
-		if (to_intel_crtc(set->crtc)->new_config->has_audio !=
+		if (pipe_config->has_audio !=
 		    to_intel_crtc(set->crtc)->config.has_audio)
 			config->mode_changed = true;
 
 		/* Force mode sets for any infoframe stuff */
-		if (to_intel_crtc(set->crtc)->new_config->has_infoframe ||
+		if (pipe_config->has_infoframe ||
 		    to_intel_crtc(set->crtc)->config.has_infoframe)
 			config->mode_changed = true;
 	}
-- 
2.0.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes
  2014-11-21 19:00 [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes ville.syrjala
@ 2014-11-21 19:57 ` Jesse Barnes
  2014-11-21 20:31 ` Daniel Vetter
  2014-11-24  8:57 ` [PATCH] drm/i915: Don't clobber crtc->new_config when shuang.he
  2 siblings, 0 replies; 4+ messages in thread
From: Jesse Barnes @ 2014-11-21 19:57 UTC (permalink / raw)
  To: ville.syrjala; +Cc: intel-gfx

On Fri, 21 Nov 2014 21:00:36 +0200
ville.syrjala@linux.intel.com wrote:

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> When doing a nop modeset we currently leave crtc->new_config point at
> the already freed temporary pipe_config. That will anger the sanity
> checks in intel_modeset_update_state() when the nop modeset gets
> followed by a GPU reset on gen3/4 where the display block gets fully
> reinitialized during the reset.
> 
> So leave crtc->new_config alone until we know a modeset is actually
> required.
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 853697f..3218455 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10907,7 +10907,6 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
>  	}
>  	intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
>  			       "[modeset]");
> -	to_intel_crtc(crtc)->new_config = pipe_config;
>  
>  out:
>  	return pipe_config;
> @@ -10933,6 +10932,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
>  
>  	*saved_mode = crtc->mode;
>  
> +	if (modeset_pipes)
> +		to_intel_crtc(crtc)->new_config = pipe_config;
> +
>  	/*
>  	 * See if the config requires any additional preparation, e.g.
>  	 * to adjust global state with pipes off.  We need to do this
> @@ -11466,12 +11468,12 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
>  		ret = PTR_ERR(pipe_config);
>  		goto fail;
>  	} else if (pipe_config) {
> -		if (to_intel_crtc(set->crtc)->new_config->has_audio !=
> +		if (pipe_config->has_audio !=
>  		    to_intel_crtc(set->crtc)->config.has_audio)
>  			config->mode_changed = true;
>  
>  		/* Force mode sets for any infoframe stuff */
> -		if (to_intel_crtc(set->crtc)->new_config->has_infoframe ||
> +		if (pipe_config->has_infoframe ||
>  		    to_intel_crtc(set->crtc)->config.has_infoframe)
>  			config->mode_changed = true;
>  	}

Yeah looks fine.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes
  2014-11-21 19:00 [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes ville.syrjala
  2014-11-21 19:57 ` Jesse Barnes
@ 2014-11-21 20:31 ` Daniel Vetter
  2014-11-24  8:57 ` [PATCH] drm/i915: Don't clobber crtc->new_config when shuang.he
  2 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2014-11-21 20:31 UTC (permalink / raw)
  To: ville.syrjala; +Cc: intel-gfx

On Fri, Nov 21, 2014 at 09:00:36PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> When doing a nop modeset we currently leave crtc->new_config point at
> the already freed temporary pipe_config. That will anger the sanity
> checks in intel_modeset_update_state() when the nop modeset gets
> followed by a GPU reset on gen3/4 where the display block gets fully
> reinitialized during the reset.
> 
> So leave crtc->new_config alone until we know a modeset is actually
> required.
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Don't clobber crtc->new_config when
  2014-11-21 19:00 [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes ville.syrjala
  2014-11-21 19:57 ` Jesse Barnes
  2014-11-21 20:31 ` Daniel Vetter
@ 2014-11-24  8:57 ` shuang.he
  2 siblings, 0 replies; 4+ messages in thread
From: shuang.he @ 2014-11-24  8:57 UTC (permalink / raw)
  To: shuang.he, intel-gfx, ville.syrjala

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                 -1              367/367              366/367
ILK                 -4              375/375              371/375
SNB                                  450/450              450/450
IVB                 -2              503/503              501/503
BYT                                  289/289              289/289
HSW                 -3              567/567              564/567
BDW                                  417/417              417/417
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
PNV  igt_gen3_mixed_blits      PASS(4, M23)      CRASH(1, M23)
ILK  igt_gem_reset_stats_close-pending-fork-render      TIMEOUT(2, M37M26)PASS(1, M26)      TIMEOUT(1, M26)
ILK  igt_kms_flip_nonexisting-fb      PASS(2, M37M26)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_vblank-vs-hang      TIMEOUT(2, M37M26)PASS(1, M26)      TIMEOUT(1, M26)
ILK  igt_kms_flip_wf_vblank-ts-check      PASS(3, M37M26)      DMESG_WARN(1, M26)
IVB  igt_gem_bad_reloc_negative-reloc      NSPT(3, M34M21M4)PASS(1, M21)      NSPT(1, M21)
IVB  igt_gem_bad_reloc_negative-reloc-lut      NSPT(3, M21M34M4)PASS(4, M21M34M4)      NSPT(1, M21)
HSW  igt_gem_bad_reloc_negative-reloc-lut      NSPT(13, M40M20)PASS(1, M20)      NSPT(1, M20)
HSW  igt_kms_rotation_crc_primary-rotation      PASS(14, M20M40)      DMESG_WARN(1, M20)
HSW  igt_pm_rc6_residency_rc6-accuracy      PASS(14, M20M40)      FAIL(1, M20)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-24  8:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-21 19:00 [PATCH] drm/i915: Don't clobber crtc->new_config when nothing changes ville.syrjala
2014-11-21 19:57 ` Jesse Barnes
2014-11-21 20:31 ` Daniel Vetter
2014-11-24  8:57 ` [PATCH] drm/i915: Don't clobber crtc->new_config when shuang.he

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.