Merge v5.2-rc5 into drm-next

Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-fence.c
Simple merge

diff --cc drivers/dma-buf/sync_debug.c
Simple merge

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 562420d9d8d5c81e00812c69fa1953bd13c3f13b,0e3e868850d550b96cd1f738ae75e3e55c2bc6e8..f6d2681f69273584c753a8625fc9638f7766fb93
--- 1/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
--- 2/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@@ -2,11 -3,8 +3,9 @@@
   * Analog Devices ADV7511 HDMI transmitter driver
   *
   * Copyright 2012 Analog Devices Inc.
-  *
-  * Licensed under the GPL-2.
   */
  
 +#include <linux/clk.h>
  #include <linux/device.h>
  #include <linux/gpio/consumer.h>
  #include <linux/module.h>

diff --cc drivers/gpu/drm/bridge/analogix-anx78xx.c
Simple merge

diff --cc drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 8a57ecfc8fb46f760759b1bc4ca7b2f54cc506ca,3666c308c34a665627597edcc852f812b38bbbb1..3f7f4880be091994af222cbb1e7844366dbd7036
--- 1/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
--- 2/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@@ -3,33 -4,29 +4,28 @@@
  *
  * Copyright (C) 2012 Samsung Electronics Co., Ltd.
  * Author: Jingoo Han <jg1.han@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
  */
  
 -#include <linux/module.h>
 -#include <linux/platform_device.h>
 -#include <linux/err.h>
  #include <linux/clk.h>
 +#include <linux/component.h>
 +#include <linux/err.h>
 +#include <linux/gpio/consumer.h>
 +#include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/iopoll.h>
 -#include <linux/interrupt.h>
 +#include <linux/module.h>
  #include <linux/of.h>
 -#include <linux/of_gpio.h>
 -#include <linux/gpio.h>
 -#include <linux/component.h>
  #include <linux/phy/phy.h>
 +#include <linux/platform_device.h>
  
 -#include <drm/drmP.h>
 +#include <drm/bridge/analogix_dp.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>
 +#include <drm/drm_device.h>
  #include <drm/drm_panel.h>
 +#include <drm/drm_print.h>
  #include <drm/drm_probe_helper.h>
  
 -#include <drm/bridge/analogix_dp.h>
 -
  #include "analogix_dp_core.h"
  #include "analogix_dp_reg.h"
  

diff --cc drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
Simple merge

diff --cc drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
Simple merge

diff --cc drivers/gpu/drm/bridge/dumb-vga-dac.c
Simple merge

diff --cc drivers/gpu/drm/bridge/lvds-encoder.c
index 6eaaa76970b18e82dbbee5f85490dd27a97df30f,27e55c32f8237f084156e3129abf3744e791ecd2..2ab2c234f26c2b0e770fd661e49475c0b751f4da
--- 1/drivers/gpu/drm/bridge/lvds-encoder.c
--- 2/drivers/gpu/drm/bridge/lvds-encoder.c
+++ b/drivers/gpu/drm/bridge/lvds-encoder.c
@@@ -1,20 -1,14 +1,16 @@@
+ // SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (C) 2016 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-  * published by the Free Software Foundation; either version 2 of
-  * the License, or (at your option) any later version.
   */
  
 -#include <drm/drmP.h>
 -#include <drm/drm_bridge.h>
 -#include <drm/drm_panel.h>
 -
  #include <linux/gpio/consumer.h>
 +#include <linux/module.h>
 +#include <linux/of.h>
  #include <linux/of_graph.h>
 +#include <linux/platform_device.h>
 +
 +#include <drm/drm_bridge.h>
 +#include <drm/drm_panel.h>
  
  struct lvds_encoder {
        struct drm_bridge bridge;

diff --cc drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
Simple merge

diff --cc drivers/gpu/drm/bridge/nxp-ptn3460.c
Simple merge

diff --cc drivers/gpu/drm/bridge/panel.c
index 08517740e6a0236757b4a22b24c4e776090bc0bc,04a513319c8f6abe903cce0bc9175dceb5ab7aaa..b12ae3a4c5f11b243e8440f1ffd6e6ed0c1f0633
--- 1/drivers/gpu/drm/bridge/panel.c
--- 2/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@@ -1,13 -2,10 +2,8 @@@
  /*
   * Copyright (C) 2016 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   * Copyright (C) 2017 Broadcom
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-  * published by the Free Software Foundation; either version 2 of
-  * the License, or (at your option) any later version.
   */
  
 -#include <drm/drmP.h>
 -#include <drm/drm_panel.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_connector.h>
  #include <drm/drm_encoder.h>

diff --cc drivers/gpu/drm/bridge/parade-ps8622.c
Simple merge

diff --cc drivers/gpu/drm/bridge/sii902x.c
Simple merge

diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index f6c89007d3bb981a637d798ce8d2903d9552fb2d,045b1b13fd0e8114ed151fb37ac2e84b185f89b6..c6490949d9db33ba88c027987fecdd0b774163a6
--- 1/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
--- 2/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@@ -4,32 -5,20 +5,26 @@@
   * Copyright (C) 2013-2015 Mentor Graphics Inc.
   * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
   * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
   */
 -#include <linux/module.h>
 -#include <linux/irq.h>
 +#include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/err.h>
 -#include <linux/clk.h>
  #include <linux/hdmi.h>
 +#include <linux/irq.h>
 +#include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/of_device.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/regmap.h>
 +#include <linux/dma-mapping.h>
  #include <linux/spinlock.h>
  
 -#include <drm/drm_of.h>
 -#include <drm/drmP.h>
 +#include <media/cec-notifier.h>
 +
 +#include <uapi/linux/media-bus-format.h>
 +#include <uapi/linux/videodev2.h>
 +
 +#include <drm/bridge/dw_hdmi.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_edid.h>
  #include <drm/drm_encoder_slave.h>

diff --cc drivers/gpu/drm/bridge/tc358767.c
Simple merge

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

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

diff --cc drivers/gpu/drm/drm_gem_cma_helper.c
index 0cb1bbed1f6868e677a4bcb5e9a55a14ba2f12b8,a5c8850079f15067ec1f200ae8cfe3c898bce129..12e98fb28229d6e6e890dd09391fe131149f286a
--- 1/drivers/gpu/drm/drm_gem_cma_helper.c
--- 2/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@@ -6,27 -7,17 +7,18 @@@
   * Based on Samsung Exynos code
   *
   * Copyright (c) 2011 Samsung Electronics Co., Ltd.
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2
-  * of the License, or (at your option) any later version.
-  * 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.
   */
  
 -#include <linux/mm.h>
 -#include <linux/slab.h>
 -#include <linux/mutex.h>
 -#include <linux/export.h>
  #include <linux/dma-buf.h>
  #include <linux/dma-mapping.h>
 +#include <linux/export.h>
 +#include <linux/mm.h>
 +#include <linux/mutex.h>
 +#include <linux/slab.h>
  
 -#include <drm/drmP.h>
  #include <drm/drm.h>
 +#include <drm/drm_device.h>
 +#include <drm/drm_drv.h>
  #include <drm/drm_gem_cma_helper.h>
  #include <drm/drm_vma_manager.h>
  

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

diff --cc drivers/gpu/drm/drm_lease.c
index 849da94144501817388b0daba3dede4625eb462b,e8a5e3b13b2adf6715c6a1566c2baf206c37105a..b481cafdde280bbaddf0e9168c448fafba95d095
--- 1/drivers/gpu/drm/drm_lease.c
--- 2/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@@ -1,29 -1,15 +1,20 @@@
+ // SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright © 2017 Keith Packard <keithp@keithp.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * 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.
   */
 +#include <linux/file.h>
 +#include <linux/uaccess.h>
  
 -#include <drm/drmP.h>
 -#include "drm_internal.h"
 -#include "drm_legacy.h"
 -#include "drm_crtc_internal.h"
 -#include <drm/drm_lease.h>
  #include <drm/drm_auth.h>
  #include <drm/drm_crtc_helper.h>
 +#include <drm/drm_drv.h>
 +#include <drm/drm_file.h>
 +#include <drm/drm_lease.h>
 +#include <drm/drm_print.h>
 +
 +#include "drm_crtc_internal.h"
 +#include "drm_internal.h"
 +#include "drm_legacy.h"
  
  #define drm_for_each_lessee(lessee, lessor) \
        list_for_each_entry((lessee), &(lessor)->lessees, lessee_list)

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

diff --cc drivers/gpu/drm/drm_simple_kms_helper.c
index 77c9645e17edede62832d0f6c5d99c9bc70cb46e,5d5e9091ad6d0bc4e75787edd2826db6048472a4..b11910f14c46b9eca4bbd0495fc785884494230e
--- 1/drivers/gpu/drm/drm_simple_kms_helper.c
--- 2/drivers/gpu/drm/drm_simple_kms_helper.c
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@@ -1,15 -1,9 +1,11 @@@
+ // SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (C) 2016 Noralf Trønnes
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
   */
  
 -#include <drm/drmP.h>
 +#include <linux/module.h>
 +#include <linux/slab.h>
 +
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_plane_helper.h>

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

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

diff --cc drivers/gpu/drm/gma500/accel_2d.c
Simple merge

diff --cc drivers/gpu/drm/gma500/blitter.h
Simple merge

diff --cc drivers/gpu/drm/gma500/cdv_device.c
Simple merge

diff --cc drivers/gpu/drm/gma500/cdv_device.h
index 19e544ba21cb3f9c4018d59266b664704f67116a,b375bc20636304fc87d9df97ea7dd9a2e26de30e..37e4bdc84c03f0071180c31419e42dead0c060cd
--- 1/drivers/gpu/drm/gma500/cdv_device.h
--- 2/drivers/gpu/drm/gma500/cdv_device.h
+++ b/drivers/gpu/drm/gma500/cdv_device.h
@@@ -1,24 -1,8 +1,12 @@@
+ /* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Copyright © 2011 Intel Corporation
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc., 
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
 +struct drm_crtc;
 +struct drm_device;
 +struct psb_intel_mode_device;
 +
  extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;
  extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;
  extern const struct gma_clock_funcs cdv_clock_funcs;

diff --cc drivers/gpu/drm/gma500/cdv_intel_display.c
Simple merge

diff --cc drivers/gpu/drm/gma500/cdv_intel_lvds.c
Simple merge

diff --cc drivers/gpu/drm/gma500/framebuffer.c
index 26d95d89596ca19953bd86ff05caaacef8fb2653,45c3db50ee1a6e38812db96aad0d1f1df67bbfd7..218f3bb15276ea16a2c9bc6bf6bf6b440610471f
--- 1/drivers/gpu/drm/gma500/framebuffer.c
--- 2/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@@ -2,33 -3,21 +3,20 @@@
   * Copyright (c) 2007-2011, Intel Corporation.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
  
 -#include <linux/module.h>
 -#include <linux/kernel.h>
 +#include <linux/console.h>
 +#include <linux/delay.h>
  #include <linux/errno.h>
 -#include <linux/string.h>
 -#include <linux/pfn_t.h>
 +#include <linux/init.h>
 +#include <linux/kernel.h>
  #include <linux/mm.h>
 -#include <linux/tty.h>
 +#include <linux/module.h>
 +#include <linux/pfn_t.h>
  #include <linux/slab.h>
 -#include <linux/delay.h>
 -#include <linux/init.h>
 -#include <linux/console.h>
 +#include <linux/string.h>
 +#include <linux/tty.h>
  
 -#include <drm/drmP.h>
  #include <drm/drm.h>
  #include <drm/drm_crtc.h>
  #include <drm/drm_fb_helper.h>

diff --cc drivers/gpu/drm/gma500/framebuffer.h
Simple merge

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

diff --cc drivers/gpu/drm/gma500/gma_device.c
index 7d5287122030bd035809381485e4ac6c7b754d82,938408221142c894711b4ce5caa0294e53e1c161..869f303925667e51cecc8302af6626976982bbd7
--- 1/drivers/gpu/drm/gma500/gma_device.c
--- 2/drivers/gpu/drm/gma500/gma_device.c
+++ b/drivers/gpu/drm/gma500/gma_device.c
@@@ -2,17 -3,9 +3,8 @@@
   * Copyright (c) 2011, Intel Corporation.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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.
-  *
   **************************************************************************/
  
 -#include <drm/drmP.h>
  #include "psb_drv.h"
  
  void gma_get_core_freq(struct drm_device *dev)

diff --cc drivers/gpu/drm/gma500/gma_device.h
Simple merge

diff --cc drivers/gpu/drm/gma500/gma_display.c
Simple merge

diff --cc drivers/gpu/drm/gma500/gma_display.h
Simple merge

diff --cc drivers/gpu/drm/gma500/gtt.c
Simple merge

diff --cc drivers/gpu/drm/gma500/gtt.h
Simple merge

diff --cc drivers/gpu/drm/gma500/intel_bios.c
index 477315b9087056a59d44ea2a41fdc258be882cad,6ed7cfda0a4fdf3b6377a8c1060f4da393df42bf..8ad6337eeba3a400f2c72428eb9b8e7cf78b3d54
--- 1/drivers/gpu/drm/gma500/intel_bios.c
--- 2/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@@ -1,27 -2,12 +2,13 @@@
  /*
   * Copyright (c) 2006 Intel Corporation
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   * Authors:
   *    Eric Anholt <eric@anholt.net>
-  *
   */
 -#include <drm/drmP.h>
  #include <drm/drm.h>
 -#include <drm/gma_drm.h>
 +#include <drm/drm_dp_helper.h>
 +
 +#include "intel_bios.h"
  #include "psb_drv.h"
  #include "psb_intel_drv.h"
  #include "psb_intel_reg.h"

diff --cc drivers/gpu/drm/gma500/intel_bios.h
Simple merge

diff --cc drivers/gpu/drm/gma500/intel_i2c.c
Simple merge

diff --cc drivers/gpu/drm/gma500/mdfld_device.c
index 7450908b8e1ef17fffc6dbbb91a4507b49ac5407,0db869dcd7bd7bbe8a5f9e60ad0eac82c6513f77..b718efccdcf297b056408685b47944fec77f572b
--- 1/drivers/gpu/drm/gma500/mdfld_device.c
--- 2/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@@ -2,22 -3,13 +3,9 @@@
   * Copyright (c) 2011, Intel Corporation.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
  
 -#include "psb_drv.h"
 -#include "mid_bios.h"
 -#include "mdfld_output.h"
 -#include "mdfld_dsi_output.h"
 -#include "tc35876x-dsi-lvds.h"
 +#include <linux/delay.h>
  
  #include <asm/intel_scu_ipc.h>
  

diff --cc drivers/gpu/drm/gma500/mdfld_intel_display.c
Simple merge

diff --cc drivers/gpu/drm/gma500/mid_bios.c
Simple merge

diff --cc drivers/gpu/drm/gma500/mid_bios.h
index 59e43a68a21dc245322a607dba9ceeb0e39d6296,7e743f731a927b5f7a84e2e30924fe6b7588b587..8707f7c893a734aa0068e35bec9e90b11eebbf62
--- 1/drivers/gpu/drm/gma500/mid_bios.h
--- 2/drivers/gpu/drm/gma500/mid_bios.h
+++ b/drivers/gpu/drm/gma500/mid_bios.h
@@@ -2,21 -3,7 +3,8 @@@
   * Copyright (c) 2011, Intel Corporation.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
 +struct drm_device;
  
  extern int mid_chip_setup(struct drm_device *dev);
  

diff --cc drivers/gpu/drm/gma500/mmu.c
index 9d588bec8f721d88b98462e9eb410cccd32a00bb,5d806a8ff1bd77d1ce3e57488264fd91ca118ee7..505044c9a6732483411d4d03a8afe9fab7cb7db4
--- 1/drivers/gpu/drm/gma500/mmu.c
--- 2/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@@ -1,26 -2,11 +2,13 @@@
  /**************************************************************************
   * Copyright (c) 2007, Intel Corporation.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
 -#include <drm/drmP.h>
 +
 +#include <linux/highmem.h>
 +
 +#include "mmu.h"
  #include "psb_drv.h"
  #include "psb_reg.h"
 -#include "mmu.h"
  
  /*
   * Code for the SGX MMU:

diff --cc drivers/gpu/drm/gma500/oaktrail.h
index e41bcab5a585e8ef2373777c4e14300f36b6fbfb,72da4e0bc8c7d1c90e78c0c3bf2888dbd2bf3aac..8d20fa2ee2863f8753126289715d23e731a9bf96
--- 1/drivers/gpu/drm/gma500/oaktrail.h
--- 2/drivers/gpu/drm/gma500/oaktrail.h
+++ b/drivers/gpu/drm/gma500/oaktrail.h
@@@ -2,23 -3,8 +3,10 @@@
   * Copyright (c) 2007-2011, Intel Corporation.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
  
 +struct psb_intel_mode_device;
 +
  /* MID device specific descriptors */
  
  struct oaktrail_timing_info {

diff --cc drivers/gpu/drm/gma500/oaktrail_crtc.c
index b2489787179c788dc63e81a3f4da437c5a936abe,cb4dafd113b31964961b14b7ee1ec75245b1a7e3..167c10767dd426a6a45505a36733bb69601e8808
--- 1/drivers/gpu/drm/gma500/oaktrail_crtc.c
--- 2/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@@ -1,21 -1,8 +1,9 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright © 2009 Intel Corporation
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
 +#include <linux/delay.h>
  #include <linux/i2c.h>
  #include <linux/pm_runtime.h>
  

diff --cc drivers/gpu/drm/gma500/oaktrail_device.c
Simple merge

diff --cc drivers/gpu/drm/gma500/oaktrail_lvds.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_device.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_drv.c
index 5767fa16e358b195fd7d91d46afc96c9ccb4b014,5280be2c2500787cd821eaf7f670999da4841784..7005f8f69c683749a0e7493c001d929e7c1fa091
--- 1/drivers/gpu/drm/gma500/psb_drv.c
--- 2/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@@ -4,47 -5,25 +5,34 @@@
   * Copyright (c) 2008, Tungsten Graphics, Inc. Cedar Park, TX., USA.
   * All Rights Reserved.
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-  * version 2, as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-  *
   **************************************************************************/
  
 -#include <drm/drmP.h>
 +#include <linux/cpu.h>
 +#include <linux/module.h>
 +#include <linux/notifier.h>
 +#include <linux/pm_runtime.h>
 +#include <linux/spinlock.h>
 +
 +#include <asm/set_memory.h>
 +
 +#include <acpi/video.h>
 +
  #include <drm/drm.h>
 -#include "psb_drv.h"
 +#include <drm/drm_drv.h>
 +#include <drm/drm_file.h>
 +#include <drm/drm_ioctl.h>
 +#include <drm/drm_irq.h>
 +#include <drm/drm_pci.h>
 +#include <drm/drm_pciids.h>
 +#include <drm/drm_vblank.h>
 +
  #include "framebuffer.h"
 -#include "psb_reg.h"
 -#include "psb_intel_reg.h"
  #include "intel_bios.h"
  #include "mid_bios.h"
 -#include <drm/drm_pciids.h>
  #include "power.h"
 -#include <linux/cpu.h>
 -#include <linux/notifier.h>
 -#include <linux/spinlock.h>
 -#include <linux/pm_runtime.h>
 -#include <acpi/video.h>
 -#include <linux/module.h>
 -#include <asm/set_memory.h>
 +#include "psb_drv.h"
 +#include "psb_intel_reg.h"
 +#include "psb_reg.h"
  
  static struct drm_driver driver;
  static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

diff --cc drivers/gpu/drm/gma500/psb_drv.h
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_intel_display.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_intel_lvds.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_intel_modes.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_irq.c
index df4fe2e37f947d4b15787e9795cd948e58bee6cf,5d48703bb2e236196078e7efbd9e60694029d5fd..e6265fb85626ee67e4c2075a5bd4c2f838209833
--- 1/drivers/gpu/drm/gma500/psb_irq.c
--- 2/drivers/gpu/drm/gma500/psb_irq.c
+++ b/drivers/gpu/drm/gma500/psb_irq.c
@@@ -19,17 -7,14 +7,15 @@@
   * develop this driver.
   *
   **************************************************************************/
- /*
-  */
  
 -#include <drm/drmP.h>
 +#include <drm/drm_vblank.h>
 +
 +#include "mdfld_output.h"
 +#include "power.h"
  #include "psb_drv.h"
 -#include "psb_reg.h"
  #include "psb_intel_reg.h"
 -#include "power.h"
  #include "psb_irq.h"
 -#include "mdfld_output.h"
 +#include "psb_reg.h"
  
  /*
   * inline functions

diff --cc drivers/gpu/drm/gma500/psb_irq.h
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_lid.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
Simple merge

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_workarounds.c
index ce4bcca3f83ca5b9de1225fd7b441124e4c51c9b,841b8e515f4d6fdc95cc317bd57df34aefebc161..88c195098bda96ccabf4b7819bed9d76c82e55be
--- 1/drivers/gpu/drm/i915/gt/intel_workarounds.c
--- 2/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@@ -524,11 -513,11 +524,17 @@@ static void cnl_ctx_workarounds_init(st
        WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, DISABLE_EARLY_EOT);
  }
  
 -static void icl_ctx_workarounds_init(struct intel_engine_cs *engine)
 +static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
  {
        struct drm_i915_private *i915 = engine->i915;
 -      struct i915_wa_list *wal = &engine->ctx_wa_list;
 +
++      /* WaDisableBankHangMode:icl */
++      wa_write(wal,
++               GEN8_L3CNTLREG,
++               intel_uncore_read(engine->uncore, GEN8_L3CNTLREG) |
++               GEN8_ERRDETBCTRL);
+ 
        /* WaDisableBankHangMode:icl */
        wa_write(wal,
                 GEN8_L3CNTLREG,

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

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

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

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

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

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

diff --cc drivers/gpu/drm/mediatek/mtk_drm_fb.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_plane.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_cursor.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_drv.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_drv.h
index d39f2a567b3f0bba11422abc4f332c6606957546,8506e6d62b637b0908546a2bc53b1677b617a05d..c47671ce6c485c45075522f34845ae4c139a177a
--- 1/drivers/gpu/drm/mgag200/mgag200_drv.h
--- 2/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@@ -1,11 -1,8 +1,8 @@@
+ /* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Copyright 2010 Matt Turner.
 - * Copyright 2012 Red Hat 
 + * Copyright 2012 Red Hat
   *
-  * This file is subject to the terms and conditions of the GNU General
-  * Public License version 2. See the file COPYING in the main
-  * directory of this archive for more details.
-  *
   * Authors: Matthew Garrett
   *        Matt Turner
   *        Dave Airlie

diff --cc drivers/gpu/drm/mgag200/mgag200_fb.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_main.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_mode.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
Simple merge

diff --cc drivers/gpu/drm/panel/panel-innolux-p079zca.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_fb.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun4i_drv.c
Simple merge

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

diff --cc include/drm/bridge/dw_hdmi.h
Simple merge

diff --cc include/drm/bridge/dw_mipi_dsi.h
Simple merge

diff --cc include/drm/drm_edid.h
Simple merge

diff --cc include/drm/drm_modeset_helper_vtables.h
Simple merge