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

Browse source

Disable perfmon ioctls for now in etnaviv

* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: short-circuit perfmon ioctls
  Revert "drm/etnaviv: submit supports performance monitor requests"

...

This commit is contained in:

Dave Airlie 2017-10-24 16:58:39 +10:00

parent fef1aa48f4 330b52bd9b

commit fb9775aab2

1 changed files with 7 additions and 1 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

8

drivers/gpu/drm/etnaviv/etnaviv_drv.c

View file