From: Alex Deucher <alexdeucher@gmail.com>
To: "Michel Dänzer" <michel@daenzer.net>
Cc: Alex Deucher <alexander.deucher@amd.com>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 1/2] drm/radeon: Don't hang in radeon_flip_work_func on disabled crtc. (v2)
Date: Fri, 19 Feb 2016 17:17:22 -0500 [thread overview]
Message-ID: <CADnq5_PQyoZHruurGUZRAfKVTeLMagD2NTDW94O3YSQQL_9Umg@mail.gmail.com> (raw)
In-Reply-To: <56C66CFA.8030809@daenzer.net>
On Thu, Feb 18, 2016 at 8:16 PM, Michel Dänzer <michel@daenzer.net> wrote:
> On 19.02.2016 10:06, Mario Kleiner wrote:
>> This fixes a regression introduced in Linux 4.4.
>>
>> Limit the amount of time radeon_flip_work_func can
>> delay programming a page flip, by both limiting the
>> maximum amount of time per wait cycle and the maximum
>> number of wait cycles. Continue the flip if the limit
>> is exceeded, even if that may result in a visual or
>> timing glitch.
>>
>> This is to prevent a hang of page flips, as reported
>> in fdo bug #93746: Disconnecting a DisplayPort display
>> in parallel to a kms pageflip getting queued can cause
>> the following hang of page flips and thereby an unusable
>> desktop:
>>
>> 1. kms pageflip ioctl() queues pageflip -> queues execution
>> of radeon_flip_work_func.
>>
>> 2. Hotunplug of display causes the driver to DPMS OFF
>> the unplugged display. Display engine shuts down,
>> scanout no longer moves, but stays at its resting
>> position at start line of vblank.
>>
>> 3. radeon_flip_work_func executes while crtc is off, and
>> due to the non-moving scanout position, the new flip
>> delay code introduced into Linux 4.4 by
>> commit 5b5561b3660d ("drm/radeon: Fixup hw vblank counter/ts..")
>> enters an infinite wait loop.
>>
>> 4. After reconnecting the display, the pageflip continues
>> to hang in 3. and the display doesn't update its view
>> of the desktop.
>>
>> This patch fixes the Linux 4.4 regression from fdo bug #93746
>>
>> <https://bugs.freedesktop.org/show_bug.cgi?id=93746>
>>
>> v2: Skip wait immediately if !radeon_crtc->enabled, as
>> suggested by Michel.
>>
>> Reported-by: Bernd Steinhauser <linux@bernd-steinhauser.de>
>> Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
>> Tested-by: Bernd Steinhauser <linux@bernd-steinhauser.de>
>>
>> Cc: <stable@vger.kernel.org> # 4.4+
>
> Both patches are
>
> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Applied. Thanks!
Alex
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-02-19 22:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 1:06 radeon/amdgpu pageflip regression fixes for Linux 4.4+ Mario Kleiner
2016-02-19 1:06 ` [PATCH 1/2] drm/radeon: Don't hang in radeon_flip_work_func on disabled crtc. (v2) Mario Kleiner
2016-02-19 1:16 ` Michel Dänzer
2016-02-19 22:17 ` Alex Deucher [this message]
2016-02-19 1:06 ` [PATCH 2/2] drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled crtc Mario Kleiner
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=CADnq5_PQyoZHruurGUZRAfKVTeLMagD2NTDW94O3YSQQL_9Umg@mail.gmail.com \
--to=alexdeucher@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=michel@daenzer.net \
/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;
as well as URLs for NNTP newsgroup(s).