Merge v5.3-rc1 into drm-misc-next

Noralf needs some SPI patches in 5.3 to merge some work on tinydrm.

Signed-off-by: Maxime Ripard <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/Kconfig
Simple merge

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

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_kms.c
index 45f05bc9448702bc003f3483235061e6ac7daee8,419a8b0e5de8f2fe96be3d9e022e73405eb406f2..89191a555c84dc0e870562586550654b83b0e7fc
--- 1/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
--- 2/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
@@@ -55,9 -55,9 +55,8 @@@ static irqreturn_t komeda_kms_irq_handl
  }
  
  static struct drm_driver komeda_kms_driver = {
 -      .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |
 -                         DRIVER_PRIME | DRIVER_HAVE_IRQ,
 +      .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
        .lastclose                      = drm_fb_helper_lastclose,
-       .irq_handler                    = komeda_kms_irq_handler,
        .gem_free_object_unlocked       = drm_gem_cma_free_object,
        .gem_vm_ops                     = &drm_gem_cma_vm_ops,
        .dumb_create                    = komeda_gem_cma_dumb_create,

diff --cc drivers/gpu/drm/arm/malidp_drv.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_drv.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_gem.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_gem.h
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
index 24938bd5adf66a4a5ac10f799e3599c7cf4773d5,7e08318b262ec74e4c67cff7f83a9342af2ac388..375fa84c548b7c8fffbde5b30da2929b9cde3aab
--- 1/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
--- 2/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
@@@ -5,24 -6,11 +6,12 @@@
   *
   * Author: Jean-Jacques Hiblot <[email protected]>
   * Author: Boris BREZILLON <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <linux/media-bus-format.h>
  #include <linux/of_graph.h>
  
 -#include <drm/drmP.h>
 +#include <drm/drm_encoder.h>
  #include <drm/drm_of.h>
  #include <drm/drm_bridge.h>
  

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index dc19ebb19a1c4ca03dedd7796f0d90a811d218ed,4127aca212bb047c48908da593e107d3791061de..89f5a756fa37fdfd9e9ba895734eec4665bdf20d
--- 1/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
--- 2/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@@ -3,30 -4,8 +4,18 @@@
   * Copyright (C) 2014 Atmel
   *
   * Author: Boris BREZILLON <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <linux/dmapool.h>
 +#include <linux/mfd/atmel-hlcdc.h>
 +
 +#include <drm/drm_atomic.h>
 +#include <drm/drm_atomic_helper.h>
 +#include <drm/drm_fb_cma_helper.h>
 +#include <drm/drm_fourcc.h>
 +#include <drm/drm_gem_cma_helper.h>
 +#include <drm/drm_plane_helper.h>
 +
  #include "atmel_hlcdc_dc.h"
  
  /**

diff --cc drivers/gpu/drm/bochs/bochs.h
Simple merge

diff --cc drivers/gpu/drm/bochs/bochs_hw.c
Simple merge

diff --cc drivers/gpu/drm/bochs/bochs_kms.c
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/drm_ioc32.c
Simple merge

diff --cc drivers/gpu/drm/drm_ioctl.c
Simple merge

diff --cc drivers/gpu/drm/drm_modes.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
index ab0412b09f1c1795a7948b7d30f8b4e5c6bcc9d4,bc909ec5d9c3bb6a5f543d71bae292091acba5ea..bdd596604e930f911643c80eab3a634a42bfef63
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -3085,27 -2591,9 +2591,8 @@@ int i915_gem_object_set_cache_level(str
  struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
                                struct dma_buf *dma_buf);
  
 -struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
 -                              struct drm_gem_object *gem_obj, int flags);
 +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags);
  
- static inline struct i915_hw_ppgtt *
- i915_vm_to_ppgtt(struct i915_address_space *vm)
- {
-       return container_of(vm, struct i915_hw_ppgtt, vm);
- }
- 
- /* i915_gem_fence_reg.c */
- struct drm_i915_fence_reg *
- i915_reserve_fence(struct drm_i915_private *dev_priv);
- void i915_unreserve_fence(struct drm_i915_fence_reg *fence);
- 
- void i915_gem_restore_fences(struct drm_i915_private *dev_priv);
- 
- void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv);
- void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                      struct sg_table *pages);
- void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                        struct sg_table *pages);
- 
  static inline struct i915_gem_context *
  __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id)
  {

diff --cc drivers/gpu/drm/imx/ipuv3-crtc.c
Simple merge

diff --cc drivers/gpu/drm/imx/ipuv3-plane.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index a4d7ab97bb8eacd5bc3e4c2cda122b70ad4a1462,45bfac9e3af7bc90b93fc88635effcb3efc7a03b..8cf0b8a4ed0345509c72e02a3161893405089191
--- 1/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
--- 2/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@@ -21,8 -10,8 +10,9 @@@
  #include <linux/debugfs.h>
  #include <linux/dma-buf.h>
  
+ #include <drm/drm_damage_helper.h>
  #include <drm/drm_atomic_uapi.h>
 +#include <drm/drm_gem_framebuffer_helper.h>
  
  #include "msm_drv.h"
  #include "dpu_kms.h"

diff --cc drivers/gpu/drm/msm/msm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_abi16.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_crtc.c
index a8f09829fcab26010ee68f6500b10f23778725a2,f9ac9afc56410a6a222cd9c3822cf587c4a3f5c1..3c5ddbf30e97491e6f2dbf662d03e7f9d4a24449
--- 1/drivers/gpu/drm/omapdrm/omap_crtc.c
--- 2/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@@ -1,22 -2,8 +2,10 @@@
  /*
   * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <linux/math64.h>
 +
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>

diff --cc drivers/gpu/drm/omapdrm/omap_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
index 05002b157745ec2f58c837077007270b9a1fa911,288c59dae56ad9326d3e50699deb8ec0445d071d..9f652d2e7af1d0637a481a0bb9e6bbedc5689957
--- 1/drivers/gpu/drm/omapdrm/omap_drv.c
--- 2/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@@ -1,22 -2,9 +2,10 @@@
  /*
   * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include <linux/of.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/platform_device.h>
  #include <linux/sort.h>
  #include <linux/sys_soc.h>
  

diff --cc drivers/gpu/drm/omapdrm/omap_drv.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_fb.c
index 199ae8bf27695c4efee8c9afcd06141c71106519,7e89e5cb40684fc275b4428a2690ed4f98fab846..1b8b5108caf8f2e62a5894edc1ac12d7fe5cb9eb
--- 1/drivers/gpu/drm/omapdrm/omap_fb.c
--- 2/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@@ -1,24 -2,12 +2,12 @@@
  /*
   * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include <linux/seq_file.h>
 +#include <linux/dma-mapping.h>
  
 -#include <drm/drm_crtc.h>
  #include <drm/drm_modeset_helper.h>
 +#include <drm/drm_fourcc.h>
  #include <drm/drm_gem_framebuffer_helper.h>
  
  #include "omap_dmm_tiler.h"

diff --cc drivers/gpu/drm/omapdrm/omap_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
index efe187df68f649290eb9f24a658ac568de65390a,37378dbc50d0dcaf1962743a1e1746ab5e54a186..08f539efddfb1edb608a430c1ee84c949d01ebe2
--- 1/drivers/gpu/drm/omapdrm/omap_gem.c
--- 2/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@@ -1,21 -2,8 +2,9 @@@
  /*
   * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <linux/dma-mapping.h>
  #include <linux/seq_file.h>
  #include <linux/shmem_fs.h>
  #include <linux/spinlock.h>

diff --cc drivers/gpu/drm/omapdrm/omap_gem.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_irq.c
index 1f8588503db9c5a795acd8aaba06110673aaf89f,726a013e7988c967ef010e2f8f32264853d87a0b..382bcdc72ac06be66f8577895a5dfef4496b95fe
--- 1/drivers/gpu/drm/omapdrm/omap_irq.c
--- 2/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@@ -1,22 -2,8 +2,10 @@@
  /*
   * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <drm/drm_vblank.h>
 +
  #include "omap_drv.h"
  
  struct omap_irq_wait {

diff --cc drivers/gpu/drm/panfrost/panfrost_drv.c
Simple merge

diff --cc drivers/gpu/drm/panfrost/panfrost_gem.c
Simple merge

diff --cc drivers/gpu/drm/pl111/pl111_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/cdn-dp-core.h
Simple merge

diff --cc drivers/gpu/drm/tegra/drm.c
Simple merge

diff --cc drivers/gpu/drm/tegra/gem.c
Simple merge

diff --cc drivers/gpu/drm/tegra/gem.h
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 8c2025780372a8c3a9a3a88d5d70a1e13232959c,650d162e374bbd1633782b50055847814014186f..8fa9b3e5e23086b446a05227c27786a0ef556ec4
--- 1/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
--- 2/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@@ -1,25 -2,8 +2,13 @@@
  /*
   * Copyright (C) 2012 Texas Instruments
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 +#include <linux/delay.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/of_graph.h>
 +#include <linux/pm_runtime.h>
 +
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>

diff --cc drivers/gpu/drm/tilcdc/tilcdc_drv.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_drv.h
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_external.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_panel.c
index e1c39712b67a3a82aca8bc9860e7008b15e81852,22b100d2e17431c898c6555bbf267ffc2d12635c..11eb9fd38c4e23e0a735eb774cf12c2dc2d8589a
--- 1/drivers/gpu/drm/tilcdc/tilcdc_panel.c
--- 2/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@@ -1,24 -2,12 +2,12 @@@
  /*
   * Copyright (C) 2012 Texas Instruments
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include <linux/pinctrl/pinmux.h>
 -#include <linux/pinctrl/consumer.h>
 -#include <linux/backlight.h>
  #include <linux/gpio/consumer.h>
 +#include <linux/pinctrl/consumer.h>
 +#include <linux/platform_device.h>
 +
  #include <video/display_timing.h>
  #include <video/of_display_timing.h>
  #include <video/videomode.h>

diff --cc drivers/gpu/drm/tilcdc/tilcdc_plane.c
index 347ca8656aeff4ededcfe5d056f157215eb162d0,8c2776acdf9964039e3b3fb04a69956d54e9230c..3abb9641f2123fdc1fa95fb0a38d8683a68b6cea
--- 1/drivers/gpu/drm/tilcdc/tilcdc_plane.c
--- 2/drivers/gpu/drm/tilcdc/tilcdc_plane.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
@@@ -1,20 -2,10 +2,8 @@@
  /*
   * Copyright (C) 2015 Texas Instruments
   * Author: Jyri Sarha <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include <drm/drmP.h>
 -
  #include <drm/drm_atomic.h>
  #include <drm/drm_plane_helper.h>
  #include <drm/drm_atomic_helper.h>

diff --cc drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index da642c725cd66e1b12d3ec95a225c4edd33b6e7e,62d014c20988553cd31d0626e7911b6ce60127dc..c6e4e52f32bcd6856a476434b9ac75a44abbff65
--- 1/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
--- 2/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@@ -1,28 -2,14 +2,16 @@@
  /*
   * Copyright (C) 2012 Texas Instruments
   * Author: Rob Clark <[email protected]>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but WITHOUT
-  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  * more details.
-  *
-  * You should have received a copy of the GNU General Public License along with
-  * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include <linux/i2c.h>
  #include <linux/gpio.h>
 +#include <linux/mod_devicetable.h>
  #include <linux/of_gpio.h>
 -#include <linux/pinctrl/pinmux.h>
 -#include <linux/pinctrl/consumer.h>
 +#include <linux/platform_device.h>
 +
  #include <drm/drm_atomic_helper.h>
 +#include <drm/drm_encoder.h>
 +#include <drm/drm_modeset_helper_vtables.h>
  #include <drm/drm_probe_helper.h>
  
  #include "tilcdc_drv.h"

diff --cc drivers/gpu/drm/vc4/vc4_bo.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_crtc.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_drv.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_drv.h
index 7bf58254ff30ffbe2bfe9e4cd5203f3708447be0,616c011bcb82aef4cea8037ae3805812d124605e..6627b20c99e9c8f2d5b1bcf1f795c4e3601aa58f
--- 1/drivers/gpu/drm/vc4/vc4_drv.h
--- 2/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@@ -1,22 -1,15 +1,19 @@@
+ /* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Copyright (C) 2015 Broadcom
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License version 2 as
-  * published by the Free Software Foundation.
   */
  
 -#include <linux/mm_types.h>
 -#include <drm/drmP.h>
 -#include <drm/drm_util.h>
 +#include <linux/delay.h>
 +#include <linux/refcount.h>
 +#include <linux/uaccess.h>
 +
 +#include <drm/drm_atomic.h>
 +#include <drm/drm_debugfs.h>
 +#include <drm/drm_device.h>
  #include <drm/drm_encoder.h>
  #include <drm/drm_gem_cma_helper.h>
 -#include <drm/drm_atomic.h>
 -#include <drm/drm_syncobj.h>
 +#include <drm/drm_mm.h>
 +#include <drm/drm_modeset_lock.h>
  
  #include "uapi/drm/vc4_drm.h"
  

diff --cc drivers/gpu/drm/vc4/vc4_dsi.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hvs.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_kms.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_plane.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_v3d.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_plane.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_tvenc.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_vga.c
Simple merge

diff --cc drivers/gpu/drm/zte/zx_vou.c
Simple merge