drm/nouveau: Fix fallout from reservation object rework

Browse source

Commit 019cbd4a4f ("drm/nouveau: Initialize GEM object before TTM
object") introduced a subtle change in how the buffer allocation size is
handled. Prior to that change, the size would get aligned to at least a
page, whereas after that change a non-page-aligned size would get passed
through unmodified. This ultimately causes a BUG_ON() to trigger in
drm_gem_private_object_init() and crashes the system.

Fix this by restoring the code that align the allocation size.

Fixes: 019cbd4a4f ("drm/nouveau: Initialize GEM object before TTM object")
Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

...

This commit is contained in:

Thierry Reding 2019-09-16 16:19:23 +02:00 • committed by Ben Skeggs

parent 698c1aa9f8

commit 9ca7f7968b

4 changed files with 17 additions and 13 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

16

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

4

drivers/gpu/drm/nouveau/nouveau_bo.h

View file

3

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

7

drivers/gpu/drm/nouveau/nouveau_prime.c

View file