From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/5] drm/i915: Keep vblank irq enabled during vblank evasion.
Date: Mon, 12 Feb 2018 16:27:34 +0100 [thread overview]
Message-ID: <7025b8d6-182b-caa4-ead0-a930a4ae46b9@linux.intel.com> (raw)
In-Reply-To: <151844896649.18923.5061192328846431913@mail.alporthouse.com>
Op 12-02-18 om 16:22 schreef Chris Wilson:
> Quoting Maarten Lankhorst (2018-02-12 15:16:39)
>> Op 12-02-18 om 16:10 schreef Chris Wilson:
>>> Quoting Maarten Lankhorst (2018-02-09 09:54:00)
>>>> This is a nice preparation for grabbing the uncore lock during evasion.
>>>> Grabbing the spinlock with the lock held messes up the locking,
>>>> so it's easier to handover the reference to the eve
>>>>
>>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>>> ---
>>>> drivers/gpu/drm/i915/intel_sprite.c | 11 ++++-------
>>>> 1 file changed, 4 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
>>>> index 3be22c0fcfb5..971a1ea0db45 100644
>>>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>>>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>>>> @@ -109,10 +109,10 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
>>>>
>>>> local_irq_disable();
>>>>
>>>> - if (min <= 0 || max <= 0)
>>>> + if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
>>>> return;
>>>>
>>>> - if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
>>>> + if (min <= 0 || max <= 0)
>>>> return;
>>>>
>>> The corresponding vblank_put is the one later in update_start(), right?
>>> I don't think you intended to keep this chunk.
>>> -Chris
>> I'm not sure what you mean? The vblank_put is now in pipe_update_end, except if the
>> event takes over the reference. I think the code is correct. :)
> Then it's unbalanced in the case of error still.
> -Chris
It already would have been for events, hence the WARN_ON there.
I don't think we can do anything about it, this shouldn't ever
happen in practice, could be a BUG_ON for all I care. :)
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-02-12 15:27 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 9:53 [PATCH 0/5] drm/i915: Grab the vblank evasion lock around the entire evasion Maarten Lankhorst
2018-02-09 9:54 ` [PATCH 1/5] drm/i915: Keep vblank irq enabled during vblank evasion Maarten Lankhorst
2018-02-12 15:10 ` Chris Wilson
2018-02-12 15:16 ` Maarten Lankhorst
2018-02-12 15:22 ` Chris Wilson
2018-02-12 15:27 ` Maarten Lankhorst [this message]
2018-02-12 15:31 ` Chris Wilson
2018-02-12 15:41 ` Maarten Lankhorst
2018-02-12 16:55 ` Ville Syrjälä
2018-02-12 17:24 ` Chris Wilson
2018-02-12 18:06 ` Ville Syrjälä
2018-02-12 20:55 ` Chris Wilson
2018-02-13 8:59 ` Maarten Lankhorst
2018-02-09 9:54 ` [PATCH 2/5] drm/i915: Grab uncore.lock around enabling " Maarten Lankhorst
2018-02-12 15:16 ` Chris Wilson
2018-02-09 9:54 ` [PATCH 3/5] drm/i915: Call i915_pipe_update_start with uncore.lock held Maarten Lankhorst
2018-02-09 23:08 ` James Ausmus
2018-02-10 8:46 ` Maarten Lankhorst
2018-02-10 9:05 ` Chris Wilson
2018-02-12 15:19 ` Chris Wilson
2018-02-12 15:39 ` Maarten Lankhorst
2018-02-12 15:44 ` Chris Wilson
2018-02-12 16:41 ` Maarten Lankhorst
2018-02-09 9:54 ` [PATCH 4/5] drm/i915: Move all locking for plane updates to caller Maarten Lankhorst
2018-02-09 9:54 ` [PATCH 5/5] drm/i915: Use DOUBLE_BUFFER_CTL on top of vblank evasion for GEN9+ Maarten Lankhorst
2018-02-09 10:04 ` [PATCH 0/5] drm/i915: Grab the vblank evasion lock around the entire evasion Chris Wilson
2018-02-09 17:21 ` Maarten Lankhorst
2018-02-12 17:01 ` Ville Syrjälä
2018-02-13 10:19 ` Maarten Lankhorst
2018-02-13 10:40 ` Chris Wilson
2018-02-09 14:24 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-02-12 15:02 ` ✓ Fi.CI.BAT: success " Patchwork
2018-02-12 16:56 ` ✗ Fi.CI.IGT: warning " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7025b8d6-182b-caa4-ead0-a930a4ae46b9@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox