[PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[Jesse Barnes]

Partial revert of

commit 206645910b9796bff13fcdb67bdca166b724ba62
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
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@virtuousgeek.org>
---
 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 */
-- 
1.9.1

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

Re: [PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[shuang.he]

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                                  364/364              364/364
ILK              +1                 365/366              366/366
SNB                                  450/450              450/450
IVB                 -17              498/498              481/498
BYT                                  289/289              289/289
HSW                 -1              564/564              563/564
BDW                 -1              417/417              416/417
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
 ILK  igt_kms_flip_wf_vblank-ts-check      DMESG_WARN(2, M26)PASS(10, M26M37)      PASS(1, M37)
 IVB  igt_kms_3d      DMESG_WARN(3, M34)PASS(1, M34)      DMESG_WARN(1, M34)
 IVB  igt_kms_cursor_crc_cursor-128x128-onscreen      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-128x128-random      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-128x128-sliding      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-256x256-offscreen      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-256x256-onscreen      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-256x256-sliding      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-64x64-offscreen      NSPT(3, M34)PASS(2, M34M21)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-64x64-onscreen      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-64x64-random      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-64x64-sliding      FAIL(1, M21)NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_cursor_crc_cursor-size-change      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_fence_pin_leak      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_mmio_vs_cs_flip_setcrtc_vs_cs_flip      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_mmio_vs_cs_flip_setplane_vs_cs_flip      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_rotation_crc_primary-rotation      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
 IVB  igt_kms_rotation_crc_sprite-rotation      NSPT(3, M34)PASS(1, M34)      NSPT(1, M34)
*HSW  igt_kms_flip_bo-too-big      PASS(2, M19M20)      DMESG_WARN(1, M20)
*BDW  igt_debugfs_emon_crash      PASS(2, M30M28)      NO_RESULT(1, M28)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[Jesse Barnes]

On Mon,  1 Dec 2014 09:54:28 -0800
Jesse Barnes <jbarnes@virtuousgeek.org> wrote:

> Partial revert of
> 
> commit 206645910b9796bff13fcdb67bdca166b724ba62
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> 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@virtuousgeek.org>
> ---
>  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?
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[Daniel Vetter]

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@virtuousgeek.org> wrote:
> 
> > Partial revert of
> > 
> > commit 206645910b9796bff13fcdb67bdca166b724ba62
> > Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 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@virtuousgeek.org>
> > ---
> >  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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: don't always do full mode sets when infoframes are enabled

[Jani Nikula]

On Fri, 05 Dec 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> 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@virtuousgeek.org> wrote:
>> 
>> > Partial revert of
>> > 
>> > commit 206645910b9796bff13fcdb67bdca166b724ba62
>> > Author: Jesse Barnes <jbarnes@virtuousgeek.org>
>> > 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@virtuousgeek.org>
>> > ---
>> >  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.

I've pushed this to drm-intel-next-queued last week. Thanks for the
patch.

BR,
Jani.


> -Daniel
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

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