Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm...

First feature request for 4.19.  Highlights:
- Add initial amdgpu documentation
- Add initial GPU scheduler documention
- GPU scheduler fixes for dying processes
- Add support for the JPEG engine on VCN
- Switch CI to use powerplay by default
- EDC support for CZ
- More powerplay cleanups
- Misc DC fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180621161138.3008-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
index a156b3891a3f9aa27077525d8fa533182c82b252,d1f05489595bcdb0925cf03be0ee7fd0f51cd99b..b2286bc41aec91a6a68fff5eebbb13d84c0c0e4b
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
@@@ -132,7 -188,21 +188,20 @@@ error
        return ERR_PTR(ret);
  }
  
+ /**
+  * amdgpu_gem_map_attach - &dma_buf_ops.attach implementation
+  * @dma_buf: shared DMA buffer
+  * @target_dev: target device
+  * @attach: DMA-buf attachment
+  *
+  * Makes sure that the shared DMA buffer can be accessed by the target device.
+  * For now, simply pins it to the GTT domain, where it should be accessible by
+  * all DMA devices.
+  *
+  * Returns:
+  * 0 on success or negative error code.
+  */
  static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,
 -                               struct device *target_dev,
                                 struct dma_buf_attachment *attach)
  {
        struct drm_gem_object *obj = dma_buf->priv;

diff --cc drivers/gpu/drm/amd/amdgpu/atom.c
index e9934de1b9cf8127eb2b770e4301d6ee90c98223,6cd518f6f7a4a52f63d37ebdf6a376809bb7afc9..b18c31a701e2277dce2b87cb23446dd6d78e6225
--- 1/drivers/gpu/drm/amd/amdgpu/atom.c
--- 2/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@@ -1221,7 -1221,7 +1221,7 @@@ static int amdgpu_atom_execute_table_lo
        ectx.abort = false;
        ectx.last_jump = 0;
        if (ws)
-               ectx.ws = kcalloc(4, ws, GFP_KERNEL);
 -              ectx.ws = kzalloc(4 * ws, GFP_ATOMIC);
++              ectx.ws = kcalloc(4, ws, GFP_ATOMIC);
        else
                ectx.ws = NULL;
  

diff --cc drivers/gpu/drm/amd/amdgpu/ci_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/kv_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/si_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/basics/logger.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/modules/color/color_gamma.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/modules/stats/stats.c
Simple merge