All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-20 13:32 ` Ander Conselvan de Oliveira
  0 siblings, 0 replies; 12+ messages in thread
From: Ander Conselvan de Oliveira @ 2015-05-20 13:32 UTC (permalink / raw)
  To: intel-gfx; +Cc: Ander Conselvan de Oliveira, stable, Dave Airlie, Jani Nikula

On Fedora 21 or 22, when the transition from the X server to the wayland
compositor is done, the CRTC with the login screen is left active with a
disabled fb. A cursor ioctl after the transition causes the watermarks
to be updated, but due to the logic in intel_crtc_active() checking for
the primary plane fb, the update considers all planes to be disabled,
untimately setting the wrong watermark values and causing screen
flicker. Since the crtc is active, a modeset done later is skipped and
replaced with a flip, which doesn't update the watermarks.

This regression was introduced somewhere between v3.16 and v3.17.
Another issue prevented me from doing a full bisect, but the issue was
introduced in one of the following skipped commits:

    commit 7707e6535f43328e05e4729ac96eee864b90e8a4
    Author: Rob Clark <robdclark@gmail.com>
    Date:   Thu Jul 17 23:30:04 2014 -0400

        drm/i915: use helpers

    commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
    Merge: c7dbc6c 3488229
    Author: Dave Airlie <airlied@redhat.com>
    Date:   Wed Jul 9 10:38:42 2014 +1000

        Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next

    commit c51f71679042a5f388d9580ffbede14c897f1e86
    Merge: b957f45 7b3c29f
    Author: Dave Airlie <airlied@redhat.com>
    Date:   Sat Jul 19 16:43:41 2014 +1000

        Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next

This patch is a simplified version of the following commits:

    commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
    Author: Matt Roper <matthew.d.roper@intel.com>
    Date:   Fri Feb 27 10:12:00 2015 -0800

        drm/i915: Kill intel_crtc->cursor_{width, height} (v2)

    commit 54da691deb123c045259ebf4f5c67381244f58f1
    Author: Thomas Gummerer <t.gummerer@gmail.com>
    Date:   Thu May 14 09:16:39 2015 +0200

        drm/i915: fix screen flickering

    commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
    Author: Matt Roper <matthew.d.roper@intel.com>
    Date:   Mon Mar 9 10:19:24 2015 -0700

        drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
Cc: stable@vger.kernel.org
Cc: Dave Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 24d77dd..3d67f8e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
 	enum pipe pipe = intel_crtc->pipe;
 	struct drm_plane *plane;
 
-	if (!intel_crtc_active(crtc))
+	if (!intel_crtc->active)
 		return;
 
 	p->active = true;
 	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
 	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
-	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
+
+
+	if (crtc->primary->fb)
+		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
+	else
+		p->pri.bytes_per_pixel = 4;
+
 	p->cur.bytes_per_pixel = 4;
+
 	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
-	p->cur.horiz_pixels = intel_crtc->cursor_width;
+	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
+
 	/* TODO: for now, assume primary and cursor planes are always enabled. */
 	p->pri.enabled = true;
 	p->cur.enabled = true;
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-20 13:32 ` Ander Conselvan de Oliveira
  0 siblings, 0 replies; 12+ messages in thread
From: Ander Conselvan de Oliveira @ 2015-05-20 13:32 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Ander Conselvan de Oliveira, stable

On Fedora 21 or 22, when the transition from the X server to the wayland
compositor is done, the CRTC with the login screen is left active with a
disabled fb. A cursor ioctl after the transition causes the watermarks
to be updated, but due to the logic in intel_crtc_active() checking for
the primary plane fb, the update considers all planes to be disabled,
untimately setting the wrong watermark values and causing screen
flicker. Since the crtc is active, a modeset done later is skipped and
replaced with a flip, which doesn't update the watermarks.

This regression was introduced somewhere between v3.16 and v3.17.
Another issue prevented me from doing a full bisect, but the issue was
introduced in one of the following skipped commits:

    commit 7707e6535f43328e05e4729ac96eee864b90e8a4
    Author: Rob Clark <robdclark@gmail.com>
    Date:   Thu Jul 17 23:30:04 2014 -0400

        drm/i915: use helpers

    commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
    Merge: c7dbc6c 3488229
    Author: Dave Airlie <airlied@redhat.com>
    Date:   Wed Jul 9 10:38:42 2014 +1000

        Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next

    commit c51f71679042a5f388d9580ffbede14c897f1e86
    Merge: b957f45 7b3c29f
    Author: Dave Airlie <airlied@redhat.com>
    Date:   Sat Jul 19 16:43:41 2014 +1000

        Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next

This patch is a simplified version of the following commits:

    commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
    Author: Matt Roper <matthew.d.roper@intel.com>
    Date:   Fri Feb 27 10:12:00 2015 -0800

        drm/i915: Kill intel_crtc->cursor_{width, height} (v2)

    commit 54da691deb123c045259ebf4f5c67381244f58f1
    Author: Thomas Gummerer <t.gummerer@gmail.com>
    Date:   Thu May 14 09:16:39 2015 +0200

        drm/i915: fix screen flickering

    commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
    Author: Matt Roper <matthew.d.roper@intel.com>
    Date:   Mon Mar 9 10:19:24 2015 -0700

        drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
Cc: stable@vger.kernel.org
Cc: Dave Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 24d77dd..3d67f8e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
 	enum pipe pipe = intel_crtc->pipe;
 	struct drm_plane *plane;
 
-	if (!intel_crtc_active(crtc))
+	if (!intel_crtc->active)
 		return;
 
 	p->active = true;
 	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
 	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
-	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
+
+
+	if (crtc->primary->fb)
+		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
+	else
+		p->pri.bytes_per_pixel = 4;
+
 	p->cur.bytes_per_pixel = 4;
+
 	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
-	p->cur.horiz_pixels = intel_crtc->cursor_width;
+	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
+
 	/* TODO: for now, assume primary and cursor planes are always enabled. */
 	p->pri.enabled = true;
 	p->cur.enabled = true;
-- 
2.1.0

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-20 13:32 ` Ander Conselvan de Oliveira
@ 2015-05-20 13:53   ` Jani Nikula
  -1 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2015-05-20 13:53 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira, intel-gfx
  Cc: Ander Conselvan de Oliveira, stable, Dave Airlie

On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> On Fedora 21 or 22, when the transition from the X server to the wayland
> compositor is done, the CRTC with the login screen is left active with a
> disabled fb. A cursor ioctl after the transition causes the watermarks
> to be updated, but due to the logic in intel_crtc_active() checking for
> the primary plane fb, the update considers all planes to be disabled,
> untimately setting the wrong watermark values and causing screen
> flicker. Since the crtc is active, a modeset done later is skipped and
> replaced with a flip, which doesn't update the watermarks.
>
> This regression was introduced somewhere between v3.16 and v3.17.
> Another issue prevented me from doing a full bisect, but the issue was
> introduced in one of the following skipped commits:
>
>     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>     Author: Rob Clark <robdclark@gmail.com>
>     Date:   Thu Jul 17 23:30:04 2014 -0400
>
>         drm/i915: use helpers
>
>     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>     Merge: c7dbc6c 3488229
>     Author: Dave Airlie <airlied@redhat.com>
>     Date:   Wed Jul 9 10:38:42 2014 +1000
>
>         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>
>     commit c51f71679042a5f388d9580ffbede14c897f1e86
>     Merge: b957f45 7b3c29f
>     Author: Dave Airlie <airlied@redhat.com>
>     Date:   Sat Jul 19 16:43:41 2014 +1000
>
>         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>
> This patch is a simplified version of the following commits:
>
>     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>     Author: Matt Roper <matthew.d.roper@intel.com>
>     Date:   Fri Feb 27 10:12:00 2015 -0800
>
>         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>
>     commit 54da691deb123c045259ebf4f5c67381244f58f1
>     Author: Thomas Gummerer <t.gummerer@gmail.com>
>     Date:   Thu May 14 09:16:39 2015 +0200
>
>         drm/i915: fix screen flickering

This is expected to land in v4.1-rc5, i.e. these are all upstream
commits. And I assume none of them apply to stable kernels directly.

>
>     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>     Author: Matt Roper <matthew.d.roper@intel.com>
>     Date:   Mon Mar 9 10:19:24 2015 -0700
>
>         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
> Cc: stable@vger.kernel.org

I (and most likely the stable team) would like to know which stable
kernel versions this is targeting.

Do you have Tested-bys against the stable versions you're targeting?

Anyway this is

Acked-by: Jani Nikula <jani.nikula@intel.com>


BR,
Jani.

> Cc: Dave Airlie <airlied@gmail.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 24d77dd..3d67f8e 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
>  	enum pipe pipe = intel_crtc->pipe;
>  	struct drm_plane *plane;
>  
> -	if (!intel_crtc_active(crtc))
> +	if (!intel_crtc->active)
>  		return;
>  
>  	p->active = true;
>  	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
>  	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
> -	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> +
> +
> +	if (crtc->primary->fb)
> +		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> +	else
> +		p->pri.bytes_per_pixel = 4;
> +
>  	p->cur.bytes_per_pixel = 4;
> +
>  	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
> -	p->cur.horiz_pixels = intel_crtc->cursor_width;
> +	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
> +
>  	/* TODO: for now, assume primary and cursor planes are always enabled. */
>  	p->pri.enabled = true;
>  	p->cur.enabled = true;
> -- 
> 2.1.0
>

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-20 13:53   ` Jani Nikula
  0 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2015-05-20 13:53 UTC (permalink / raw)
  To: intel-gfx; +Cc: Ander Conselvan de Oliveira, stable, Dave Airlie

On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> On Fedora 21 or 22, when the transition from the X server to the wayland
> compositor is done, the CRTC with the login screen is left active with a
> disabled fb. A cursor ioctl after the transition causes the watermarks
> to be updated, but due to the logic in intel_crtc_active() checking for
> the primary plane fb, the update considers all planes to be disabled,
> untimately setting the wrong watermark values and causing screen
> flicker. Since the crtc is active, a modeset done later is skipped and
> replaced with a flip, which doesn't update the watermarks.
>
> This regression was introduced somewhere between v3.16 and v3.17.
> Another issue prevented me from doing a full bisect, but the issue was
> introduced in one of the following skipped commits:
>
>     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>     Author: Rob Clark <robdclark@gmail.com>
>     Date:   Thu Jul 17 23:30:04 2014 -0400
>
>         drm/i915: use helpers
>
>     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>     Merge: c7dbc6c 3488229
>     Author: Dave Airlie <airlied@redhat.com>
>     Date:   Wed Jul 9 10:38:42 2014 +1000
>
>         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>
>     commit c51f71679042a5f388d9580ffbede14c897f1e86
>     Merge: b957f45 7b3c29f
>     Author: Dave Airlie <airlied@redhat.com>
>     Date:   Sat Jul 19 16:43:41 2014 +1000
>
>         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>
> This patch is a simplified version of the following commits:
>
>     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>     Author: Matt Roper <matthew.d.roper@intel.com>
>     Date:   Fri Feb 27 10:12:00 2015 -0800
>
>         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>
>     commit 54da691deb123c045259ebf4f5c67381244f58f1
>     Author: Thomas Gummerer <t.gummerer@gmail.com>
>     Date:   Thu May 14 09:16:39 2015 +0200
>
>         drm/i915: fix screen flickering

This is expected to land in v4.1-rc5, i.e. these are all upstream
commits. And I assume none of them apply to stable kernels directly.

>
>     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>     Author: Matt Roper <matthew.d.roper@intel.com>
>     Date:   Mon Mar 9 10:19:24 2015 -0700
>
>         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
> Cc: stable@vger.kernel.org

I (and most likely the stable team) would like to know which stable
kernel versions this is targeting.

Do you have Tested-bys against the stable versions you're targeting?

Anyway this is

Acked-by: Jani Nikula <jani.nikula@intel.com>


BR,
Jani.

> Cc: Dave Airlie <airlied@gmail.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 24d77dd..3d67f8e 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
>  	enum pipe pipe = intel_crtc->pipe;
>  	struct drm_plane *plane;
>  
> -	if (!intel_crtc_active(crtc))
> +	if (!intel_crtc->active)
>  		return;
>  
>  	p->active = true;
>  	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
>  	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
> -	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> +
> +
> +	if (crtc->primary->fb)
> +		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> +	else
> +		p->pri.bytes_per_pixel = 4;
> +
>  	p->cur.bytes_per_pixel = 4;
> +
>  	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
> -	p->cur.horiz_pixels = intel_crtc->cursor_width;
> +	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
> +
>  	/* TODO: for now, assume primary and cursor planes are always enabled. */
>  	p->pri.enabled = true;
>  	p->cur.enabled = true;
> -- 
> 2.1.0
>

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-20 13:53   ` Jani Nikula
  (?)
@ 2015-05-20 14:14   ` Josh Boyer
  2015-05-20 17:29     ` Ray Strode
  -1 siblings, 1 reply; 12+ messages in thread
From: Josh Boyer @ 2015-05-20 14:14 UTC (permalink / raw)
  To: Jani Nikula
  Cc: Ander Conselvan de Oliveira, Intel Graphics Development, stable,
	Dave Airlie, Ray Strode, Stephen Gallagher

On Wed, May 20, 2015 at 9:53 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
>> On Fedora 21 or 22, when the transition from the X server to the wayland
>> compositor is done, the CRTC with the login screen is left active with a
>> disabled fb. A cursor ioctl after the transition causes the watermarks
>> to be updated, but due to the logic in intel_crtc_active() checking for
>> the primary plane fb, the update considers all planes to be disabled,
>> untimately setting the wrong watermark values and causing screen
>> flicker. Since the crtc is active, a modeset done later is skipped and
>> replaced with a flip, which doesn't update the watermarks.
>>
>> This regression was introduced somewhere between v3.16 and v3.17.
>> Another issue prevented me from doing a full bisect, but the issue was
>> introduced in one of the following skipped commits:
>>
>>     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>>     Author: Rob Clark <robdclark@gmail.com>
>>     Date:   Thu Jul 17 23:30:04 2014 -0400
>>
>>         drm/i915: use helpers
>>
>>     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>>     Merge: c7dbc6c 3488229
>>     Author: Dave Airlie <airlied@redhat.com>
>>     Date:   Wed Jul 9 10:38:42 2014 +1000
>>
>>         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>>
>>     commit c51f71679042a5f388d9580ffbede14c897f1e86
>>     Merge: b957f45 7b3c29f
>>     Author: Dave Airlie <airlied@redhat.com>
>>     Date:   Sat Jul 19 16:43:41 2014 +1000
>>
>>         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>>
>> This patch is a simplified version of the following commits:
>>
>>     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>>     Author: Matt Roper <matthew.d.roper@intel.com>
>>     Date:   Fri Feb 27 10:12:00 2015 -0800
>>
>>         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>>
>>     commit 54da691deb123c045259ebf4f5c67381244f58f1
>>     Author: Thomas Gummerer <t.gummerer@gmail.com>
>>     Date:   Thu May 14 09:16:39 2015 +0200
>>
>>         drm/i915: fix screen flickering
>
> This is expected to land in v4.1-rc5, i.e. these are all upstream
> commits. And I assume none of them apply to stable kernels directly.
>
>>
>>     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>>     Author: Matt Roper <matthew.d.roper@intel.com>
>>     Date:   Mon Mar 9 10:19:24 2015 -0700
>>
>>         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
>> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
>> Cc: stable@vger.kernel.org
>
> I (and most likely the stable team) would like to know which stable
> kernel versions this is targeting.

I would guess 4.0.y for now.  Both Fedora 21 and 22 are using that
stable release, and it is most noticeable on Fedora 22 where we use
Wayland for the GDM session.

> Do you have Tested-bys against the stable versions you're targeting?

I've pointed a few people that have machines that hit this issue at
this patch and they're now CC'd.  Hopefully we can get some tests in
this week.

> Anyway this is
>
> Acked-by: Jani Nikula <jani.nikula@intel.com>

Thanks for the Ack.  Hopefully Greg doesn't immediately <formletter>
this one :).

josh

>> Cc: Dave Airlie <airlied@gmail.com>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
>>  1 file changed, 11 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 24d77dd..3d67f8e 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
>>       enum pipe pipe = intel_crtc->pipe;
>>       struct drm_plane *plane;
>>
>> -     if (!intel_crtc_active(crtc))
>> +     if (!intel_crtc->active)
>>               return;
>>
>>       p->active = true;
>>       p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
>>       p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
>> -     p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
>> +
>> +
>> +     if (crtc->primary->fb)
>> +             p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
>> +     else
>> +             p->pri.bytes_per_pixel = 4;
>> +
>>       p->cur.bytes_per_pixel = 4;
>> +
>>       p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
>> -     p->cur.horiz_pixels = intel_crtc->cursor_width;
>> +     p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
>> +
>>       /* TODO: for now, assume primary and cursor planes are always enabled. */
>>       p->pri.enabled = true;
>>       p->cur.enabled = true;
>> --
>> 2.1.0
>>
>
> --
> Jani Nikula, Intel Open Source Technology Center
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-20 14:14   ` Josh Boyer
@ 2015-05-20 17:29     ` Ray Strode
  0 siblings, 0 replies; 12+ messages in thread
From: Ray Strode @ 2015-05-20 17:29 UTC (permalink / raw)
  To: Josh Boyer
  Cc: Jani Nikula, Ander Conselvan de Oliveira,
	Intel Graphics Development, stable, Dave Airlie,
	Stephen Gallagher

Hi,

> I've pointed a few people that have machines that hit this issue at
> this patch and they're now CC'd.  Hopefully we can get some tests in
> this week.
The machine I had access to no longer flickers in wayland and no
longer leaves mouse trails in X after applying this patch on top of
the f22 kernel.

--Ray

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-20 13:53   ` Jani Nikula
@ 2015-05-21  7:21     ` Ander Conselvan De Oliveira
  -1 siblings, 0 replies; 12+ messages in thread
From: Ander Conselvan De Oliveira @ 2015-05-21  7:21 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx, stable, Dave Airlie

On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> > On Fedora 21 or 22, when the transition from the X server to the wayland
> > compositor is done, the CRTC with the login screen is left active with a
> > disabled fb. A cursor ioctl after the transition causes the watermarks
> > to be updated, but due to the logic in intel_crtc_active() checking for
> > the primary plane fb, the update considers all planes to be disabled,
> > untimately setting the wrong watermark values and causing screen
> > flicker. Since the crtc is active, a modeset done later is skipped and
> > replaced with a flip, which doesn't update the watermarks.
> >
> > This regression was introduced somewhere between v3.16 and v3.17.
> > Another issue prevented me from doing a full bisect, but the issue was
> > introduced in one of the following skipped commits:
> >
> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
> >     Author: Rob Clark <robdclark@gmail.com>
> >     Date:   Thu Jul 17 23:30:04 2014 -0400
> >
> >         drm/i915: use helpers
> >
> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
> >     Merge: c7dbc6c 3488229
> >     Author: Dave Airlie <airlied@redhat.com>
> >     Date:   Wed Jul 9 10:38:42 2014 +1000
> >
> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
> >
> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
> >     Merge: b957f45 7b3c29f
> >     Author: Dave Airlie <airlied@redhat.com>
> >     Date:   Sat Jul 19 16:43:41 2014 +1000
> >
> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
> >
> > This patch is a simplified version of the following commits:
> >
> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
> >     Author: Matt Roper <matthew.d.roper@intel.com>
> >     Date:   Fri Feb 27 10:12:00 2015 -0800
> >
> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
> >
> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
> >     Date:   Thu May 14 09:16:39 2015 +0200
> >
> >         drm/i915: fix screen flickering
> 
> This is expected to land in v4.1-rc5, i.e. these are all upstream
> commits. And I assume none of them apply to stable kernels directly.

A lot of cherry-pick and some amending would be necessary, because of
the changes going on for the atomic conversion. Hence the approach here
was to capture just the important changes into this small patch.

> >
> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
> >     Author: Matt Roper <matthew.d.roper@intel.com>
> >     Date:   Mon Mar 9 10:19:24 2015 -0700
> >
> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
> > Cc: stable@vger.kernel.org
> 
> I (and most likely the stable team) would like to know which stable
> kernel versions this is targeting.

This is for 4.0.

> Do you have Tested-bys against the stable versions you're targeting?

Only my own testing so far. I guess Ray Strode's doesn't count since he
tested on top of Fedora's kernel?


> Anyway this is
> 
> Acked-by: Jani Nikula <jani.nikula@intel.com>

Thanks,
Ander

> 
> 
> BR,
> Jani.
> 
> > Cc: Dave Airlie <airlied@gmail.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
> >  1 file changed, 11 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 24d77dd..3d67f8e 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
> >  	enum pipe pipe = intel_crtc->pipe;
> >  	struct drm_plane *plane;
> >  
> > -	if (!intel_crtc_active(crtc))
> > +	if (!intel_crtc->active)
> >  		return;
> >  
> >  	p->active = true;
> >  	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
> >  	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
> > -	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> > +
> > +
> > +	if (crtc->primary->fb)
> > +		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> > +	else
> > +		p->pri.bytes_per_pixel = 4;
> > +
> >  	p->cur.bytes_per_pixel = 4;
> > +
> >  	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
> > -	p->cur.horiz_pixels = intel_crtc->cursor_width;
> > +	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
> > +
> >  	/* TODO: for now, assume primary and cursor planes are always enabled. */
> >  	p->pri.enabled = true;
> >  	p->cur.enabled = true;
> > -- 
> > 2.1.0
> >
> 



^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-21  7:21     ` Ander Conselvan De Oliveira
  0 siblings, 0 replies; 12+ messages in thread
From: Ander Conselvan De Oliveira @ 2015-05-21  7:21 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx, stable

On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> > On Fedora 21 or 22, when the transition from the X server to the wayland
> > compositor is done, the CRTC with the login screen is left active with a
> > disabled fb. A cursor ioctl after the transition causes the watermarks
> > to be updated, but due to the logic in intel_crtc_active() checking for
> > the primary plane fb, the update considers all planes to be disabled,
> > untimately setting the wrong watermark values and causing screen
> > flicker. Since the crtc is active, a modeset done later is skipped and
> > replaced with a flip, which doesn't update the watermarks.
> >
> > This regression was introduced somewhere between v3.16 and v3.17.
> > Another issue prevented me from doing a full bisect, but the issue was
> > introduced in one of the following skipped commits:
> >
> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
> >     Author: Rob Clark <robdclark@gmail.com>
> >     Date:   Thu Jul 17 23:30:04 2014 -0400
> >
> >         drm/i915: use helpers
> >
> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
> >     Merge: c7dbc6c 3488229
> >     Author: Dave Airlie <airlied@redhat.com>
> >     Date:   Wed Jul 9 10:38:42 2014 +1000
> >
> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
> >
> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
> >     Merge: b957f45 7b3c29f
> >     Author: Dave Airlie <airlied@redhat.com>
> >     Date:   Sat Jul 19 16:43:41 2014 +1000
> >
> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
> >
> > This patch is a simplified version of the following commits:
> >
> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
> >     Author: Matt Roper <matthew.d.roper@intel.com>
> >     Date:   Fri Feb 27 10:12:00 2015 -0800
> >
> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
> >
> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
> >     Date:   Thu May 14 09:16:39 2015 +0200
> >
> >         drm/i915: fix screen flickering
> 
> This is expected to land in v4.1-rc5, i.e. these are all upstream
> commits. And I assume none of them apply to stable kernels directly.

A lot of cherry-pick and some amending would be necessary, because of
the changes going on for the atomic conversion. Hence the approach here
was to capture just the important changes into this small patch.

> >
> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
> >     Author: Matt Roper <matthew.d.roper@intel.com>
> >     Date:   Mon Mar 9 10:19:24 2015 -0700
> >
> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
> > Cc: stable@vger.kernel.org
> 
> I (and most likely the stable team) would like to know which stable
> kernel versions this is targeting.

This is for 4.0.

> Do you have Tested-bys against the stable versions you're targeting?

Only my own testing so far. I guess Ray Strode's doesn't count since he
tested on top of Fedora's kernel?


> Anyway this is
> 
> Acked-by: Jani Nikula <jani.nikula@intel.com>

Thanks,
Ander

> 
> 
> BR,
> Jani.
> 
> > Cc: Dave Airlie <airlied@gmail.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
> >  1 file changed, 11 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 24d77dd..3d67f8e 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
> >  	enum pipe pipe = intel_crtc->pipe;
> >  	struct drm_plane *plane;
> >  
> > -	if (!intel_crtc_active(crtc))
> > +	if (!intel_crtc->active)
> >  		return;
> >  
> >  	p->active = true;
> >  	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
> >  	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
> > -	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> > +
> > +
> > +	if (crtc->primary->fb)
> > +		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
> > +	else
> > +		p->pri.bytes_per_pixel = 4;
> > +
> >  	p->cur.bytes_per_pixel = 4;
> > +
> >  	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
> > -	p->cur.horiz_pixels = intel_crtc->cursor_width;
> > +	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
> > +
> >  	/* TODO: for now, assume primary and cursor planes are always enabled. */
> >  	p->pri.enabled = true;
> >  	p->cur.enabled = true;
> > -- 
> > 2.1.0
> >
> 


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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-21  7:21     ` Ander Conselvan De Oliveira
@ 2015-05-21 12:20       ` Josh Boyer
  -1 siblings, 0 replies; 12+ messages in thread
From: Josh Boyer @ 2015-05-21 12:20 UTC (permalink / raw)
  To: Ander Conselvan De Oliveira
  Cc: Jani Nikula, Intel Graphics Development, stable, Dave Airlie

On Thu, May 21, 2015 at 3:21 AM, Ander Conselvan De Oliveira
<conselvan2@gmail.com> wrote:
> On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
>> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
>> > On Fedora 21 or 22, when the transition from the X server to the wayland
>> > compositor is done, the CRTC with the login screen is left active with a
>> > disabled fb. A cursor ioctl after the transition causes the watermarks
>> > to be updated, but due to the logic in intel_crtc_active() checking for
>> > the primary plane fb, the update considers all planes to be disabled,
>> > untimately setting the wrong watermark values and causing screen
>> > flicker. Since the crtc is active, a modeset done later is skipped and
>> > replaced with a flip, which doesn't update the watermarks.
>> >
>> > This regression was introduced somewhere between v3.16 and v3.17.
>> > Another issue prevented me from doing a full bisect, but the issue was
>> > introduced in one of the following skipped commits:
>> >
>> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>> >     Author: Rob Clark <robdclark@gmail.com>
>> >     Date:   Thu Jul 17 23:30:04 2014 -0400
>> >
>> >         drm/i915: use helpers
>> >
>> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>> >     Merge: c7dbc6c 3488229
>> >     Author: Dave Airlie <airlied@redhat.com>
>> >     Date:   Wed Jul 9 10:38:42 2014 +1000
>> >
>> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>> >
>> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
>> >     Merge: b957f45 7b3c29f
>> >     Author: Dave Airlie <airlied@redhat.com>
>> >     Date:   Sat Jul 19 16:43:41 2014 +1000
>> >
>> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>> >
>> > This patch is a simplified version of the following commits:
>> >
>> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>> >     Date:   Fri Feb 27 10:12:00 2015 -0800
>> >
>> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>> >
>> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
>> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
>> >     Date:   Thu May 14 09:16:39 2015 +0200
>> >
>> >         drm/i915: fix screen flickering
>>
>> This is expected to land in v4.1-rc5, i.e. these are all upstream
>> commits. And I assume none of them apply to stable kernels directly.
>
> A lot of cherry-pick and some amending would be necessary, because of
> the changes going on for the atomic conversion. Hence the approach here
> was to capture just the important changes into this small patch.
>
>> >
>> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>> >     Date:   Mon Mar 9 10:19:24 2015 -0700
>> >
>> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>> >
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
>> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
>> > Cc: stable@vger.kernel.org
>>
>> I (and most likely the stable team) would like to know which stable
>> kernel versions this is targeting.
>
> This is for 4.0.
>
>> Do you have Tested-bys against the stable versions you're targeting?
>
> Only my own testing so far. I guess Ray Strode's doesn't count since he
> tested on top of Fedora's kernel?

Fedora's F22 kernel is based on 4.0.4 right now.  We only have two
minor patches on top of i915 that we carry.  One converts a warning to
a debug, the other disables the verbose state checks by default.
Neither patch would impact this functionality.  I think Ray's testing
counts, but it's up to upstream I guess.

josh

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-21 12:20       ` Josh Boyer
  0 siblings, 0 replies; 12+ messages in thread
From: Josh Boyer @ 2015-05-21 12:20 UTC (permalink / raw)
  To: Ander Conselvan De Oliveira
  Cc: Jani Nikula, Intel Graphics Development, stable

On Thu, May 21, 2015 at 3:21 AM, Ander Conselvan De Oliveira
<conselvan2@gmail.com> wrote:
> On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
>> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
>> > On Fedora 21 or 22, when the transition from the X server to the wayland
>> > compositor is done, the CRTC with the login screen is left active with a
>> > disabled fb. A cursor ioctl after the transition causes the watermarks
>> > to be updated, but due to the logic in intel_crtc_active() checking for
>> > the primary plane fb, the update considers all planes to be disabled,
>> > untimately setting the wrong watermark values and causing screen
>> > flicker. Since the crtc is active, a modeset done later is skipped and
>> > replaced with a flip, which doesn't update the watermarks.
>> >
>> > This regression was introduced somewhere between v3.16 and v3.17.
>> > Another issue prevented me from doing a full bisect, but the issue was
>> > introduced in one of the following skipped commits:
>> >
>> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>> >     Author: Rob Clark <robdclark@gmail.com>
>> >     Date:   Thu Jul 17 23:30:04 2014 -0400
>> >
>> >         drm/i915: use helpers
>> >
>> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>> >     Merge: c7dbc6c 3488229
>> >     Author: Dave Airlie <airlied@redhat.com>
>> >     Date:   Wed Jul 9 10:38:42 2014 +1000
>> >
>> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>> >
>> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
>> >     Merge: b957f45 7b3c29f
>> >     Author: Dave Airlie <airlied@redhat.com>
>> >     Date:   Sat Jul 19 16:43:41 2014 +1000
>> >
>> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>> >
>> > This patch is a simplified version of the following commits:
>> >
>> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>> >     Date:   Fri Feb 27 10:12:00 2015 -0800
>> >
>> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>> >
>> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
>> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
>> >     Date:   Thu May 14 09:16:39 2015 +0200
>> >
>> >         drm/i915: fix screen flickering
>>
>> This is expected to land in v4.1-rc5, i.e. these are all upstream
>> commits. And I assume none of them apply to stable kernels directly.
>
> A lot of cherry-pick and some amending would be necessary, because of
> the changes going on for the atomic conversion. Hence the approach here
> was to capture just the important changes into this small patch.
>
>> >
>> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>> >     Date:   Mon Mar 9 10:19:24 2015 -0700
>> >
>> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>> >
>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
>> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
>> > Cc: stable@vger.kernel.org
>>
>> I (and most likely the stable team) would like to know which stable
>> kernel versions this is targeting.
>
> This is for 4.0.
>
>> Do you have Tested-bys against the stable versions you're targeting?
>
> Only my own testing so far. I guess Ray Strode's doesn't count since he
> tested on top of Fedora's kernel?

Fedora's F22 kernel is based on 4.0.4 right now.  We only have two
minor patches on top of i915 that we carry.  One converts a warning to
a debug, the other disables the verbose state checks by default.
Neither patch would impact this functionality.  I think Ray's testing
counts, but it's up to upstream I guess.

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
  2015-05-21 12:20       ` Josh Boyer
@ 2015-05-21 12:40         ` Jani Nikula
  -1 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2015-05-21 12:40 UTC (permalink / raw)
  To: Josh Boyer, Ander Conselvan De Oliveira
  Cc: Intel Graphics Development, stable, Dave Airlie

On Thu, 21 May 2015, Josh Boyer <jwboyer@fedoraproject.org> wrote:
> On Thu, May 21, 2015 at 3:21 AM, Ander Conselvan De Oliveira
> <conselvan2@gmail.com> wrote:
>> On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
>>> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
>>> > On Fedora 21 or 22, when the transition from the X server to the wayland
>>> > compositor is done, the CRTC with the login screen is left active with a
>>> > disabled fb. A cursor ioctl after the transition causes the watermarks
>>> > to be updated, but due to the logic in intel_crtc_active() checking for
>>> > the primary plane fb, the update considers all planes to be disabled,
>>> > untimately setting the wrong watermark values and causing screen
>>> > flicker. Since the crtc is active, a modeset done later is skipped and
>>> > replaced with a flip, which doesn't update the watermarks.
>>> >
>>> > This regression was introduced somewhere between v3.16 and v3.17.
>>> > Another issue prevented me from doing a full bisect, but the issue was
>>> > introduced in one of the following skipped commits:
>>> >
>>> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>>> >     Author: Rob Clark <robdclark@gmail.com>
>>> >     Date:   Thu Jul 17 23:30:04 2014 -0400
>>> >
>>> >         drm/i915: use helpers
>>> >
>>> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>>> >     Merge: c7dbc6c 3488229
>>> >     Author: Dave Airlie <airlied@redhat.com>
>>> >     Date:   Wed Jul 9 10:38:42 2014 +1000
>>> >
>>> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>>> >
>>> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
>>> >     Merge: b957f45 7b3c29f
>>> >     Author: Dave Airlie <airlied@redhat.com>
>>> >     Date:   Sat Jul 19 16:43:41 2014 +1000
>>> >
>>> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>>> >
>>> > This patch is a simplified version of the following commits:
>>> >
>>> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>>> >     Date:   Fri Feb 27 10:12:00 2015 -0800
>>> >
>>> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>>> >
>>> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
>>> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
>>> >     Date:   Thu May 14 09:16:39 2015 +0200
>>> >
>>> >         drm/i915: fix screen flickering
>>>
>>> This is expected to land in v4.1-rc5, i.e. these are all upstream
>>> commits. And I assume none of them apply to stable kernels directly.
>>
>> A lot of cherry-pick and some amending would be necessary, because of
>> the changes going on for the atomic conversion. Hence the approach here
>> was to capture just the important changes into this small patch.
>>
>>> >
>>> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>>> >     Date:   Mon Mar 9 10:19:24 2015 -0700
>>> >
>>> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>>> >
>>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
>>> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
>>> > Cc: stable@vger.kernel.org
>>>
>>> I (and most likely the stable team) would like to know which stable
>>> kernel versions this is targeting.
>>
>> This is for 4.0.
>>
>>> Do you have Tested-bys against the stable versions you're targeting?
>>
>> Only my own testing so far. I guess Ray Strode's doesn't count since he
>> tested on top of Fedora's kernel?
>
> Fedora's F22 kernel is based on 4.0.4 right now.  We only have two
> minor patches on top of i915 that we carry.  One converts a warning to
> a debug, the other disables the verbose state checks by default.
> Neither patch would impact this functionality.  I think Ray's testing
> counts, but it's up to upstream I guess.

Up to the stable team, really...

BR,
Jani.


>
> josh

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled
@ 2015-05-21 12:40         ` Jani Nikula
  0 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2015-05-21 12:40 UTC (permalink / raw)
  To: Josh Boyer, Ander Conselvan De Oliveira
  Cc: Intel Graphics Development, stable, Dave Airlie

On Thu, 21 May 2015, Josh Boyer <jwboyer@fedoraproject.org> wrote:
> On Thu, May 21, 2015 at 3:21 AM, Ander Conselvan De Oliveira
> <conselvan2@gmail.com> wrote:
>> On Wed, 2015-05-20 at 16:53 +0300, Jani Nikula wrote:
>>> On Wed, 20 May 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
>>> > On Fedora 21 or 22, when the transition from the X server to the wayland
>>> > compositor is done, the CRTC with the login screen is left active with a
>>> > disabled fb. A cursor ioctl after the transition causes the watermarks
>>> > to be updated, but due to the logic in intel_crtc_active() checking for
>>> > the primary plane fb, the update considers all planes to be disabled,
>>> > untimately setting the wrong watermark values and causing screen
>>> > flicker. Since the crtc is active, a modeset done later is skipped and
>>> > replaced with a flip, which doesn't update the watermarks.
>>> >
>>> > This regression was introduced somewhere between v3.16 and v3.17.
>>> > Another issue prevented me from doing a full bisect, but the issue was
>>> > introduced in one of the following skipped commits:
>>> >
>>> >     commit 7707e6535f43328e05e4729ac96eee864b90e8a4
>>> >     Author: Rob Clark <robdclark@gmail.com>
>>> >     Date:   Thu Jul 17 23:30:04 2014 -0400
>>> >
>>> >         drm/i915: use helpers
>>> >
>>> >     commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
>>> >     Merge: c7dbc6c 3488229
>>> >     Author: Dave Airlie <airlied@redhat.com>
>>> >     Date:   Wed Jul 9 10:38:42 2014 +1000
>>> >
>>> >         Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
>>> >
>>> >     commit c51f71679042a5f388d9580ffbede14c897f1e86
>>> >     Merge: b957f45 7b3c29f
>>> >     Author: Dave Airlie <airlied@redhat.com>
>>> >     Date:   Sat Jul 19 16:43:41 2014 +1000
>>> >
>>> >         Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
>>> >
>>> > This patch is a simplified version of the following commits:
>>> >
>>> >     commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
>>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>>> >     Date:   Fri Feb 27 10:12:00 2015 -0800
>>> >
>>> >         drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
>>> >
>>> >     commit 54da691deb123c045259ebf4f5c67381244f58f1
>>> >     Author: Thomas Gummerer <t.gummerer@gmail.com>
>>> >     Date:   Thu May 14 09:16:39 2015 +0200
>>> >
>>> >         drm/i915: fix screen flickering
>>>
>>> This is expected to land in v4.1-rc5, i.e. these are all upstream
>>> commits. And I assume none of them apply to stable kernels directly.
>>
>> A lot of cherry-pick and some amending would be necessary, because of
>> the changes going on for the atomic conversion. Hence the approach here
>> was to capture just the important changes into this small patch.
>>
>>> >
>>> >     commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
>>> >     Author: Matt Roper <matthew.d.roper@intel.com>
>>> >     Date:   Mon Mar 9 10:19:24 2015 -0700
>>> >
>>> >         drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
>>> >
>>> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
>>> > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
>>> > Cc: stable@vger.kernel.org
>>>
>>> I (and most likely the stable team) would like to know which stable
>>> kernel versions this is targeting.
>>
>> This is for 4.0.
>>
>>> Do you have Tested-bys against the stable versions you're targeting?
>>
>> Only my own testing so far. I guess Ray Strode's doesn't count since he
>> tested on top of Fedora's kernel?
>
> Fedora's F22 kernel is based on 4.0.4 right now.  We only have two
> minor patches on top of i915 that we carry.  One converts a warning to
> a debug, the other disables the verbose state checks by default.
> Neither patch would impact this functionality.  I think Ray's testing
> counts, but it's up to upstream I guess.

Up to the stable team, really...

BR,
Jani.


>
> josh

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-05-21 12:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-20 13:32 [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane is disabled Ander Conselvan de Oliveira
2015-05-20 13:32 ` Ander Conselvan de Oliveira
2015-05-20 13:53 ` Jani Nikula
2015-05-20 13:53   ` Jani Nikula
2015-05-20 14:14   ` Josh Boyer
2015-05-20 17:29     ` Ray Strode
2015-05-21  7:21   ` Ander Conselvan De Oliveira
2015-05-21  7:21     ` Ander Conselvan De Oliveira
2015-05-21 12:20     ` Josh Boyer
2015-05-21 12:20       ` Josh Boyer
2015-05-21 12:40       ` Jani Nikula
2015-05-21 12:40         ` Jani Nikula

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.