Merge v5.2-rc5 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Jun 2019 10:04:55 +0000 (12:04 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Jun 2019 10:07:29 +0000 (12:07 +0200)
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>
114 files changed:
1  2 
MAINTAINERS
drivers/dma-buf/dma-fence.c
drivers/dma-buf/sync_debug.c
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/arm/malidp_crtc.c
drivers/gpu/drm/arm/malidp_hw.c
drivers/gpu/drm/arm/malidp_planes.c
drivers/gpu/drm/bochs/bochs_drv.c
drivers/gpu/drm/bochs/bochs_kms.c
drivers/gpu/drm/bochs/bochs_mm.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/gpu/drm/bridge/analogix-anx78xx.c
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
drivers/gpu/drm/bridge/dumb-vga-dac.c
drivers/gpu/drm/bridge/lvds-encoder.c
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
drivers/gpu/drm/bridge/nxp-ptn3460.c
drivers/gpu/drm/bridge/panel.c
drivers/gpu/drm/bridge/parade-ps8622.c
drivers/gpu/drm/bridge/sii902x.c
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
drivers/gpu/drm/bridge/tc358767.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_gem_cma_helper.c
drivers/gpu/drm/drm_gem_framebuffer_helper.c
drivers/gpu/drm/drm_lease.c
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/drm_simple_kms_helper.c
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/etnaviv/etnaviv_dump.c
drivers/gpu/drm/gma500/accel_2d.c
drivers/gpu/drm/gma500/blitter.h
drivers/gpu/drm/gma500/cdv_device.c
drivers/gpu/drm/gma500/cdv_device.h
drivers/gpu/drm/gma500/cdv_intel_display.c
drivers/gpu/drm/gma500/cdv_intel_lvds.c
drivers/gpu/drm/gma500/framebuffer.c
drivers/gpu/drm/gma500/framebuffer.h
drivers/gpu/drm/gma500/gem.c
drivers/gpu/drm/gma500/gma_device.c
drivers/gpu/drm/gma500/gma_device.h
drivers/gpu/drm/gma500/gma_display.c
drivers/gpu/drm/gma500/gma_display.h
drivers/gpu/drm/gma500/gtt.c
drivers/gpu/drm/gma500/gtt.h
drivers/gpu/drm/gma500/intel_bios.c
drivers/gpu/drm/gma500/intel_bios.h
drivers/gpu/drm/gma500/intel_i2c.c
drivers/gpu/drm/gma500/mdfld_device.c
drivers/gpu/drm/gma500/mdfld_intel_display.c
drivers/gpu/drm/gma500/mid_bios.c
drivers/gpu/drm/gma500/mid_bios.h
drivers/gpu/drm/gma500/mmu.c
drivers/gpu/drm/gma500/oaktrail.h
drivers/gpu/drm/gma500/oaktrail_crtc.c
drivers/gpu/drm/gma500/oaktrail_device.c
drivers/gpu/drm/gma500/oaktrail_lvds.c
drivers/gpu/drm/gma500/psb_device.c
drivers/gpu/drm/gma500/psb_drv.c
drivers/gpu/drm/gma500/psb_drv.h
drivers/gpu/drm/gma500/psb_intel_display.c
drivers/gpu/drm/gma500/psb_intel_lvds.c
drivers/gpu/drm/gma500/psb_intel_modes.c
drivers/gpu/drm/gma500/psb_irq.c
drivers/gpu/drm/gma500/psb_irq.h
drivers/gpu/drm/gma500/psb_lid.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
drivers/gpu/drm/i915/gt/intel_workarounds.c
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_dsi_vbt.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/imx/ipuv3-plane.c
drivers/gpu/drm/mediatek/mtk_drm_fb.c
drivers/gpu/drm/mediatek/mtk_hdmi.c
drivers/gpu/drm/meson/meson_plane.c
drivers/gpu/drm/mgag200/mgag200_cursor.c
drivers/gpu/drm/mgag200/mgag200_drv.c
drivers/gpu/drm/mgag200/mgag200_drv.h
drivers/gpu/drm/mgag200/mgag200_fb.c
drivers/gpu/drm/mgag200/mgag200_main.c
drivers/gpu/drm/mgag200/mgag200_mode.c
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
drivers/gpu/drm/panel/panel-innolux-p079zca.c
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/gpu/drm/sun4i/sun4i_drv.c
drivers/gpu/drm/vc4/vc4_plane.c
include/drm/bridge/dw_hdmi.h
include/drm/bridge/dw_mipi_dsi.h
include/drm/drm_edid.h
include/drm/drm_modeset_helper_vtables.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 562420d9d8d5c81e00812c69fa1953bd13c3f13b,0e3e868850d550b96cd1f738ae75e3e55c2bc6e8..f6d2681f69273584c753a8625fc9638f7766fb93
@@@ -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>
index 8a57ecfc8fb46f760759b1bc4ca7b2f54cc506ca,3666c308c34a665627597edcc852f812b38bbbb1..3f7f4880be091994af222cbb1e7844366dbd7036
@@@ -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"
  
Simple merge
index 6eaaa76970b18e82dbbee5f85490dd27a97df30f,27e55c32f8237f084156e3129abf3744e791ecd2..2ab2c234f26c2b0e770fd661e49475c0b751f4da
@@@ -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;
Simple merge
index 08517740e6a0236757b4a22b24c4e776090bc0bc,04a513319c8f6abe903cce0bc9175dceb5ab7aaa..b12ae3a4c5f11b243e8440f1ffd6e6ed0c1f0633
@@@ -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>
Simple merge
index f6c89007d3bb981a637d798ce8d2903d9552fb2d,045b1b13fd0e8114ed151fb37ac2e84b185f89b6..c6490949d9db33ba88c027987fecdd0b774163a6
@@@ -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>
Simple merge
Simple merge
Simple merge
index 0cb1bbed1f6868e677a4bcb5e9a55a14ba2f12b8,a5c8850079f15067ec1f200ae8cfe3c898bce129..12e98fb28229d6e6e890dd09391fe131149f286a
@@@ -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>
  
index 849da94144501817388b0daba3dede4625eb462b,e8a5e3b13b2adf6715c6a1566c2baf206c37105a..b481cafdde280bbaddf0e9168c448fafba95d095
@@@ -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)
Simple merge
index 77c9645e17edede62832d0f6c5d99c9bc70cb46e,5d5e9091ad6d0bc4e75787edd2826db6048472a4..b11910f14c46b9eca4bbd0495fc785884494230e
@@@ -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>
Simple merge
Simple merge
Simple merge
Simple merge
index 19e544ba21cb3f9c4018d59266b664704f67116a,b375bc20636304fc87d9df97ea7dd9a2e26de30e..37e4bdc84c03f0071180c31419e42dead0c060cd
@@@ -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;
index 26d95d89596ca19953bd86ff05caaacef8fb2653,45c3db50ee1a6e38812db96aad0d1f1df67bbfd7..218f3bb15276ea16a2c9bc6bf6bf6b440610471f
@@@ -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>
Simple merge
Simple merge
index 7d5287122030bd035809381485e4ac6c7b754d82,938408221142c894711b4ce5caa0294e53e1c161..869f303925667e51cecc8302af6626976982bbd7
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 477315b9087056a59d44ea2a41fdc258be882cad,6ed7cfda0a4fdf3b6377a8c1060f4da393df42bf..8ad6337eeba3a400f2c72428eb9b8e7cf78b3d54
@@@ -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"
Simple merge
Simple merge
index 7450908b8e1ef17fffc6dbbb91a4507b49ac5407,0db869dcd7bd7bbe8a5f9e60ad0eac82c6513f77..b718efccdcf297b056408685b47944fec77f572b
@@@ -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>
  
Simple merge
index 59e43a68a21dc245322a607dba9ceeb0e39d6296,7e743f731a927b5f7a84e2e30924fe6b7588b587..8707f7c893a734aa0068e35bec9e90b11eebbf62
@@@ -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);
  
index 9d588bec8f721d88b98462e9eb410cccd32a00bb,5d806a8ff1bd77d1ce3e57488264fd91ca118ee7..505044c9a6732483411d4d03a8afe9fab7cb7db4
@@@ -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:
index e41bcab5a585e8ef2373777c4e14300f36b6fbfb,72da4e0bc8c7d1c90e78c0c3bf2888dbd2bf3aac..8d20fa2ee2863f8753126289715d23e731a9bf96
@@@ -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 {
index b2489787179c788dc63e81a3f4da437c5a936abe,cb4dafd113b31964961b14b7ee1ec75245b1a7e3..167c10767dd426a6a45505a36733bb69601e8808
@@@ -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>
  
Simple merge
index 5767fa16e358b195fd7d91d46afc96c9ccb4b014,5280be2c2500787cd821eaf7f670999da4841784..7005f8f69c683749a0e7493c001d929e7c1fa091
@@@ -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);
Simple merge
index df4fe2e37f947d4b15787e9795cd948e58bee6cf,5d48703bb2e236196078e7efbd9e60694029d5fd..e6265fb85626ee67e4c2075a5bd4c2f838209833
   * 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
Simple merge
Simple merge
index ce4bcca3f83ca5b9de1225fd7b441124e4c51c9b,0000000000000000000000000000000000000000..88c195098bda96ccabf4b7819bed9d76c82e55be
mode 100644,000000..100644
--- /dev/null
@@@ -1,1420 -1,0 +1,1426 @@@
-  * ''''''
 +/*
 + * SPDX-License-Identifier: MIT
 + *
 + * Copyright Â© 2014-2018 Intel Corporation
 + */
 +
 +#include "i915_drv.h"
 +#include "intel_workarounds.h"
 +
 +/**
 + * DOC: Hardware workarounds
 + *
 + * This file is intended as a central place to implement most [1]_ of the
 + * required workarounds for hardware to work as originally intended. They fall
 + * in five basic categories depending on how/when they are applied:
 + *
 + * - Workarounds that touch registers that are saved/restored to/from the HW
 + *   context image. The list is emitted (via Load Register Immediate commands)
 + *   everytime a new context is created.
 + * - GT workarounds. The list of these WAs is applied whenever these registers
 + *   revert to default values (on GPU reset, suspend/resume [2]_, etc..).
 + * - Display workarounds. The list is applied during display clock-gating
 + *   initialization.
 + * - Workarounds that whitelist a privileged register, so that UMDs can manage
 + *   them directly. This is just a special case of a MMMIO workaround (as we
 + *   write the list of these to/be-whitelisted registers to some special HW
 + *   registers).
 + * - Workaround batchbuffers, that get executed automatically by the hardware
 + *   on every HW context restore.
 + *
 + * .. [1] Please notice that there are other WAs that, due to their nature,
 + *    cannot be applied from a central place. Those are peppered around the rest
 + *    of the code, as needed.
 + *
 + * .. [2] Technically, some registers are powercontext saved & restored, so they
 + *    survive a suspend/resume. In practice, writing them again is not too
 + *    costly and simplifies things. We can revisit this in the future.
 + *
 + * Layout
++ * ~~~~~~
 + *
 + * Keep things in this file ordered by WA type, as per the above (context, GT,
 + * display, register whitelist, batchbuffer). Then, inside each type, keep the
 + * following order:
 + *
 + * - Infrastructure functions and macros
 + * - WAs per platform in standard gen/chrono order
 + * - Public functions to init or apply the given workaround type.
 + */
 +
 +static void wa_init_start(struct i915_wa_list *wal, const char *name)
 +{
 +      wal->name = name;
 +}
 +
 +#define WA_LIST_CHUNK (1 << 4)
 +
 +static void wa_init_finish(struct i915_wa_list *wal)
 +{
 +      /* Trim unused entries. */
 +      if (!IS_ALIGNED(wal->count, WA_LIST_CHUNK)) {
 +              struct i915_wa *list = kmemdup(wal->list,
 +                                             wal->count * sizeof(*list),
 +                                             GFP_KERNEL);
 +
 +              if (list) {
 +                      kfree(wal->list);
 +                      wal->list = list;
 +              }
 +      }
 +
 +      if (!wal->count)
 +              return;
 +
 +      DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
 +                       wal->wa_count, wal->name);
 +}
 +
 +static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 +{
 +      unsigned int addr = i915_mmio_reg_offset(wa->reg);
 +      unsigned int start = 0, end = wal->count;
 +      const unsigned int grow = WA_LIST_CHUNK;
 +      struct i915_wa *wa_;
 +
 +      GEM_BUG_ON(!is_power_of_2(grow));
 +
 +      if (IS_ALIGNED(wal->count, grow)) { /* Either uninitialized or full. */
 +              struct i915_wa *list;
 +
 +              list = kmalloc_array(ALIGN(wal->count + 1, grow), sizeof(*wa),
 +                                   GFP_KERNEL);
 +              if (!list) {
 +                      DRM_ERROR("No space for workaround init!\n");
 +                      return;
 +              }
 +
 +              if (wal->list)
 +                      memcpy(list, wal->list, sizeof(*wa) * wal->count);
 +
 +              wal->list = list;
 +      }
 +
 +      while (start < end) {
 +              unsigned int mid = start + (end - start) / 2;
 +
 +              if (i915_mmio_reg_offset(wal->list[mid].reg) < addr) {
 +                      start = mid + 1;
 +              } else if (i915_mmio_reg_offset(wal->list[mid].reg) > addr) {
 +                      end = mid;
 +              } else {
 +                      wa_ = &wal->list[mid];
 +
 +                      if ((wa->mask & ~wa_->mask) == 0) {
 +                              DRM_ERROR("Discarding overwritten w/a for reg %04x (mask: %08x, value: %08x)\n",
 +                                        i915_mmio_reg_offset(wa_->reg),
 +                                        wa_->mask, wa_->val);
 +
 +                              wa_->val &= ~wa->mask;
 +                      }
 +
 +                      wal->wa_count++;
 +                      wa_->val |= wa->val;
 +                      wa_->mask |= wa->mask;
 +                      wa_->read |= wa->read;
 +                      return;
 +              }
 +      }
 +
 +      wal->wa_count++;
 +      wa_ = &wal->list[wal->count++];
 +      *wa_ = *wa;
 +
 +      while (wa_-- > wal->list) {
 +              GEM_BUG_ON(i915_mmio_reg_offset(wa_[0].reg) ==
 +                         i915_mmio_reg_offset(wa_[1].reg));
 +              if (i915_mmio_reg_offset(wa_[1].reg) >
 +                  i915_mmio_reg_offset(wa_[0].reg))
 +                      break;
 +
 +              swap(wa_[1], wa_[0]);
 +      }
 +}
 +
 +static void
 +wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
 +                 u32 val)
 +{
 +      struct i915_wa wa = {
 +              .reg  = reg,
 +              .mask = mask,
 +              .val  = val,
 +              .read = mask,
 +      };
 +
 +      _wa_add(wal, &wa);
 +}
 +
 +static void
 +wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 +{
 +      wa_write_masked_or(wal, reg, val, _MASKED_BIT_ENABLE(val));
 +}
 +
 +static void
 +wa_write(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 +{
 +      wa_write_masked_or(wal, reg, ~0, val);
 +}
 +
 +static void
 +wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 +{
 +      wa_write_masked_or(wal, reg, val, val);
 +}
 +
 +static void
 +ignore_wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask, u32 val)
 +{
 +      struct i915_wa wa = {
 +              .reg  = reg,
 +              .mask = mask,
 +              .val  = val,
 +              /* Bonkers HW, skip verifying */
 +      };
 +
 +      _wa_add(wal, &wa);
 +}
 +
 +#define WA_SET_BIT_MASKED(addr, mask) \
 +      wa_write_masked_or(wal, (addr), (mask), _MASKED_BIT_ENABLE(mask))
 +
 +#define WA_CLR_BIT_MASKED(addr, mask) \
 +      wa_write_masked_or(wal, (addr), (mask), _MASKED_BIT_DISABLE(mask))
 +
 +#define WA_SET_FIELD_MASKED(addr, mask, value) \
 +      wa_write_masked_or(wal, (addr), (mask), _MASKED_FIELD((mask), (value)))
 +
 +static void gen8_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                    struct i915_wa_list *wal)
 +{
 +      WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);
 +
 +      /* WaDisableAsyncFlipPerfMode:bdw,chv */
 +      WA_SET_BIT_MASKED(MI_MODE, ASYNC_FLIP_PERF_DISABLE);
 +
 +      /* WaDisablePartialInstShootdown:bdw,chv */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
 +                        PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 +
 +      /* Use Force Non-Coherent whenever executing a 3D context. This is a
 +       * workaround for for a possible hang in the unlikely event a TLB
 +       * invalidation occurs during a PSD flush.
 +       */
 +      /* WaForceEnableNonCoherent:bdw,chv */
 +      /* WaHdcDisableFetchWhenMasked:bdw,chv */
 +      WA_SET_BIT_MASKED(HDC_CHICKEN0,
 +                        HDC_DONOT_FETCH_MEM_WHEN_MASKED |
 +                        HDC_FORCE_NON_COHERENT);
 +
 +      /* From the Haswell PRM, Command Reference: Registers, CACHE_MODE_0:
 +       * "The Hierarchical Z RAW Stall Optimization allows non-overlapping
 +       *  polygons in the same 8x4 pixel/sample area to be processed without
 +       *  stalling waiting for the earlier ones to write to Hierarchical Z
 +       *  buffer."
 +       *
 +       * This optimization is off by default for BDW and CHV; turn it on.
 +       */
 +      WA_CLR_BIT_MASKED(CACHE_MODE_0_GEN7, HIZ_RAW_STALL_OPT_DISABLE);
 +
 +      /* Wa4x4STCOptimizationDisable:bdw,chv */
 +      WA_SET_BIT_MASKED(CACHE_MODE_1, GEN8_4x4_STC_OPTIMIZATION_DISABLE);
 +
 +      /*
 +       * BSpec recommends 8x4 when MSAA is used,
 +       * however in practice 16x4 seems fastest.
 +       *
 +       * Note that PS/WM thread counts depend on the WIZ hashing
 +       * disable bit, which we don't touch here, but it's good
 +       * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
 +       */
 +      WA_SET_FIELD_MASKED(GEN7_GT_MODE,
 +                          GEN6_WIZ_HASHING_MASK,
 +                          GEN6_WIZ_HASHING_16x4);
 +}
 +
 +static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      gen8_ctx_workarounds_init(engine, wal);
 +
 +      /* WaDisableThreadStallDopClockGating:bdw (pre-production) */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, STALL_DOP_GATING_DISABLE);
 +
 +      /* WaDisableDopClockGating:bdw
 +       *
 +       * Also see the related UCGTCL1 write in broadwell_init_clock_gating()
 +       * to disable EUTC clock gating.
 +       */
 +      WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
 +                        DOP_CLOCK_GATING_DISABLE);
 +
 +      WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
 +                        GEN8_SAMPLER_POWER_BYPASS_DIS);
 +
 +      WA_SET_BIT_MASKED(HDC_CHICKEN0,
 +                        /* WaForceContextSaveRestoreNonCoherent:bdw */
 +                        HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
 +                        /* WaDisableFenceDestinationToSLM:bdw (pre-prod) */
 +                        (IS_BDW_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0));
 +}
 +
 +static void chv_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      gen8_ctx_workarounds_init(engine, wal);
 +
 +      /* WaDisableThreadStallDopClockGating:chv */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, STALL_DOP_GATING_DISABLE);
 +
 +      /* Improve HiZ throughput on CHV. */
 +      WA_SET_BIT_MASKED(HIZ_CHICKEN, CHV_HZ_8X8_MODE_IN_1X);
 +}
 +
 +static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                    struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      if (HAS_LLC(i915)) {
 +              /* WaCompressedResourceSamplerPbeMediaNewHashMode:skl,kbl
 +               *
 +               * Must match Display Engine. See
 +               * WaCompressedResourceDisplayNewHashMode.
 +               */
 +              WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                                GEN9_PBE_COMPRESSED_HASH_SELECTION);
 +              WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
 +                                GEN9_SAMPLER_HASH_COMPRESSED_READ_ADDR);
 +      }
 +
 +      /* WaClearFlowControlGpgpuContextSave:skl,bxt,kbl,glk,cfl */
 +      /* WaDisablePartialInstShootdown:skl,bxt,kbl,glk,cfl */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
 +                        FLOW_CONTROL_ENABLE |
 +                        PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 +
 +      /* Syncing dependencies between camera and graphics:skl,bxt,kbl */
 +      if (!IS_COFFEELAKE(i915))
 +              WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
 +                                GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
 +
 +      /* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */
 +      /* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */
 +      WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
 +                        GEN9_ENABLE_YV12_BUGFIX |
 +                        GEN9_ENABLE_GPGPU_PREEMPTION);
 +
 +      /* Wa4x4STCOptimizationDisable:skl,bxt,kbl,glk,cfl */
 +      /* WaDisablePartialResolveInVc:skl,bxt,kbl,cfl */
 +      WA_SET_BIT_MASKED(CACHE_MODE_1,
 +                        GEN8_4x4_STC_OPTIMIZATION_DISABLE |
 +                        GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE);
 +
 +      /* WaCcsTlbPrefetchDisable:skl,bxt,kbl,glk,cfl */
 +      WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
 +                        GEN9_CCS_TLB_PREFETCH_ENABLE);
 +
 +      /* WaForceContextSaveRestoreNonCoherent:skl,bxt,kbl,cfl */
 +      WA_SET_BIT_MASKED(HDC_CHICKEN0,
 +                        HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
 +                        HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE);
 +
 +      /* WaForceEnableNonCoherent and WaDisableHDCInvalidation are
 +       * both tied to WaForceContextSaveRestoreNonCoherent
 +       * in some hsds for skl. We keep the tie for all gen9. The
 +       * documentation is a bit hazy and so we want to get common behaviour,
 +       * even though there is no clear evidence we would need both on kbl/bxt.
 +       * This area has been source of system hangs so we play it safe
 +       * and mimic the skl regardless of what bspec says.
 +       *
 +       * Use Force Non-Coherent whenever executing a 3D context. This
 +       * is a workaround for a possible hang in the unlikely event
 +       * a TLB invalidation occurs during a PSD flush.
 +       */
 +
 +      /* WaForceEnableNonCoherent:skl,bxt,kbl,cfl */
 +      WA_SET_BIT_MASKED(HDC_CHICKEN0,
 +                        HDC_FORCE_NON_COHERENT);
 +
 +      /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
 +      if (IS_SKYLAKE(i915) || IS_KABYLAKE(i915) || IS_COFFEELAKE(i915))
 +              WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
 +                                GEN8_SAMPLER_POWER_BYPASS_DIS);
 +
 +      /* WaDisableSTUnitPowerOptimization:skl,bxt,kbl,glk,cfl */
 +      WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN2, GEN8_ST_PO_DISABLE);
 +
 +      /*
 +       * Supporting preemption with fine-granularity requires changes in the
 +       * batch buffer programming. Since we can't break old userspace, we
 +       * need to set our default preemption level to safe value. Userspace is
 +       * still able to use more fine-grained preemption levels, since in
 +       * WaEnablePreemptionGranularityControlByUMD we're whitelisting the
 +       * per-ctx register. As such, WaDisable{3D,GPGPU}MidCmdPreemption are
 +       * not real HW workarounds, but merely a way to start using preemption
 +       * while maintaining old contract with userspace.
 +       */
 +
 +      /* WaDisable3DMidCmdPreemption:skl,bxt,glk,cfl,[cnl] */
 +      WA_CLR_BIT_MASKED(GEN8_CS_CHICKEN1, GEN9_PREEMPT_3D_OBJECT_LEVEL);
 +
 +      /* WaDisableGPGPUMidCmdPreemption:skl,bxt,blk,cfl,[cnl] */
 +      WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1,
 +                          GEN9_PREEMPT_GPGPU_LEVEL_MASK,
 +                          GEN9_PREEMPT_GPGPU_COMMAND_LEVEL);
 +
 +      /* WaClearHIZ_WM_CHICKEN3:bxt,glk */
 +      if (IS_GEN9_LP(i915))
 +              WA_SET_BIT_MASKED(GEN9_WM_CHICKEN3, GEN9_FACTOR_IN_CLR_VAL_HIZ);
 +}
 +
 +static void skl_tune_iz_hashing(struct intel_engine_cs *engine,
 +                              struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +      u8 vals[3] = { 0, 0, 0 };
 +      unsigned int i;
 +
 +      for (i = 0; i < 3; i++) {
 +              u8 ss;
 +
 +              /*
 +               * Only consider slices where one, and only one, subslice has 7
 +               * EUs
 +               */
 +              if (!is_power_of_2(RUNTIME_INFO(i915)->sseu.subslice_7eu[i]))
 +                      continue;
 +
 +              /*
 +               * subslice_7eu[i] != 0 (because of the check above) and
 +               * ss_max == 4 (maximum number of subslices possible per slice)
 +               *
 +               * ->    0 <= ss <= 3;
 +               */
 +              ss = ffs(RUNTIME_INFO(i915)->sseu.subslice_7eu[i]) - 1;
 +              vals[i] = 3 - ss;
 +      }
 +
 +      if (vals[0] == 0 && vals[1] == 0 && vals[2] == 0)
 +              return;
 +
 +      /* Tune IZ hashing. See intel_device_info_runtime_init() */
 +      WA_SET_FIELD_MASKED(GEN7_GT_MODE,
 +                          GEN9_IZ_HASHING_MASK(2) |
 +                          GEN9_IZ_HASHING_MASK(1) |
 +                          GEN9_IZ_HASHING_MASK(0),
 +                          GEN9_IZ_HASHING(2, vals[2]) |
 +                          GEN9_IZ_HASHING(1, vals[1]) |
 +                          GEN9_IZ_HASHING(0, vals[0]));
 +}
 +
 +static void skl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      gen9_ctx_workarounds_init(engine, wal);
 +      skl_tune_iz_hashing(engine, wal);
 +}
 +
 +static void bxt_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      gen9_ctx_workarounds_init(engine, wal);
 +
 +      /* WaDisableThreadStallDopClockGating:bxt */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
 +                        STALL_DOP_GATING_DISABLE);
 +
 +      /* WaToEnableHwFixForPushConstHWBug:bxt */
 +      WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                        GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 +}
 +
 +static void kbl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      gen9_ctx_workarounds_init(engine, wal);
 +
 +      /* WaToEnableHwFixForPushConstHWBug:kbl */
 +      if (IS_KBL_REVID(i915, KBL_REVID_C0, REVID_FOREVER))
 +              WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                                GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 +
 +      /* WaDisableSbeCacheDispatchPortSharing:kbl */
 +      WA_SET_BIT_MASKED(GEN7_HALF_SLICE_CHICKEN1,
 +                        GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
 +}
 +
 +static void glk_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      gen9_ctx_workarounds_init(engine, wal);
 +
 +      /* WaToEnableHwFixForPushConstHWBug:glk */
 +      WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                        GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 +}
 +
 +static void cfl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      gen9_ctx_workarounds_init(engine, wal);
 +
 +      /* WaToEnableHwFixForPushConstHWBug:cfl */
 +      WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                        GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 +
 +      /* WaDisableSbeCacheDispatchPortSharing:cfl */
 +      WA_SET_BIT_MASKED(GEN7_HALF_SLICE_CHICKEN1,
 +                        GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
 +}
 +
 +static void cnl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      /* WaForceContextSaveRestoreNonCoherent:cnl */
 +      WA_SET_BIT_MASKED(CNL_HDC_CHICKEN0,
 +                        HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT);
 +
 +      /* WaThrottleEUPerfToAvoidTDBackPressure:cnl(pre-prod) */
 +      if (IS_CNL_REVID(i915, CNL_REVID_B0, CNL_REVID_B0))
 +              WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, THROTTLE_12_5);
 +
 +      /* WaDisableReplayBufferBankArbitrationOptimization:cnl */
 +      WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                        GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 +
 +      /* WaDisableEnhancedSBEVertexCaching:cnl (pre-prod) */
 +      if (IS_CNL_REVID(i915, 0, CNL_REVID_B0))
 +              WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 +                                GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE);
 +
 +      /* WaPushConstantDereferenceHoldDisable:cnl */
 +      WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 +
 +      /* FtrEnableFastAnisoL1BankingFix:cnl */
 +      WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
 +
 +      /* WaDisable3DMidCmdPreemption:cnl */
 +      WA_CLR_BIT_MASKED(GEN8_CS_CHICKEN1, GEN9_PREEMPT_3D_OBJECT_LEVEL);
 +
 +      /* WaDisableGPGPUMidCmdPreemption:cnl */
 +      WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1,
 +                          GEN9_PREEMPT_GPGPU_LEVEL_MASK,
 +                          GEN9_PREEMPT_GPGPU_COMMAND_LEVEL);
 +
 +      /* WaDisableEarlyEOT:cnl */
 +      WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, DISABLE_EARLY_EOT);
 +}
 +
 +static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 +                                   struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
++      /* WaDisableBankHangMode:icl */
++      wa_write(wal,
++               GEN8_L3CNTLREG,
++               intel_uncore_read(engine->uncore, GEN8_L3CNTLREG) |
++               GEN8_ERRDETBCTRL);
++
 +      /* WaDisableBankHangMode:icl */
 +      wa_write(wal,
 +               GEN8_L3CNTLREG,
 +               intel_uncore_read(engine->uncore, GEN8_L3CNTLREG) |
 +               GEN8_ERRDETBCTRL);
 +
 +      /* Wa_1604370585:icl (pre-prod)
 +       * Formerly known as WaPushConstantDereferenceHoldDisable
 +       */
 +      if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_B0))
 +              WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
 +                                PUSH_CONSTANT_DEREF_DISABLE);
 +
 +      /* WaForceEnableNonCoherent:icl
 +       * This is not the same workaround as in early Gen9 platforms, where
 +       * lacking this could cause system hangs, but coherency performance
 +       * overhead is high and only a few compute workloads really need it
 +       * (the register is whitelisted in hardware now, so UMDs can opt in
 +       * for coherency if they have a good reason).
 +       */
 +      WA_SET_BIT_MASKED(ICL_HDC_MODE, HDC_FORCE_NON_COHERENT);
 +
 +      /* Wa_2006611047:icl (pre-prod)
 +       * Formerly known as WaDisableImprovedTdlClkGating
 +       */
 +      if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_A0))
 +              WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
 +                                GEN11_TDL_CLOCK_GATING_FIX_DISABLE);
 +
 +      /* Wa_2006665173:icl (pre-prod) */
 +      if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_A0))
 +              WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
 +                                GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC);
 +
 +      /* WaEnableFloatBlendOptimization:icl */
 +      wa_write_masked_or(wal,
 +                         GEN10_CACHE_MODE_SS,
 +                         0, /* write-only, so skip validation */
 +                         _MASKED_BIT_ENABLE(FLOAT_BLEND_OPTIMIZATION_ENABLE));
 +
 +      /* WaDisableGPGPUMidThreadPreemption:icl */
 +      WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1,
 +                          GEN9_PREEMPT_GPGPU_LEVEL_MASK,
 +                          GEN9_PREEMPT_GPGPU_THREAD_GROUP_LEVEL);
 +
 +      /* allow headerless messages for preemptible GPGPU context */
 +      WA_SET_BIT_MASKED(GEN10_SAMPLER_MODE,
 +                        GEN11_SAMPLER_ENABLE_HEADLESS_MSG);
 +}
 +
 +static void
 +__intel_engine_init_ctx_wa(struct intel_engine_cs *engine,
 +                         struct i915_wa_list *wal,
 +                         const char *name)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      if (engine->class != RENDER_CLASS)
 +              return;
 +
 +      wa_init_start(wal, name);
 +
 +      if (IS_GEN(i915, 11))
 +              icl_ctx_workarounds_init(engine, wal);
 +      else if (IS_CANNONLAKE(i915))
 +              cnl_ctx_workarounds_init(engine, wal);
 +      else if (IS_COFFEELAKE(i915))
 +              cfl_ctx_workarounds_init(engine, wal);
 +      else if (IS_GEMINILAKE(i915))
 +              glk_ctx_workarounds_init(engine, wal);
 +      else if (IS_KABYLAKE(i915))
 +              kbl_ctx_workarounds_init(engine, wal);
 +      else if (IS_BROXTON(i915))
 +              bxt_ctx_workarounds_init(engine, wal);
 +      else if (IS_SKYLAKE(i915))
 +              skl_ctx_workarounds_init(engine, wal);
 +      else if (IS_CHERRYVIEW(i915))
 +              chv_ctx_workarounds_init(engine, wal);
 +      else if (IS_BROADWELL(i915))
 +              bdw_ctx_workarounds_init(engine, wal);
 +      else if (INTEL_GEN(i915) < 8)
 +              return;
 +      else
 +              MISSING_CASE(INTEL_GEN(i915));
 +
 +      wa_init_finish(wal);
 +}
 +
 +void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
 +{
 +      __intel_engine_init_ctx_wa(engine, &engine->ctx_wa_list, "context");
 +}
 +
 +int intel_engine_emit_ctx_wa(struct i915_request *rq)
 +{
 +      struct i915_wa_list *wal = &rq->engine->ctx_wa_list;
 +      struct i915_wa *wa;
 +      unsigned int i;
 +      u32 *cs;
 +      int ret;
 +
 +      if (wal->count == 0)
 +              return 0;
 +
 +      ret = rq->engine->emit_flush(rq, EMIT_BARRIER);
 +      if (ret)
 +              return ret;
 +
 +      cs = intel_ring_begin(rq, (wal->count * 2 + 2));
 +      if (IS_ERR(cs))
 +              return PTR_ERR(cs);
 +
 +      *cs++ = MI_LOAD_REGISTER_IMM(wal->count);
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++) {
 +              *cs++ = i915_mmio_reg_offset(wa->reg);
 +              *cs++ = wa->val;
 +      }
 +      *cs++ = MI_NOOP;
 +
 +      intel_ring_advance(rq, cs);
 +
 +      ret = rq->engine->emit_flush(rq, EMIT_BARRIER);
 +      if (ret)
 +              return ret;
 +
 +      return 0;
 +}
 +
 +static void
 +gen9_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      /* WaDisableKillLogic:bxt,skl,kbl */
 +      if (!IS_COFFEELAKE(i915))
 +              wa_write_or(wal,
 +                          GAM_ECOCHK,
 +                          ECOCHK_DIS_TLB);
 +
 +      if (HAS_LLC(i915)) {
 +              /* WaCompressedResourceSamplerPbeMediaNewHashMode:skl,kbl
 +               *
 +               * Must match Display Engine. See
 +               * WaCompressedResourceDisplayNewHashMode.
 +               */
 +              wa_write_or(wal,
 +                          MMCD_MISC_CTRL,
 +                          MMCD_PCLA | MMCD_HOTSPOT_EN);
 +      }
 +
 +      /* WaDisableHDCInvalidation:skl,bxt,kbl,cfl */
 +      wa_write_or(wal,
 +                  GAM_ECOCHK,
 +                  BDW_DISABLE_HDC_INVALIDATION);
 +}
 +
 +static void
 +skl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      gen9_gt_workarounds_init(i915, wal);
 +
 +      /* WaDisableGafsUnitClkGating:skl */
 +      wa_write_or(wal,
 +                  GEN7_UCGCTL4,
 +                  GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
 +
 +      /* WaInPlaceDecompressionHang:skl */
 +      if (IS_SKL_REVID(i915, SKL_REVID_H0, REVID_FOREVER))
 +              wa_write_or(wal,
 +                          GEN9_GAMT_ECO_REG_RW_IA,
 +                          GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +}
 +
 +static void
 +bxt_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      gen9_gt_workarounds_init(i915, wal);
 +
 +      /* WaInPlaceDecompressionHang:bxt */
 +      wa_write_or(wal,
 +                  GEN9_GAMT_ECO_REG_RW_IA,
 +                  GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +}
 +
 +static void
 +kbl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      gen9_gt_workarounds_init(i915, wal);
 +
 +      /* WaDisableDynamicCreditSharing:kbl */
 +      if (IS_KBL_REVID(i915, 0, KBL_REVID_B0))
 +              wa_write_or(wal,
 +                          GAMT_CHKN_BIT_REG,
 +                          GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING);
 +
 +      /* WaDisableGafsUnitClkGating:kbl */
 +      wa_write_or(wal,
 +                  GEN7_UCGCTL4,
 +                  GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
 +
 +      /* WaInPlaceDecompressionHang:kbl */
 +      wa_write_or(wal,
 +                  GEN9_GAMT_ECO_REG_RW_IA,
 +                  GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +}
 +
 +static void
 +glk_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      gen9_gt_workarounds_init(i915, wal);
 +}
 +
 +static void
 +cfl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      gen9_gt_workarounds_init(i915, wal);
 +
 +      /* WaDisableGafsUnitClkGating:cfl */
 +      wa_write_or(wal,
 +                  GEN7_UCGCTL4,
 +                  GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
 +
 +      /* WaInPlaceDecompressionHang:cfl */
 +      wa_write_or(wal,
 +                  GEN9_GAMT_ECO_REG_RW_IA,
 +                  GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +}
 +
 +static void
 +wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      const struct sseu_dev_info *sseu = &RUNTIME_INFO(i915)->sseu;
 +      u32 mcr_slice_subslice_mask;
 +
 +      /*
 +       * WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl
 +       * L3Banks could be fused off in single slice scenario. If that is
 +       * the case, we might need to program MCR select to a valid L3Bank
 +       * by default, to make sure we correctly read certain registers
 +       * later on (in the range 0xB100 - 0xB3FF).
 +       * This might be incompatible with
 +       * WaProgramMgsrForCorrectSliceSpecificMmioReads.
 +       * Fortunately, this should not happen in production hardware, so
 +       * we only assert that this is the case (instead of implementing
 +       * something more complex that requires checking the range of every
 +       * MMIO read).
 +       */
 +      if (INTEL_GEN(i915) >= 10 &&
 +          is_power_of_2(sseu->slice_mask)) {
 +              /*
 +               * read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches
 +               * enabled subslice, no need to redirect MCR packet
 +               */
 +              u32 slice = fls(sseu->slice_mask);
 +              u32 fuse3 =
 +                      intel_uncore_read(&i915->uncore, GEN10_MIRROR_FUSE3);
 +              u8 ss_mask = sseu->subslice_mask[slice];
 +
 +              u8 enabled_mask = (ss_mask | ss_mask >>
 +                                 GEN10_L3BANK_PAIR_COUNT) & GEN10_L3BANK_MASK;
 +              u8 disabled_mask = fuse3 & GEN10_L3BANK_MASK;
 +
 +              /*
 +               * Production silicon should have matched L3Bank and
 +               * subslice enabled
 +               */
 +              WARN_ON((enabled_mask & disabled_mask) != enabled_mask);
 +      }
 +
 +      if (INTEL_GEN(i915) >= 11)
 +              mcr_slice_subslice_mask = GEN11_MCR_SLICE_MASK |
 +                                        GEN11_MCR_SUBSLICE_MASK;
 +      else
 +              mcr_slice_subslice_mask = GEN8_MCR_SLICE_MASK |
 +                                        GEN8_MCR_SUBSLICE_MASK;
 +      /*
 +       * WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl
 +       * Before any MMIO read into slice/subslice specific registers, MCR
 +       * packet control register needs to be programmed to point to any
 +       * enabled s/ss pair. Otherwise, incorrect values will be returned.
 +       * This means each subsequent MMIO read will be forwarded to an
 +       * specific s/ss combination, but this is OK since these registers
 +       * are consistent across s/ss in almost all cases. In the rare
 +       * occasions, such as INSTDONE, where this value is dependent
 +       * on s/ss combo, the read should be done with read_subslice_reg.
 +       */
 +      wa_write_masked_or(wal,
 +                         GEN8_MCR_SELECTOR,
 +                         mcr_slice_subslice_mask,
 +                         intel_calculate_mcr_s_ss_select(i915));
 +}
 +
 +static void
 +cnl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      wa_init_mcr(i915, wal);
 +
 +      /* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */
 +      if (IS_CNL_REVID(i915, CNL_REVID_B0, CNL_REVID_B0))
 +              wa_write_or(wal,
 +                          GAMT_CHKN_BIT_REG,
 +                          GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT);
 +
 +      /* WaInPlaceDecompressionHang:cnl */
 +      wa_write_or(wal,
 +                  GEN9_GAMT_ECO_REG_RW_IA,
 +                  GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +}
 +
 +static void
 +icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      wa_init_mcr(i915, wal);
 +
 +      /* WaInPlaceDecompressionHang:icl */
 +      wa_write_or(wal,
 +                  GEN9_GAMT_ECO_REG_RW_IA,
 +                  GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
 +
 +      /* WaModifyGamTlbPartitioning:icl */
 +      wa_write_masked_or(wal,
 +                         GEN11_GACB_PERF_CTRL,
 +                         GEN11_HASH_CTRL_MASK,
 +                         GEN11_HASH_CTRL_BIT0 | GEN11_HASH_CTRL_BIT4);
 +
 +      /* Wa_1405766107:icl
 +       * Formerly known as WaCL2SFHalfMaxAlloc
 +       */
 +      wa_write_or(wal,
 +                  GEN11_LSN_UNSLCVC,
 +                  GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC |
 +                  GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MAXALLOC);
 +
 +      /* Wa_220166154:icl
 +       * Formerly known as WaDisCtxReload
 +       */
 +      wa_write_or(wal,
 +                  GEN8_GAMW_ECO_DEV_RW_IA,
 +                  GAMW_ECO_DEV_CTX_RELOAD_DISABLE);
 +
 +      /* Wa_1405779004:icl (pre-prod) */
 +      if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_A0))
 +              wa_write_or(wal,
 +                          SLICE_UNIT_LEVEL_CLKGATE,
 +                          MSCUNIT_CLKGATE_DIS);
 +
 +      /* Wa_1406680159:icl */
 +      wa_write_or(wal,
 +                  SUBSLICE_UNIT_LEVEL_CLKGATE,
 +                  GWUNIT_CLKGATE_DIS);
 +
 +      /* Wa_1406838659:icl (pre-prod) */
 +      if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_B0))
 +              wa_write_or(wal,
 +                          INF_UNIT_LEVEL_CLKGATE,
 +                          CGPSF_CLKGATE_DIS);
 +
 +      /* Wa_1406463099:icl
 +       * Formerly known as WaGamTlbPendError
 +       */
 +      wa_write_or(wal,
 +                  GAMT_CHKN_BIT_REG,
 +                  GAMT_CHKN_DISABLE_L3_COH_PIPE);
 +}
 +
 +static void
 +gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
 +{
 +      if (IS_GEN(i915, 11))
 +              icl_gt_workarounds_init(i915, wal);
 +      else if (IS_CANNONLAKE(i915))
 +              cnl_gt_workarounds_init(i915, wal);
 +      else if (IS_COFFEELAKE(i915))
 +              cfl_gt_workarounds_init(i915, wal);
 +      else if (IS_GEMINILAKE(i915))
 +              glk_gt_workarounds_init(i915, wal);
 +      else if (IS_KABYLAKE(i915))
 +              kbl_gt_workarounds_init(i915, wal);
 +      else if (IS_BROXTON(i915))
 +              bxt_gt_workarounds_init(i915, wal);
 +      else if (IS_SKYLAKE(i915))
 +              skl_gt_workarounds_init(i915, wal);
 +      else if (INTEL_GEN(i915) <= 8)
 +              return;
 +      else
 +              MISSING_CASE(INTEL_GEN(i915));
 +}
 +
 +void intel_gt_init_workarounds(struct drm_i915_private *i915)
 +{
 +      struct i915_wa_list *wal = &i915->gt_wa_list;
 +
 +      wa_init_start(wal, "GT");
 +      gt_init_workarounds(i915, wal);
 +      wa_init_finish(wal);
 +}
 +
 +static enum forcewake_domains
 +wal_get_fw_for_rmw(struct intel_uncore *uncore, const struct i915_wa_list *wal)
 +{
 +      enum forcewake_domains fw = 0;
 +      struct i915_wa *wa;
 +      unsigned int i;
 +
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
 +              fw |= intel_uncore_forcewake_for_reg(uncore,
 +                                                   wa->reg,
 +                                                   FW_REG_READ |
 +                                                   FW_REG_WRITE);
 +
 +      return fw;
 +}
 +
 +static bool
 +wa_verify(const struct i915_wa *wa, u32 cur, const char *name, const char *from)
 +{
 +      if ((cur ^ wa->val) & wa->read) {
 +              DRM_ERROR("%s workaround lost on %s! (%x=%x/%x, expected %x, mask=%x)\n",
 +                        name, from, i915_mmio_reg_offset(wa->reg),
 +                        cur, cur & wa->read,
 +                        wa->val, wa->mask);
 +
 +              return false;
 +      }
 +
 +      return true;
 +}
 +
 +static void
 +wa_list_apply(struct intel_uncore *uncore, const struct i915_wa_list *wal)
 +{
 +      enum forcewake_domains fw;
 +      unsigned long flags;
 +      struct i915_wa *wa;
 +      unsigned int i;
 +
 +      if (!wal->count)
 +              return;
 +
 +      fw = wal_get_fw_for_rmw(uncore, wal);
 +
 +      spin_lock_irqsave(&uncore->lock, flags);
 +      intel_uncore_forcewake_get__locked(uncore, fw);
 +
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++) {
 +              intel_uncore_rmw_fw(uncore, wa->reg, wa->mask, wa->val);
 +              if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
 +                      wa_verify(wa,
 +                                intel_uncore_read_fw(uncore, wa->reg),
 +                                wal->name, "application");
 +      }
 +
 +      intel_uncore_forcewake_put__locked(uncore, fw);
 +      spin_unlock_irqrestore(&uncore->lock, flags);
 +}
 +
 +void intel_gt_apply_workarounds(struct drm_i915_private *i915)
 +{
 +      wa_list_apply(&i915->uncore, &i915->gt_wa_list);
 +}
 +
 +static bool wa_list_verify(struct intel_uncore *uncore,
 +                         const struct i915_wa_list *wal,
 +                         const char *from)
 +{
 +      struct i915_wa *wa;
 +      unsigned int i;
 +      bool ok = true;
 +
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
 +              ok &= wa_verify(wa,
 +                              intel_uncore_read(uncore, wa->reg),
 +                              wal->name, from);
 +
 +      return ok;
 +}
 +
 +bool intel_gt_verify_workarounds(struct drm_i915_private *i915,
 +                               const char *from)
 +{
 +      return wa_list_verify(&i915->uncore, &i915->gt_wa_list, from);
 +}
 +
 +static void
 +whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg)
 +{
 +      struct i915_wa wa = {
 +              .reg = reg
 +      };
 +
 +      if (GEM_DEBUG_WARN_ON(wal->count >= RING_MAX_NONPRIV_SLOTS))
 +              return;
 +
 +      _wa_add(wal, &wa);
 +}
 +
 +static void gen9_whitelist_build(struct i915_wa_list *w)
 +{
 +      /* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */
 +      whitelist_reg(w, GEN9_CTX_PREEMPT_REG);
 +
 +      /* WaEnablePreemptionGranularityControlByUMD:skl,bxt,kbl,cfl,[cnl] */
 +      whitelist_reg(w, GEN8_CS_CHICKEN1);
 +
 +      /* WaAllowUMDToModifyHDCChicken1:skl,bxt,kbl,glk,cfl */
 +      whitelist_reg(w, GEN8_HDC_CHICKEN1);
 +}
 +
 +static void skl_whitelist_build(struct i915_wa_list *w)
 +{
 +      gen9_whitelist_build(w);
 +
 +      /* WaDisableLSQCROPERFforOCL:skl */
 +      whitelist_reg(w, GEN8_L3SQCREG4);
 +}
 +
 +static void bxt_whitelist_build(struct i915_wa_list *w)
 +{
 +      gen9_whitelist_build(w);
 +}
 +
 +static void kbl_whitelist_build(struct i915_wa_list *w)
 +{
 +      gen9_whitelist_build(w);
 +
 +      /* WaDisableLSQCROPERFforOCL:kbl */
 +      whitelist_reg(w, GEN8_L3SQCREG4);
 +}
 +
 +static void glk_whitelist_build(struct i915_wa_list *w)
 +{
 +      gen9_whitelist_build(w);
 +
 +      /* WA #0862: Userspace has to set "Barrier Mode" to avoid hangs. */
 +      whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1);
 +}
 +
 +static void cfl_whitelist_build(struct i915_wa_list *w)
 +{
 +      gen9_whitelist_build(w);
 +}
 +
 +static void cnl_whitelist_build(struct i915_wa_list *w)
 +{
 +      /* WaEnablePreemptionGranularityControlByUMD:cnl */
 +      whitelist_reg(w, GEN8_CS_CHICKEN1);
 +}
 +
 +static void icl_whitelist_build(struct i915_wa_list *w)
 +{
 +      /* WaAllowUMDToModifyHalfSliceChicken7:icl */
 +      whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
 +
 +      /* WaAllowUMDToModifySamplerMode:icl */
 +      whitelist_reg(w, GEN10_SAMPLER_MODE);
 +
 +      /* WaEnableStateCacheRedirectToCS:icl */
 +      whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1);
 +}
 +
 +void intel_engine_init_whitelist(struct intel_engine_cs *engine)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +      struct i915_wa_list *w = &engine->whitelist;
 +
 +      if (engine->class != RENDER_CLASS)
 +              return;
 +
 +      wa_init_start(w, "whitelist");
 +
 +      if (IS_GEN(i915, 11))
 +              icl_whitelist_build(w);
 +      else if (IS_CANNONLAKE(i915))
 +              cnl_whitelist_build(w);
 +      else if (IS_COFFEELAKE(i915))
 +              cfl_whitelist_build(w);
 +      else if (IS_GEMINILAKE(i915))
 +              glk_whitelist_build(w);
 +      else if (IS_KABYLAKE(i915))
 +              kbl_whitelist_build(w);
 +      else if (IS_BROXTON(i915))
 +              bxt_whitelist_build(w);
 +      else if (IS_SKYLAKE(i915))
 +              skl_whitelist_build(w);
 +      else if (INTEL_GEN(i915) <= 8)
 +              return;
 +      else
 +              MISSING_CASE(INTEL_GEN(i915));
 +
 +      wa_init_finish(w);
 +}
 +
 +void intel_engine_apply_whitelist(struct intel_engine_cs *engine)
 +{
 +      const struct i915_wa_list *wal = &engine->whitelist;
 +      struct intel_uncore *uncore = engine->uncore;
 +      const u32 base = engine->mmio_base;
 +      struct i915_wa *wa;
 +      unsigned int i;
 +
 +      if (!wal->count)
 +              return;
 +
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
 +              intel_uncore_write(uncore,
 +                                 RING_FORCE_TO_NONPRIV(base, i),
 +                                 i915_mmio_reg_offset(wa->reg));
 +
 +      /* And clear the rest just in case of garbage */
 +      for (; i < RING_MAX_NONPRIV_SLOTS; i++)
 +              intel_uncore_write(uncore,
 +                                 RING_FORCE_TO_NONPRIV(base, i),
 +                                 i915_mmio_reg_offset(RING_NOPID(base)));
 +}
 +
 +static void
 +rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      if (IS_GEN(i915, 11)) {
 +              /* This is not an Wa. Enable for better image quality */
 +              wa_masked_en(wal,
 +                           _3D_CHICKEN3,
 +                           _3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE);
 +
 +              /* WaPipelineFlushCoherentLines:icl */
 +              ignore_wa_write_or(wal,
 +                                 GEN8_L3SQCREG4,
 +                                 GEN8_LQSC_FLUSH_COHERENT_LINES,
 +                                 GEN8_LQSC_FLUSH_COHERENT_LINES);
 +
 +              /*
 +               * Wa_1405543622:icl
 +               * Formerly known as WaGAPZPriorityScheme
 +               */
 +              wa_write_or(wal,
 +                          GEN8_GARBCNTL,
 +                          GEN11_ARBITRATION_PRIO_ORDER_MASK);
 +
 +              /*
 +               * Wa_1604223664:icl
 +               * Formerly known as WaL3BankAddressHashing
 +               */
 +              wa_write_masked_or(wal,
 +                                 GEN8_GARBCNTL,
 +                                 GEN11_HASH_CTRL_EXCL_MASK,
 +                                 GEN11_HASH_CTRL_EXCL_BIT0);
 +              wa_write_masked_or(wal,
 +                                 GEN11_GLBLINVL,
 +                                 GEN11_BANK_HASH_ADDR_EXCL_MASK,
 +                                 GEN11_BANK_HASH_ADDR_EXCL_BIT0);
 +
 +              /*
 +               * Wa_1405733216:icl
 +               * Formerly known as WaDisableCleanEvicts
 +               */
 +              ignore_wa_write_or(wal,
 +                                 GEN8_L3SQCREG4,
 +                                 GEN11_LQSC_CLEAN_EVICT_DISABLE,
 +                                 GEN11_LQSC_CLEAN_EVICT_DISABLE);
 +
 +              /* WaForwardProgressSoftReset:icl */
 +              wa_write_or(wal,
 +                          GEN10_SCRATCH_LNCF2,
 +                          PMFLUSHDONE_LNICRSDROP |
 +                          PMFLUSH_GAPL3UNBLOCK |
 +                          PMFLUSHDONE_LNEBLK);
 +
 +              /* Wa_1406609255:icl (pre-prod) */
 +              if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_B0))
 +                      wa_write_or(wal,
 +                                  GEN7_SARCHKMD,
 +                                  GEN7_DISABLE_DEMAND_PREFETCH |
 +                                  GEN7_DISABLE_SAMPLER_PREFETCH);
 +      }
 +
 +      if (IS_GEN_RANGE(i915, 9, 11)) {
 +              /* FtrPerCtxtPreemptionGranularityControl:skl,bxt,kbl,cfl,cnl,icl */
 +              wa_masked_en(wal,
 +                           GEN7_FF_SLICE_CS_CHICKEN1,
 +                           GEN9_FFSC_PERCTX_PREEMPT_CTRL);
 +      }
 +
 +      if (IS_SKYLAKE(i915) || IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
 +              /* WaEnableGapsTsvCreditFix:skl,kbl,cfl */
 +              wa_write_or(wal,
 +                          GEN8_GARBCNTL,
 +                          GEN9_GAPS_TSV_CREDIT_DISABLE);
 +      }
 +
 +      if (IS_BROXTON(i915)) {
 +              /* WaDisablePooledEuLoadBalancingFix:bxt */
 +              wa_masked_en(wal,
 +                           FF_SLICE_CS_CHICKEN2,
 +                           GEN9_POOLED_EU_LOAD_BALANCING_FIX_DISABLE);
 +      }
 +
 +      if (IS_GEN(i915, 9)) {
 +              /* WaContextSwitchWithConcurrentTLBInvalidate:skl,bxt,kbl,glk,cfl */
 +              wa_masked_en(wal,
 +                           GEN9_CSFE_CHICKEN1_RCS,
 +                           GEN9_PREEMPT_GPGPU_SYNC_SWITCH_DISABLE);
 +
 +              /* WaEnableLbsSlaRetryTimerDecrement:skl,bxt,kbl,glk,cfl */
 +              wa_write_or(wal,
 +                          BDW_SCRATCH1,
 +                          GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE);
 +
 +              /* WaProgramL3SqcReg1DefaultForPerf:bxt,glk */
 +              if (IS_GEN9_LP(i915))
 +                      wa_write_masked_or(wal,
 +                                         GEN8_L3SQCREG1,
 +                                         L3_PRIO_CREDITS_MASK,
 +                                         L3_GENERAL_PRIO_CREDITS(62) |
 +                                         L3_HIGH_PRIO_CREDITS(2));
 +
 +              /* WaOCLCoherentLineFlush:skl,bxt,kbl,cfl */
 +              wa_write_or(wal,
 +                          GEN8_L3SQCREG4,
 +                          GEN8_LQSC_FLUSH_COHERENT_LINES);
 +      }
 +}
 +
 +static void
 +xcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 +{
 +      struct drm_i915_private *i915 = engine->i915;
 +
 +      /* WaKBLVECSSemaphoreWaitPoll:kbl */
 +      if (IS_KBL_REVID(i915, KBL_REVID_A0, KBL_REVID_E0)) {
 +              wa_write(wal,
 +                       RING_SEMA_WAIT_POLL(engine->mmio_base),
 +                       1);
 +      }
 +}
 +
 +static void
 +engine_init_workarounds(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 +{
 +      if (I915_SELFTEST_ONLY(INTEL_GEN(engine->i915) < 8))
 +              return;
 +
 +      if (engine->id == RCS0)
 +              rcs_engine_wa_init(engine, wal);
 +      else
 +              xcs_engine_wa_init(engine, wal);
 +}
 +
 +void intel_engine_init_workarounds(struct intel_engine_cs *engine)
 +{
 +      struct i915_wa_list *wal = &engine->wa_list;
 +
 +      if (GEM_WARN_ON(INTEL_GEN(engine->i915) < 8))
 +              return;
 +
 +      wa_init_start(wal, engine->name);
 +      engine_init_workarounds(engine, wal);
 +      wa_init_finish(wal);
 +}
 +
 +void intel_engine_apply_workarounds(struct intel_engine_cs *engine)
 +{
 +      wa_list_apply(engine->uncore, &engine->wa_list);
 +}
 +
 +static struct i915_vma *
 +create_scratch(struct i915_address_space *vm, int count)
 +{
 +      struct drm_i915_gem_object *obj;
 +      struct i915_vma *vma;
 +      unsigned int size;
 +      int err;
 +
 +      size = round_up(count * sizeof(u32), PAGE_SIZE);
 +      obj = i915_gem_object_create_internal(vm->i915, size);
 +      if (IS_ERR(obj))
 +              return ERR_CAST(obj);
 +
 +      i915_gem_object_set_cache_coherency(obj, I915_CACHE_LLC);
 +
 +      vma = i915_vma_instance(obj, vm, NULL);
 +      if (IS_ERR(vma)) {
 +              err = PTR_ERR(vma);
 +              goto err_obj;
 +      }
 +
 +      err = i915_vma_pin(vma, 0, 0,
 +                         i915_vma_is_ggtt(vma) ? PIN_GLOBAL : PIN_USER);
 +      if (err)
 +              goto err_obj;
 +
 +      return vma;
 +
 +err_obj:
 +      i915_gem_object_put(obj);
 +      return ERR_PTR(err);
 +}
 +
 +static int
 +wa_list_srm(struct i915_request *rq,
 +          const struct i915_wa_list *wal,
 +          struct i915_vma *vma)
 +{
 +      const struct i915_wa *wa;
 +      unsigned int i;
 +      u32 srm, *cs;
 +
 +      srm = MI_STORE_REGISTER_MEM | MI_SRM_LRM_GLOBAL_GTT;
 +      if (INTEL_GEN(rq->i915) >= 8)
 +              srm++;
 +
 +      cs = intel_ring_begin(rq, 4 * wal->count);
 +      if (IS_ERR(cs))
 +              return PTR_ERR(cs);
 +
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++) {
 +              *cs++ = srm;
 +              *cs++ = i915_mmio_reg_offset(wa->reg);
 +              *cs++ = i915_ggtt_offset(vma) + sizeof(u32) * i;
 +              *cs++ = 0;
 +      }
 +      intel_ring_advance(rq, cs);
 +
 +      return 0;
 +}
 +
 +static int engine_wa_list_verify(struct intel_context *ce,
 +                               const struct i915_wa_list * const wal,
 +                               const char *from)
 +{
 +      const struct i915_wa *wa;
 +      struct i915_request *rq;
 +      struct i915_vma *vma;
 +      unsigned int i;
 +      u32 *results;
 +      int err;
 +
 +      if (!wal->count)
 +              return 0;
 +
 +      vma = create_scratch(&ce->engine->i915->ggtt.vm, wal->count);
 +      if (IS_ERR(vma))
 +              return PTR_ERR(vma);
 +
 +      rq = intel_context_create_request(ce);
 +      if (IS_ERR(rq)) {
 +              err = PTR_ERR(rq);
 +              goto err_vma;
 +      }
 +
 +      err = wa_list_srm(rq, wal, vma);
 +      if (err)
 +              goto err_vma;
 +
 +      i915_request_add(rq);
 +      if (i915_request_wait(rq, I915_WAIT_LOCKED, HZ / 5) < 0) {
 +              err = -ETIME;
 +              goto err_vma;
 +      }
 +
 +      results = i915_gem_object_pin_map(vma->obj, I915_MAP_WB);
 +      if (IS_ERR(results)) {
 +              err = PTR_ERR(results);
 +              goto err_vma;
 +      }
 +
 +      err = 0;
 +      for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
 +              if (!wa_verify(wa, results[i], wal->name, from))
 +                      err = -ENXIO;
 +
 +      i915_gem_object_unpin_map(vma->obj);
 +
 +err_vma:
 +      i915_vma_unpin(vma);
 +      i915_vma_put(vma);
 +      return err;
 +}
 +
 +int intel_engine_verify_workarounds(struct intel_engine_cs *engine,
 +                                  const char *from)
 +{
 +      return engine_wa_list_verify(engine->kernel_context,
 +                                   &engine->wa_list,
 +                                   from);
 +}
 +
 +#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
 +#include "selftest_workarounds.c"
 +#endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d39f2a567b3f0bba11422abc4f332c6606957546,8506e6d62b637b0908546a2bc53b1677b617a05d..c47671ce6c485c45075522f34845ae4c139a177a
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge