drm/nouveau: fix locking issues in page flipping paths

Browse source

b580c9e2b7 introduced additional problems
while trying to solve issues that became apparent while porting to the
new reservation stuff.

The major problem was that the the previously mentioned patch took the
client mutex earlier than previously, but the pinning of new_bo can
can potentially cause a buffer move, which would result in attempting to
acquire the same mutex again.

This commit attempts to fix that "fix".

Thanks to Maarten for the tips on keeping lockdep happy and cooking :)

Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

...

This commit is contained in:

Ben Skeggs 2013-07-08 14:15:51 +10:00

parent 06d5a24f08

commit 060810d7ab

3 changed files with 22 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

53

drivers/gpu/drm/nouveau/nouveau_display.c

View file

3

drivers/gpu/drm/nouveau/nouveau_drm.c

View file