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

Most importantly per-process address spaces on GPUs that are capable of
providing proper isolation has finished baking. This is the base for
our softpin implementation, which allows us to support the texture
descriptor buffers used by GC7000 series GPUs without a major UAPI
extension/rework.

Shortlog of notable changes:
- code cleanup from Fabio
- fix performance counters on GC880 and GC2000 GPUs from Christian
- drmP.h header removal from Sam
- per process address space support on MMUv2 GPUs from me
- softpin support from me

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

diff --cc drivers/gpu/drm/etnaviv/etnaviv_drv.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem.h
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 998c96b,75afce4..aa3e4c3
--- 1/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
--- 2/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@@ -3,9 -3,15 +3,15 @@@
   * Copyright (C) 2015 Etnaviv Project
   */
  
+ #include <drm/drm_file.h>
  #include <linux/dma-fence-array.h>
 -#include <linux/reservation.h>
+ #include <linux/file.h>
+ #include <linux/pm_runtime.h>
 +#include <linux/dma-resv.h>
  #include <linux/sync_file.h>
+ #include <linux/uaccess.h>
+ #include <linux/vmalloc.h>
+ 
  #include "etnaviv_cmdbuf.h"
  #include "etnaviv_drv.h"
  #include "etnaviv_gpu.h"