* [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
@ 2015-09-22 14:26 Maarten Lankhorst
2015-09-23 9:01 ` Jani Nikula
2015-10-13 12:36 ` Jani Nikula
0 siblings, 2 replies; 6+ messages in thread
From: Maarten Lankhorst @ 2015-09-22 14:26 UTC (permalink / raw)
To: intel-gfx
Nothing good can come from detaching scalers or updating pipe config
when the crtc is already disabled. Touching registers while the crtc
and power wells are disabled causes unclaimed register access warnings.
Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a4c24e6f5d6f..5a68290bf8c6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
/* Perform vblank evasion around commit operation */
intel_pipe_update_start(intel_crtc);
- if (modeset)
+ if (modeset || !crtc->state->active)
return;
if (to_intel_crtc_state(crtc->state)->update_pipe)
--
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] 6+ messages in thread
* Re: [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
2015-09-23 9:01 ` Jani Nikula
@ 2015-09-23 9:00 ` Maarten Lankhorst
2015-09-23 10:33 ` Jani Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Maarten Lankhorst @ 2015-09-23 9:00 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Op 23-09-15 om 11:01 schreef Jani Nikula:
> On Tue, 22 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
>> Nothing good can come from detaching scalers or updating pipe config
>> when the crtc is already disabled. Touching registers while the crtc
>> and power wells are disabled causes unclaimed register access warnings.
> -fixes maintainer grumble. How am I supposed to decipher from this
> Subject: line and commit message whether this is a real fix to a real
> problem out there, and therefore to be queued for current -rc
> development kernels and possibly cc: stable, or not?
>
> When in doubt, I usually shrug it off, and decide it's for
> drm-intel-next-queued, and therefore SEP.
>
It's for v4.3, so -fixes. Should I explicitly mention it in the commit message next time?
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
2015-09-22 14:26 [PATCH] drm/i915: Do not update pipe state when crtc is inactive Maarten Lankhorst
@ 2015-09-23 9:01 ` Jani Nikula
2015-09-23 9:00 ` Maarten Lankhorst
2015-10-13 12:36 ` Jani Nikula
1 sibling, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2015-09-23 9:01 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx
On Tue, 22 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> Nothing good can come from detaching scalers or updating pipe config
> when the crtc is already disabled. Touching registers while the crtc
> and power wells are disabled causes unclaimed register access warnings.
-fixes maintainer grumble. How am I supposed to decipher from this
Subject: line and commit message whether this is a real fix to a real
problem out there, and therefore to be queued for current -rc
development kernels and possibly cc: stable, or not?
When in doubt, I usually shrug it off, and decide it's for
drm-intel-next-queued, and therefore SEP.
BR,
Jani.
>
> Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a4c24e6f5d6f..5a68290bf8c6 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> /* Perform vblank evasion around commit operation */
> intel_pipe_update_start(intel_crtc);
>
> - if (modeset)
> + if (modeset || !crtc->state->active)
> return;
>
> if (to_intel_crtc_state(crtc->state)->update_pipe)
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
2015-09-23 9:00 ` Maarten Lankhorst
@ 2015-09-23 10:33 ` Jani Nikula
2015-09-23 15:56 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2015-09-23 10:33 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx
On Wed, 23 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> Op 23-09-15 om 11:01 schreef Jani Nikula:
>> On Tue, 22 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
>>> Nothing good can come from detaching scalers or updating pipe config
>>> when the crtc is already disabled. Touching registers while the crtc
>>> and power wells are disabled causes unclaimed register access warnings.
>> -fixes maintainer grumble. How am I supposed to decipher from this
>> Subject: line and commit message whether this is a real fix to a real
>> problem out there, and therefore to be queued for current -rc
>> development kernels and possibly cc: stable, or not?
>>
>> When in doubt, I usually shrug it off, and decide it's for
>> drm-intel-next-queued, and therefore SEP.
>>
> It's for v4.3, so -fixes. Should I explicitly mention it in the commit
> message next time?
If you have that information, please do. If not in the commit message,
then either as a comment after the --- line or in the subject as [PATCH
for v4.3] or something. Otherwise you'll be relying on my competence too
much. ;)
BR,
Jani.
>
> ~Maarten
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
2015-09-23 10:33 ` Jani Nikula
@ 2015-09-23 15:56 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2015-09-23 15:56 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Wed, Sep 23, 2015 at 01:33:29PM +0300, Jani Nikula wrote:
> On Wed, 23 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> > Op 23-09-15 om 11:01 schreef Jani Nikula:
> >> On Tue, 22 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> >>> Nothing good can come from detaching scalers or updating pipe config
> >>> when the crtc is already disabled. Touching registers while the crtc
> >>> and power wells are disabled causes unclaimed register access warnings.
> >> -fixes maintainer grumble. How am I supposed to decipher from this
> >> Subject: line and commit message whether this is a real fix to a real
> >> problem out there, and therefore to be queued for current -rc
> >> development kernels and possibly cc: stable, or not?
> >>
> >> When in doubt, I usually shrug it off, and decide it's for
> >> drm-intel-next-queued, and therefore SEP.
> >>
> > It's for v4.3, so -fixes. Should I explicitly mention it in the commit
> > message next time?
>
> If you have that information, please do. If not in the commit message,
> then either as a comment after the --- line or in the subject as [PATCH
> for v4.3] or something. Otherwise you'll be relying on my competence too
> much. ;)
What you really should do is mention which commit broke stuff and if
applicable, add a Bugzilla: link. That's required information anyway for
regression fixes, and we have maintainer scripts to tell us where to place
the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Do not update pipe state when crtc is inactive.
2015-09-22 14:26 [PATCH] drm/i915: Do not update pipe state when crtc is inactive Maarten Lankhorst
2015-09-23 9:01 ` Jani Nikula
@ 2015-10-13 12:36 ` Jani Nikula
1 sibling, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2015-10-13 12:36 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx
On Tue, 22 Sep 2015, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> Nothing good can come from detaching scalers or updating pipe config
> when the crtc is already disabled. Touching registers while the crtc
> and power wells are disabled causes unclaimed register access warnings.
>
> Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Maarten, this patch has no reviews and it no longer applies to v4.3
cleanly. Please rebase and repost if it's still valid.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a4c24e6f5d6f..5a68290bf8c6 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> /* Perform vblank evasion around commit operation */
> intel_pipe_update_start(intel_crtc);
>
> - if (modeset)
> + if (modeset || !crtc->state->active)
> return;
>
> if (to_intel_crtc_state(crtc->state)->update_pipe)
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-13 12:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 14:26 [PATCH] drm/i915: Do not update pipe state when crtc is inactive Maarten Lankhorst
2015-09-23 9:01 ` Jani Nikula
2015-09-23 9:00 ` Maarten Lankhorst
2015-09-23 10:33 ` Jani Nikula
2015-09-23 15:56 ` Daniel Vetter
2015-10-13 12:36 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox