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

Browse source

this cycle has been fairly calm in etnaviv land with most of the action
happening on the userspace side.

Notable changes:
- Improvements to CONFIG option handling to make it harder for users to
shoot themselves in the foot due to kernel misconfiguration.
- Tweaked GEM object population, so that userspace can take considerate
action when memory allocation fails, rather than waking the raging OOM
killer beast.

* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL
  drm/etnaviv: don't fail GPU bind when CONFIG_THERMAL isn't enabled
  drm/etnaviv: switch to drm_*{get,put} helpers
  drm/etnaviv: select CMA and DMA_CMA if available
  drm/etnaviv: populate GEM objects on cpu_prep
  drm/etnaviv: reduce allocation failure message severity
  drm/etnaviv: don't trigger OOM killer when page allocation fails

...

This commit is contained in:

Dave Airlie 2017-08-21 14:34:15 +10:00

parent a0aeb3b2ac 65375b873c

commit e5fa05b96b

6 changed files with 37 additions and 32 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/etnaviv/Kconfig

View file

8

drivers/gpu/drm/etnaviv/etnaviv_drv.c

View file

45

drivers/gpu/drm/etnaviv/etnaviv_gem.c

View file

2

drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

View file

4

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

View file

8

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

View file