Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next

Browse source

A couple of fixes from Thierry fixing issues as a result of the
reservation object rework in this cycle, as well as a fix from Lyude
to allow the driver to load on Thinkpad P71.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5bLthhq7kh04A0JKxGnBdOTCxiu0hs7FZ1x3_9Rc9YoA@mail.gmail.com

...

This commit is contained in:

Dave Airlie 2019-09-17 16:31:30 +10:00

parent 023941cf28 b568db62c5

commit 945b584c94

6 changed files with 41 additions and 27 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

3

drivers/gpu/drm/nouveau/dispnv50/disp.c

View file

26

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

4

drivers/gpu/drm/nouveau/nouveau_bo.h

View file

7

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

27

drivers/gpu/drm/nouveau/nouveau_prime.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c

View file