Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

Browse source

Again, nothing big this time. Mostly a new performance counter from
Christian, some more lockdep annotations from Guido and removal of
functionality that duplicates driver core from Robin.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/81367a99b8949584e5becd334ac001b9ad3dc37a.camel@pengutronix.de

...

This commit is contained in:

Dave Airlie 2020-12-03 13:25:09 +10:00

parent e6c7c9d01f 4612bad570

commit 5eb3c85e34

4 changed files with 59 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/etnaviv/etnaviv_drv.c

View file

1

drivers/gpu/drm/etnaviv/etnaviv_drv.h

View file

4

drivers/gpu/drm/etnaviv/etnaviv_mmu.c

View file

78

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c

View file