diff mbox

[v12,5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state

Message ID 1471463761-26796-6-git-send-email-cpaul@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

cpaul@redhat.com Aug. 17, 2016, 7:55 p.m. UTC 
If we're enabling a pipe, we'll need to modify the watermarks on all
active planes. Since those planes won't be added to the state on
their own, we need to add them ourselves.

Signed-off-by: Lyude <cpaul@redhat.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Cc: stable@vger.kernel.org
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Mike Lothian Sept. 20, 2016, 6:38 p.m. UTC | #1 
Hi

I've bisected back to this commit in the drm-intel-nightly branch

05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
Author: Lyude <cpaul@redhat.com>
Date:   Wed Aug 17 15:55:57 2016 -0400

   drm/i915/skl: Ensure pipes with changed wms get added to the state

   If we're enabling a pipe, we'll need to modify the watermarks on all
   active planes. Since those planes won't be added to the state on
   their own, we need to add them ourselves.

   Signed-off-by: Lyude <cpaul@redhat.com>
   Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
   Cc: stable@vger.kernel.org
   Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
   Cc: Daniel Vetter <daniel.vetter@intel.com>
   Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
   Cc: Hans de Goede <hdegoede@redhat.com>
   Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
   Link:
http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com

The symptoms I'm seeing look like tearing at the top of the screen and it's
especially noticeable in Chrome - reverting this commit makes the issue go
away

Let me know if you'd like me to raise a bug

Cheers

Mike

On Wed, 17 Aug 2016 at 20:56 Lyude <cpaul@redhat.com> wrote:

> If we're enabling a pipe, we'll need to modify the watermarks on all
> active planes. Since those planes won't be added to the state on
> their own, we need to add them ourselves.
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> Cc: stable@vger.kernel.org
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index 849f039..a3d24cb 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4117,6 +4117,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
>                 ret = skl_allocate_pipe_ddb(cstate, ddb);
>                 if (ret)
>                         return ret;
> +
> +               ret = drm_atomic_add_affected_planes(state,
> &intel_crtc->base);
> +               if (ret)
> +                       return ret;
>         }
>
>         return 0;
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Mike Lothian Sept. 20, 2016, 6:45 p.m. UTC | #2 
Hi

I've bisected back to this commit in the drm-intel-nightly branch

05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
Author: Lyude <cpaul@redhat.com>
Date:   Wed Aug 17 15:55:57 2016 -0400

   drm/i915/skl: Ensure pipes with changed wms get added to the state

   If we're enabling a pipe, we'll need to modify the watermarks on all
   active planes. Since those planes won't be added to the state on
   their own, we need to add them ourselves.

   Signed-off-by: Lyude <cpaul@redhat.com>
   Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
   Cc: stable@vger.kernel.org
   Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
   Cc: Daniel Vetter <daniel.vetter@intel.com>
   Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
   Cc: Hans de Goede <hdegoede@redhat.com>
   Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
   Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com

The symptoms I'm seeing look like tearing at the top of the screen and
it's especially noticeable in Chrome - reverting this commit makes the
issue go away

Let me know if you'd like me to raise a bug

Cheers

Mike

(Re-sending from Gmail - as Inbox doesn't let me send as plain text)

On 17 August 2016 at 20:55, Lyude <cpaul@redhat.com> wrote:
> If we're enabling a pipe, we'll need to modify the watermarks on all
> active planes. Since those planes won't be added to the state on
> their own, we need to add them ourselves.
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> Cc: stable@vger.kernel.org
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 849f039..a3d24cb 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4117,6 +4117,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
>                 ret = skl_allocate_pipe_ddb(cstate, ddb);
>                 if (ret)
>                         return ret;
> +
> +               ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
> +               if (ret)
> +                       return ret;
>         }
>
>         return 0;
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst Sept. 21, 2016, 6:56 a.m. UTC | #3 
Hey,

Op 20-09-16 om 20:45 schreef Mike Lothian:
> Hi
>
> I've bisected back to this commit in the drm-intel-nightly branch
>
> 05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
> commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
> Author: Lyude <cpaul@redhat.com>
> Date:   Wed Aug 17 15:55:57 2016 -0400
>
>    drm/i915/skl: Ensure pipes with changed wms get added to the state
>
>    If we're enabling a pipe, we'll need to modify the watermarks on all
>    active planes. Since those planes won't be added to the state on
>    their own, we need to add them ourselves.
>
>    Signed-off-by: Lyude <cpaul@redhat.com>
>    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>    Cc: stable@vger.kernel.org
>    Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>    Cc: Daniel Vetter <daniel.vetter@intel.com>
>    Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>    Cc: Hans de Goede <hdegoede@redhat.com>
>    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>    Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com
>
> The symptoms I'm seeing look like tearing at the top of the screen and
> it's especially noticeable in Chrome - reverting this commit makes the
> issue go away
>
> Let me know if you'd like me to raise a bug
Please do so, it's nice to refer to when making a fix for it.

Could you attach the contents of /sys/kernel/debug/dri/0/i915_ddb_info for working and not-working in it?

~Maarten
Mike Lothian Sept. 21, 2016, 7:03 a.m. UTC | #4 
Will do.

On Wed, 21 Sep 2016 at 07:56 Maarten Lankhorst <
maarten.lankhorst@linux.intel.com> wrote:

> Hey,
>
> Op 20-09-16 om 20:45 schreef Mike Lothian:
> > Hi
> >
> > I've bisected back to this commit in the drm-intel-nightly branch
> >
> > 05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
> > commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
> > Author: Lyude <cpaul@redhat.com>
> > Date:   Wed Aug 17 15:55:57 2016 -0400
> >
> >    drm/i915/skl: Ensure pipes with changed wms get added to the state
> >
> >    If we're enabling a pipe, we'll need to modify the watermarks on all
> >    active planes. Since those planes won't be added to the state on
> >    their own, we need to add them ourselves.
> >
> >    Signed-off-by: Lyude <cpaul@redhat.com>
> >    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> >    Cc: stable@vger.kernel.org
> >    Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >    Cc: Daniel Vetter <daniel.vetter@intel.com>
> >    Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> >    Cc: Hans de Goede <hdegoede@redhat.com>
> >    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> >    Link:
> http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com
> >
> > The symptoms I'm seeing look like tearing at the top of the screen and
> > it's especially noticeable in Chrome - reverting this commit makes the
> > issue go away
> >
> > Let me know if you'd like me to raise a bug
> Please do so, it's nice to refer to when making a fix for it.
>
> Could you attach the contents of /sys/kernel/debug/dri/0/i915_ddb_info for
> working and not-working in it?
>
> ~Maarten
>
Mike Lothian Sept. 21, 2016, 11:34 a.m. UTC | #5 
I've raised https://bugs.freedesktop.org/show_bug.cgi?id=97888 I'll
attach the info you requested once I get back to my machine

On 21 September 2016 at 07:56, Maarten Lankhorst
<maarten.lankhorst@linux.intel.com> wrote:
> Hey,
>
> Op 20-09-16 om 20:45 schreef Mike Lothian:
>> Hi
>>
>> I've bisected back to this commit in the drm-intel-nightly branch
>>
>> 05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
>> commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
>> Author: Lyude <cpaul@redhat.com>
>> Date:   Wed Aug 17 15:55:57 2016 -0400
>>
>>    drm/i915/skl: Ensure pipes with changed wms get added to the state
>>
>>    If we're enabling a pipe, we'll need to modify the watermarks on all
>>    active planes. Since those planes won't be added to the state on
>>    their own, we need to add them ourselves.
>>
>>    Signed-off-by: Lyude <cpaul@redhat.com>
>>    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>>    Cc: stable@vger.kernel.org
>>    Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>    Cc: Daniel Vetter <daniel.vetter@intel.com>
>>    Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>>    Cc: Hans de Goede <hdegoede@redhat.com>
>>    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>    Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com
>>
>> The symptoms I'm seeing look like tearing at the top of the screen and
>> it's especially noticeable in Chrome - reverting this commit makes the
>> issue go away
>>
>> Let me know if you'd like me to raise a bug
> Please do so, it's nice to refer to when making a fix for it.
>
> Could you attach the contents of /sys/kernel/debug/dri/0/i915_ddb_info for working and not-working in it?
>
> ~Maarten
Mike Lothian Sept. 26, 2016, 1:57 p.m. UTC | #6 
Hi

Is there any chance this could be removed from the upcoming drm-4.9
pull, at least until this issue has been fixed

Regards

Mike

On 21 September 2016 at 12:34, Mike Lothian <mike@fireburn.co.uk> wrote:
> I've raised https://bugs.freedesktop.org/show_bug.cgi?id=97888 I'll
> attach the info you requested once I get back to my machine
>
> On 21 September 2016 at 07:56, Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com> wrote:
>> Hey,
>>
>> Op 20-09-16 om 20:45 schreef Mike Lothian:
>>> Hi
>>>
>>> I've bisected back to this commit in the drm-intel-nightly branch
>>>
>>> 05a76d3d6ad1ee9f9814f88949cc9305fc165460 is the first bad commit
>>> commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460
>>> Author: Lyude <cpaul@redhat.com>
>>> Date:   Wed Aug 17 15:55:57 2016 -0400
>>>
>>>    drm/i915/skl: Ensure pipes with changed wms get added to the state
>>>
>>>    If we're enabling a pipe, we'll need to modify the watermarks on all
>>>    active planes. Since those planes won't be added to the state on
>>>    their own, we need to add them ourselves.
>>>
>>>    Signed-off-by: Lyude <cpaul@redhat.com>
>>>    Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>>>    Cc: stable@vger.kernel.org
>>>    Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>>    Cc: Daniel Vetter <daniel.vetter@intel.com>
>>>    Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>>>    Cc: Hans de Goede <hdegoede@redhat.com>
>>>    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>>    Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com
>>>
>>> The symptoms I'm seeing look like tearing at the top of the screen and
>>> it's especially noticeable in Chrome - reverting this commit makes the
>>> issue go away
>>>
>>> Let me know if you'd like me to raise a bug
>> Please do so, it's nice to refer to when making a fix for it.
>>
>> Could you attach the contents of /sys/kernel/debug/dri/0/i915_ddb_info for working and not-working in it?
>>
>> ~Maarten
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 849f039..a3d24cb 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4117,6 +4117,10 @@  skl_compute_ddb(struct drm_atomic_state *state)
 		ret = skl_allocate_pipe_ddb(cstate, ddb);
 		if (ret)
 			return ret;
+
+		ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
+		if (ret)
+			return ret;
 	}
 
 	return 0;