On Thu, Dec 04, 2014 at 12:59:07PM -0800, Jesse Barnes wrote: > On Mon, 1 Dec 2014 09:54:28 -0800 > Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote: > > > Partial revert of > > > > commit 206645910b9796bff13fcdb67bdca166b724ba62 > > Author: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > > Date: Wed Nov 5 14:26:09 2014 -0800 > > > > drm/i915: check for audio and infoframe changes across mode sets > > v2 > > > > References: https://bugs.freedesktop.org/show_bug.cgi?id=86683 > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_display.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c index 42bcbea..fe27a2c 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -11601,10 +11601,12 @@ static int intel_crtc_set_config(struct > > drm_mode_set *set) to_intel_crtc(set->crtc)->config.has_audio) > > config->mode_changed = true; > > > > - /* Force mode sets for any infoframe stuff */ > > - if (pipe_config->has_infoframe || > > - to_intel_crtc(set->crtc)->config.has_infoframe) > > - config->mode_changed = true; > > + /* > > + * Note we have an issue here with infoframes: > > current code > > + * only updates them on the full mode set path per hw > > + * requirements. So here we should be checking for > > any > > + * required changes and forcing a mode set. > > + */ > > } > > > > /* set_mode will free it in the mode_changed case */ > > > This got a tested-by from QA on the referenced bug, so I guess we > should pick it up as the revert. > > Daniel? Sorry, fell through the cracks. Now it's for Jani to pick up since 3.20 is already split away. I've pinged him. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx