From: Dave Airlie <airlied@redhat.com>
Date: Thu, 22 Aug 2019 03:21:16 +0000 (+1000)
Subject: Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm... 
X-Git-Tag: v5.4-rc1~106^2~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae4530062620561d24683b1bd3438b8397693429;p=linux.git

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

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
---

ae4530062620561d24683b1bd3438b8397693429
diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 998c96b40d8a,75afce42921b..aa3e4c3b063a
--- a/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/file.h>
+ #include <linux/pm_runtime.h>
 -#include <linux/reservation.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"