evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Don't clobber crtc->new_config when nothing changes

Browse source 
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>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-11-21 21:00:36 +02:00 • committed by Daniel Vetter
parent 4fcd01d0f3
commit b9950a133f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View file

@ -10907,7 +10907,6 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
} }
intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
"[modeset]"); "[modeset]");
to_intel_crtc(crtc)->new_config = pipe_config;
out: out:
return pipe_config; return pipe_config;
@ -10933,6 +10932,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
*saved_mode = crtc->mode; *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. * See if the config requires any additional preparation, e.g.
* to adjust global state with pipes off. We need to do this * 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); ret = PTR_ERR(pipe_config);
goto fail; goto fail;
} else if (pipe_config) { } 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) to_intel_crtc(set->crtc)->config.has_audio)
config->mode_changed = true; config->mode_changed = true;
/* Force mode sets for any infoframe stuff */ /* 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) to_intel_crtc(set->crtc)->config.has_infoframe)
config->mode_changed = true; config->mode_changed = true;
} }