From 7c061d33198bafa862875a5d538c57bd6fadc2cb Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Sun, 8 Nov 2020 01:52:49 -0600 Subject: [PATCH] patch set: port to 4.19.155 --- ...dd-key-retrieval-for-RPMB-multiplexor.patch | 2 +- ...v2.h-Add-request-field-to-v4l2_buffer.patch | 6 +++--- ...-v4l-Add-new-vectorised-pixel-formats.patch | 8 ++++---- ...-highspeed-to-USB3.0-on-bxtp-platform.patch | 2 +- 0077-procfs-add-smack-subdir-to-attrs.patch | 8 ++++---- ...ple-concurrent-major-security-modules.patch | 4 ++-- ...-use-u32-instead-of-int-for-PCR-index.patch | 2 +- ...drm-i915-gvt-Add-vgt-id-in-context-id.patch | 4 ++-- ...pport-vGPU-guest-framebuffer-GEM-obje.patch | 4 ++-- ...d-scaler-owner-to-support-guest-plane.patch | 4 ++-- ...vt-add-module-parameter-enable_pvmmio.patch | 4 ++-- ...m-i915-implement-pvmmio-in-guest-i915.patch | 10 +++++----- ...rm-i915-Decouple-pipe-and-crtc-index-.patch | 4 ++-- ...rm-i915-Introduce-the-Plane-Restricti.patch | 4 ++-- ...base-gvtbuffer-to-use-upstream-functi.patch | 4 ++-- ...interface-to-get-GFX-shmem-usage-stat.patch | 18 +++++++++--------- ...G-drm-i915-Allow-late-GuC-HuC-loading.patch | 6 +++--- 0688-reboot-add-reboot_panic-parameter.patch | 2 +- ...ns-to-print-system-info-when-panic-ha.patch | 2 +- ...preemption-timeout-to-enforce-interac.patch | 4 ++-- ...5-Add-plane-alpha-blending-support-v2.patch | 4 ++-- ...m-i915-Introduce-initial-mode-setting.patch | 6 +++--- ...5-Add-plane-alpha-blending-support-v2.patch | 4 ++-- ...15-Add-plane-alpha-blending-support-v.patch | 4 ++-- ...ck-to-avoid-racing-of-pvmmio-operatio.patch | 4 ++-- ...m-i915-Remove-i915-ggtt-WA-since-GT-E.patch | 6 +++--- ...-add-support-for-virtio-i2c-FE-driver.patch | 2 +- 27 files changed, 66 insertions(+), 66 deletions(-) diff --git a/0037-rpmb-mux-add-key-retrieval-for-RPMB-multiplexor.patch b/0037-rpmb-mux-add-key-retrieval-for-RPMB-multiplexor.patch index a4052c29..749b4146 100644 --- a/0037-rpmb-mux-add-key-retrieval-for-RPMB-multiplexor.patch +++ b/0037-rpmb-mux-add-key-retrieval-for-RPMB-multiplexor.patch @@ -30,7 +30,7 @@ Signed-off-by: Tomas Winkler create mode 100644 drivers/char/rpmb/mux/key_sbl.h diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 30752db57587..f58f95024b9c 100644 +index 8dbc8d4ec8f0..1c6ca4d46d08 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -745,6 +745,10 @@ diff --git a/0046-videodev2.h-Add-request-field-to-v4l2_buffer.patch b/0046-videodev2.h-Add-request-field-to-v4l2_buffer.patch index 19ff29a4..00828681 100644 --- a/0046-videodev2.h-Add-request-field-to-v4l2_buffer.patch +++ b/0046-videodev2.h-Add-request-field-to-v4l2_buffer.patch @@ -132,10 +132,10 @@ index 3d5e2d739f05..317c2b7fe105 100644 /* diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 1aae2e4b8f10..fef1758ae2e4 100644 +index b73f4423bc09..f9ed822c145f 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h -@@ -928,6 +928,7 @@ struct v4l2_plane { +@@ -927,6 +927,7 @@ struct v4l2_plane { * @length: size in bytes of the buffer (NOT its payload) for single-plane * buffers (when type != *_MPLANE); number of elements in the * planes array for multi-plane buffers @@ -143,7 +143,7 @@ index 1aae2e4b8f10..fef1758ae2e4 100644 * * Contains data exchanged by application and driver using one of the Streaming * I/O methods. -@@ -951,7 +952,10 @@ struct v4l2_buffer { +@@ -950,7 +951,10 @@ struct v4l2_buffer { __s32 fd; } m; __u32 length; diff --git a/0052-media-v4l-Add-new-vectorised-pixel-formats.patch b/0052-media-v4l-Add-new-vectorised-pixel-formats.patch index f38bc843..439997ab 100644 --- a/0052-media-v4l-Add-new-vectorised-pixel-formats.patch +++ b/0052-media-v4l-Add-new-vectorised-pixel-formats.patch @@ -10,10 +10,10 @@ Signed-off-by: Meng Wei 1 file changed, 30 insertions(+) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index fef1758ae2e4..6964ab3cdef9 100644 +index f9ed822c145f..8665da3b15e8 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h -@@ -555,6 +555,7 @@ struct v4l2_pix_format { +@@ -554,6 +554,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */ #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */ #define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */ @@ -21,7 +21,7 @@ index fef1758ae2e4..6964ab3cdef9 100644 /* two planes -- one Y, one Cr + Cb interleaved */ #define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ -@@ -621,6 +622,10 @@ struct v4l2_pix_format { +@@ -620,6 +621,10 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C') #define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C') #define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C') @@ -32,7 +32,7 @@ index fef1758ae2e4..6964ab3cdef9 100644 /* 14bit raw bayer packed, 7 bytes for every 4 pixels */ #define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E') #define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E') -@@ -631,6 +636,31 @@ struct v4l2_pix_format { +@@ -630,6 +635,31 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16 GRGR.. BGBG.. */ #define V4L2_PIX_FMT_SRGGB16 v4l2_fourcc('R', 'G', '1', '6') /* 16 RGRG.. GBGB.. */ diff --git a/0069-dwc3-setup-highspeed-to-USB3.0-on-bxtp-platform.patch b/0069-dwc3-setup-highspeed-to-USB3.0-on-bxtp-platform.patch index b066a9ff..5f5c5001 100644 --- a/0069-dwc3-setup-highspeed-to-USB3.0-on-bxtp-platform.patch +++ b/0069-dwc3-setup-highspeed-to-USB3.0-on-bxtp-platform.patch @@ -17,7 +17,7 @@ Signed-off-by: Greniger, Jacek 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index 37cc3fd7c3ca..18e4d1511a31 100644 +index f0d2f0a4e990..44e4dea865c1 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -18,6 +18,7 @@ diff --git a/0077-procfs-add-smack-subdir-to-attrs.patch b/0077-procfs-add-smack-subdir-to-attrs.patch index 16541d57..cd304c5c 100644 --- a/0077-procfs-add-smack-subdir-to-attrs.patch +++ b/0077-procfs-add-smack-subdir-to-attrs.patch @@ -62,7 +62,7 @@ index c980dfe9abf1..9842e21afd4a 100644 :maxdepth: 1 diff --git a/fs/proc/base.c b/fs/proc/base.c -index 3b9b726b1a6c..126c6696bd70 100644 +index 5e705fa9a913..e919aee77d40 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -140,9 +140,13 @@ struct pid_entry { @@ -80,7 +80,7 @@ index 3b9b726b1a6c..126c6696bd70 100644 /* * Count the number of hardlinks for the pid_entry table, excluding the . -@@ -2547,7 +2551,7 @@ static ssize_t proc_pid_attr_read(struct file * file, char __user * buf, +@@ -2546,7 +2550,7 @@ static ssize_t proc_pid_attr_read(struct file * file, char __user * buf, if (!task) return -ESRCH; @@ -89,7 +89,7 @@ index 3b9b726b1a6c..126c6696bd70 100644 (char*)file->f_path.dentry->d_name.name, &p); put_task_struct(task); -@@ -2601,7 +2605,9 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, +@@ -2600,7 +2604,9 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, if (rv < 0) goto out_free; @@ -100,7 +100,7 @@ index 3b9b726b1a6c..126c6696bd70 100644 mutex_unlock(¤t->signal->cred_guard_mutex); out_free: kfree(page); -@@ -2615,13 +2621,53 @@ static const struct file_operations proc_pid_attr_operations = { +@@ -2614,13 +2620,53 @@ static const struct file_operations proc_pid_attr_operations = { .llseek = generic_file_llseek, }; diff --git a/0097-LSM-Multiple-concurrent-major-security-modules.patch b/0097-LSM-Multiple-concurrent-major-security-modules.patch index c6e41c69..51996912 100644 --- a/0097-LSM-Multiple-concurrent-major-security-modules.patch +++ b/0097-LSM-Multiple-concurrent-major-security-modules.patch @@ -215,10 +215,10 @@ index b17201edfa09..a10d54910652 100644 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/fork.c b/kernel/fork.c -index 1a2d18e98bf9..5b231ea4a74e 100644 +index 3ed29bf8eb29..f670b4bd93f2 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -1862,6 +1862,9 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1881,6 +1881,9 @@ static __latent_entropy struct task_struct *copy_process( p->sequential_io = 0; p->sequential_io_avg = 0; #endif diff --git a/0124-tpm-use-u32-instead-of-int-for-PCR-index.patch b/0124-tpm-use-u32-instead-of-int-for-PCR-index.patch index b44e74e0..093b0d73 100644 --- a/0124-tpm-use-u32-instead-of-int-for-PCR-index.patch +++ b/0124-tpm-use-u32-instead-of-int-for-PCR-index.patch @@ -204,7 +204,7 @@ index 4609b94142d4..b49a55cf775f 100644 { return -ENODEV; diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c -index c5dd05ace28c..0c9446df344f 100644 +index f4f3de5f06ca..0b0ecf5351c5 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -651,7 +651,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, diff --git a/0590-drm-i915-gvt-Add-vgt-id-in-context-id.patch b/0590-drm-i915-gvt-Add-vgt-id-in-context-id.patch index c046dfcc..97d7b49a 100644 --- a/0590-drm-i915-gvt-Add-vgt-id-in-context-id.patch +++ b/0590-drm-i915-gvt-Add-vgt-id-in-context-id.patch @@ -28,10 +28,10 @@ Tested-by: Dong, Eddie 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index db2e9af49ae6..0f2fceefb8c2 100644 +index 37c80cfecd09..ab2599624db7 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1838,6 +1838,10 @@ struct drm_i915_private { +@@ -1840,6 +1840,10 @@ struct drm_i915_private { * This is limited in execlists to 21 bits. */ struct ida hw_ida; diff --git a/0594-drm-i915-gvt-Support-vGPU-guest-framebuffer-GEM-obje.patch b/0594-drm-i915-gvt-Support-vGPU-guest-framebuffer-GEM-obje.patch index bca6e970..880fc228 100644 --- a/0594-drm-i915-gvt-Support-vGPU-guest-framebuffer-GEM-obje.patch +++ b/0594-drm-i915-gvt-Support-vGPU-guest-framebuffer-GEM-obje.patch @@ -175,10 +175,10 @@ index b0d76a7a0946..258278fba559 100644 static struct drm_driver driver = { diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 0f2fceefb8c2..33b564c07c56 100644 +index ab2599624db7..0808350d8cc1 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -3265,6 +3265,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, +@@ -3269,6 +3269,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, void i915_oa_init_reg_state(struct intel_engine_cs *engine, struct i915_gem_context *ctx, uint32_t *reg_state); diff --git a/0596-drm-i915-gvt-add-scaler-owner-to-support-guest-plane.patch b/0596-drm-i915-gvt-add-scaler-owner-to-support-guest-plane.patch index c74eee07..95801f39 100644 --- a/0596-drm-i915-gvt-add-scaler-owner-to-support-guest-plane.patch +++ b/0596-drm-i915-gvt-add-scaler-owner-to-support-guest-plane.patch @@ -19,10 +19,10 @@ Signed-off-by: Fei Jiang 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 33b564c07c56..90968b05597d 100644 +index 0808350d8cc1..b9b3c9c2eb8d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1307,6 +1307,7 @@ struct i915_workarounds { +@@ -1309,6 +1309,7 @@ struct i915_workarounds { struct i915_virtual_gpu { bool active; u32 caps; diff --git a/0598-drm-i915-gvt-add-module-parameter-enable_pvmmio.patch b/0598-drm-i915-gvt-add-module-parameter-enable_pvmmio.patch index 23f1bbed..fa93dc6a 100644 --- a/0598-drm-i915-gvt-add-module-parameter-enable_pvmmio.patch +++ b/0598-drm-i915-gvt-add-module-parameter-enable_pvmmio.patch @@ -83,10 +83,10 @@ index 258278fba559..f5190c530dc2 100644 err_bridge: pci_dev_put(dev_priv->bridge_dev); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 90968b05597d..c129605ab9a7 100644 +index b9b3c9c2eb8d..91623d77a9f6 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1591,6 +1591,7 @@ struct drm_i915_private { +@@ -1593,6 +1593,7 @@ struct drm_i915_private { resource_size_t stolen_usable_size; /* Total size minus reserved ranges */ void __iomem *regs; diff --git a/0600-drm-i915-implement-pvmmio-in-guest-i915.patch b/0600-drm-i915-implement-pvmmio-in-guest-i915.patch index 5d626bab..8c48adc3 100644 --- a/0600-drm-i915-implement-pvmmio-in-guest-i915.patch +++ b/0600-drm-i915-implement-pvmmio-in-guest-i915.patch @@ -40,10 +40,10 @@ index f5190c530dc2..2202dfcdf5a3 100644 mutex_init(&dev_priv->backlight_lock); spin_lock_init(&dev_priv->uncore.lock); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index c129605ab9a7..65ff6dd2c5a8 100644 +index 91623d77a9f6..3b7e5160b7ca 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -55,6 +55,7 @@ +@@ -57,6 +57,7 @@ #include "i915_params.h" #include "i915_reg.h" @@ -51,7 +51,7 @@ index c129605ab9a7..65ff6dd2c5a8 100644 #include "i915_utils.h" #include "intel_bios.h" -@@ -1592,6 +1593,7 @@ struct drm_i915_private { +@@ -1594,6 +1595,7 @@ struct drm_i915_private { void __iomem *regs; struct gvt_shared_page *shared_page; @@ -59,7 +59,7 @@ index c129605ab9a7..65ff6dd2c5a8 100644 struct intel_uncore uncore; -@@ -2797,7 +2799,7 @@ static inline bool intel_gvt_active(struct drm_i915_private *dev_priv) +@@ -2801,7 +2803,7 @@ static inline bool intel_gvt_active(struct drm_i915_private *dev_priv) return dev_priv->gvt; } @@ -68,7 +68,7 @@ index c129605ab9a7..65ff6dd2c5a8 100644 { return dev_priv->vgpu.active; } -@@ -3607,7 +3609,11 @@ static inline u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, +@@ -3611,7 +3613,11 @@ static inline u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, static inline uint##x##_t __raw_i915_read##x(const struct drm_i915_private *dev_priv, \ i915_reg_t reg) \ { \ diff --git a/0642-INTERNAL-IOTG-drm-i915-Decouple-pipe-and-crtc-index-.patch b/0642-INTERNAL-IOTG-drm-i915-Decouple-pipe-and-crtc-index-.patch index 66d6feea..33129614 100644 --- a/0642-INTERNAL-IOTG-drm-i915-Decouple-pipe-and-crtc-index-.patch +++ b/0642-INTERNAL-IOTG-drm-i915-Decouple-pipe-and-crtc-index-.patch @@ -33,10 +33,10 @@ Change-Id: Iccf6b54c254e2b3d7053620c1b64ad8dda7632b8 8 files changed, 87 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 65ff6dd2c5a8..f573f6ff51c4 100644 +index 3b7e5160b7ca..7fbffa47fc37 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -2833,18 +2833,18 @@ ilk_disable_display_irq(struct drm_i915_private *dev_priv, uint32_t bits) +@@ -2837,18 +2837,18 @@ ilk_disable_display_irq(struct drm_i915_private *dev_priv, uint32_t bits) ilk_update_display_irq(dev_priv, bits, 0); } void bdw_update_pipe_irq(struct drm_i915_private *dev_priv, diff --git a/0644-INTERNAL-IOTG-drm-i915-Introduce-the-Plane-Restricti.patch b/0644-INTERNAL-IOTG-drm-i915-Introduce-the-Plane-Restricti.patch index d88d7104..ddbd64d7 100644 --- a/0644-INTERNAL-IOTG-drm-i915-Introduce-the-Plane-Restricti.patch +++ b/0644-INTERNAL-IOTG-drm-i915-Introduce-the-Plane-Restricti.patch @@ -196,10 +196,10 @@ index 2202dfcdf5a3..5fa2da278670 100644 goto out_cleanup_hw; } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index f573f6ff51c4..969b45cb88ba 100644 +index 7fbffa47fc37..bed0e3ca4399 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -2683,6 +2683,11 @@ intel_info(const struct drm_i915_private *dev_priv) +@@ -2685,6 +2685,11 @@ intel_info(const struct drm_i915_private *dev_priv) #define GT_FREQUENCY_MULTIPLIER 50 #define GEN9_FREQ_SCALER 3 diff --git a/0666-drm-i915-gvt-rebase-gvtbuffer-to-use-upstream-functi.patch b/0666-drm-i915-gvt-rebase-gvtbuffer-to-use-upstream-functi.patch index ab5043ba..d89954b4 100644 --- a/0666-drm-i915-gvt-rebase-gvtbuffer-to-use-upstream-functi.patch +++ b/0666-drm-i915-gvt-rebase-gvtbuffer-to-use-upstream-functi.patch @@ -135,10 +135,10 @@ index 51626759534b..6c51fe00d421 100644 - #endif diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 969b45cb88ba..13f693f8432d 100644 +index bed0e3ca4399..1b61ed91687f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -3274,8 +3274,16 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, +@@ -3278,8 +3278,16 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, void i915_oa_init_reg_state(struct intel_engine_cs *engine, struct i915_gem_context *ctx, uint32_t *reg_state); diff --git a/0675-drm-i915-Sysfs-interface-to-get-GFX-shmem-usage-stat.patch b/0675-drm-i915-Sysfs-interface-to-get-GFX-shmem-usage-stat.patch index 60cf9118..b1e6ca9a 100644 --- a/0675-drm-i915-Sysfs-interface-to-get-GFX-shmem-usage-stat.patch +++ b/0675-drm-i915-Sysfs-interface-to-get-GFX-shmem-usage-stat.patch @@ -136,10 +136,10 @@ index 5fa2da278670..7a91c1e6974e 100644 .gem_free_object_unlocked = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 13f693f8432d..d3a7100b32f6 100644 +index 1b61ed91687f..3cd14d171c61 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -79,6 +79,9 @@ +@@ -81,6 +81,9 @@ #include "i915_scheduler.h" #include "i915_timeline.h" #include "i915_vma.h" @@ -149,7 +149,7 @@ index 13f693f8432d..d3a7100b32f6 100644 #include "intel_gvt.h" -@@ -334,6 +337,11 @@ struct drm_i915_file_private { +@@ -336,6 +339,11 @@ struct drm_i915_file_private { struct drm_i915_private *dev_priv; struct drm_file *file; @@ -161,7 +161,7 @@ index 13f693f8432d..d3a7100b32f6 100644 struct { spinlock_t lock; struct list_head request_list; -@@ -352,6 +360,10 @@ struct drm_i915_file_private { +@@ -354,6 +362,10 @@ struct drm_i915_file_private { unsigned int bsd_engine; @@ -172,7 +172,7 @@ index 13f693f8432d..d3a7100b32f6 100644 /* * Every context ban increments per client ban score. Also * hangs in short succession increments ban score. If ban threshold -@@ -998,6 +1010,10 @@ struct i915_gem_mm { +@@ -1000,6 +1012,10 @@ struct i915_gem_mm { spinlock_t object_stat_lock; u64 object_memory; u32 object_count; @@ -183,7 +183,7 @@ index 13f693f8432d..d3a7100b32f6 100644 }; #define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */ -@@ -1671,6 +1687,10 @@ struct drm_i915_private { +@@ -1673,6 +1689,10 @@ struct drm_i915_private { bool preserve_bios_swizzle; @@ -194,7 +194,7 @@ index 13f693f8432d..d3a7100b32f6 100644 /* overlay */ struct intel_overlay *overlay; -@@ -2922,6 +2942,11 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size); +@@ -2926,6 +2946,11 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size); struct drm_i915_gem_object * i915_gem_object_create_from_data(struct drm_i915_private *dev_priv, const void *data, size_t size); @@ -206,7 +206,7 @@ index 13f693f8432d..d3a7100b32f6 100644 void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file); void i915_gem_free_object(struct drm_gem_object *obj); -@@ -3361,6 +3386,19 @@ u32 i915_gem_fence_size(struct drm_i915_private *dev_priv, u32 size, +@@ -3365,6 +3390,19 @@ u32 i915_gem_fence_size(struct drm_i915_private *dev_priv, u32 size, u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size, unsigned int tiling, unsigned int stride); @@ -226,7 +226,7 @@ index 13f693f8432d..d3a7100b32f6 100644 /* i915_debugfs.c */ #ifdef CONFIG_DEBUG_FS int i915_debugfs_register(struct drm_i915_private *dev_priv); -@@ -3402,6 +3440,13 @@ extern int i915_restore_state(struct drm_i915_private *dev_priv); +@@ -3406,6 +3444,13 @@ extern int i915_restore_state(struct drm_i915_private *dev_priv); void i915_setup_sysfs(struct drm_i915_private *dev_priv); void i915_teardown_sysfs(struct drm_i915_private *dev_priv); diff --git a/0678-MUST_REBASE-IOTG-drm-i915-Allow-late-GuC-HuC-loading.patch b/0678-MUST_REBASE-IOTG-drm-i915-Allow-late-GuC-HuC-loading.patch index fc831fa8..f7317d96 100644 --- a/0678-MUST_REBASE-IOTG-drm-i915-Allow-late-GuC-HuC-loading.patch +++ b/0678-MUST_REBASE-IOTG-drm-i915-Allow-late-GuC-HuC-loading.patch @@ -29,10 +29,10 @@ Signed-off-by: Badiuzzaman Iskhandar 2 files changed, 36 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 00bf65c0a6ff..e23bf4f373e9 100644 +index d12bb20355aa..9b4ea20d6091 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3170,6 +3170,14 @@ diff --git a/0790-drm-i915-Use-a-preemption-timeout-to-enforce-interac.patch b/0790-drm-i915-Use-a-preemption-timeout-to-enforce-interac.patch index b2a2f75b..cb0d6362 100644 --- a/0790-drm-i915-Use-a-preemption-timeout-to-enforce-interac.patch +++ b/0790-drm-i915-Use-a-preemption-timeout-to-enforce-interac.patch @@ -22,10 +22,10 @@ Signed-off-by: kimsehun 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 53459d5475b5..60860858cb51 100644 +index 972b25e62711..3114060cc117 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -3224,8 +3224,10 @@ int i915_gem_object_wait(struct drm_i915_gem_object *obj, +@@ -3228,8 +3228,10 @@ int i915_gem_object_wait(struct drm_i915_gem_object *obj, struct intel_rps_client *rps); int i915_gem_object_wait_priority(struct drm_i915_gem_object *obj, unsigned int flags, diff --git a/0857-drm-i915-Add-plane-alpha-blending-support-v2.patch b/0857-drm-i915-Add-plane-alpha-blending-support-v2.patch index 88d0fb34..30089af4 100644 --- a/0857-drm-i915-Add-plane-alpha-blending-support-v2.patch +++ b/0857-drm-i915-Add-plane-alpha-blending-support-v2.patch @@ -36,10 +36,10 @@ Signed-off-by: kimsehun 5 files changed, 69 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 60860858cb51..f981e49980f2 100644 +index 3114060cc117..9ccce17a43cc 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -558,6 +558,8 @@ struct intel_fbc { +@@ -560,6 +560,8 @@ struct intel_fbc { int adjusted_y; int y; diff --git a/0861-drm-i915-Introduce-initial-mode-setting.patch b/0861-drm-i915-Introduce-initial-mode-setting.patch index e6688063..ac630f8c 100644 --- a/0861-drm-i915-Introduce-initial-mode-setting.patch +++ b/0861-drm-i915-Introduce-initial-mode-setting.patch @@ -107,10 +107,10 @@ index 7a91c1e6974e..e1391951e244 100644 } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index f981e49980f2..baab05dad59a 100644 +index 9ccce17a43cc..374e589f0691 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1777,6 +1777,8 @@ struct drm_i915_private { +@@ -1779,6 +1779,8 @@ struct drm_i915_private { struct intel_pipe_crc pipe_crc[I915_MAX_PIPES]; #endif @@ -119,7 +119,7 @@ index f981e49980f2..baab05dad59a 100644 /* dpll and cdclk state is protected by connection_mutex */ int num_shared_dpll; struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; -@@ -2775,6 +2777,11 @@ extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv); +@@ -2779,6 +2781,11 @@ extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv); extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv); extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv); extern void i915_update_gfx_val(struct drm_i915_private *dev_priv); diff --git a/0869-Revert-drm-i915-Add-plane-alpha-blending-support-v2.patch b/0869-Revert-drm-i915-Add-plane-alpha-blending-support-v2.patch index 59f7bb50..0ef27442 100644 --- a/0869-Revert-drm-i915-Add-plane-alpha-blending-support-v2.patch +++ b/0869-Revert-drm-i915-Add-plane-alpha-blending-support-v2.patch @@ -18,10 +18,10 @@ Tracked-On: PKT-1679 5 files changed, 18 insertions(+), 69 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index baab05dad59a..52adbd4fbacd 100644 +index 374e589f0691..11a71f83b36f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -558,8 +558,6 @@ struct intel_fbc { +@@ -560,8 +560,6 @@ struct intel_fbc { int adjusted_y; int y; diff --git a/0997-INTERNAL-drm-i915-Add-plane-alpha-blending-support-v.patch b/0997-INTERNAL-drm-i915-Add-plane-alpha-blending-support-v.patch index 522c43f0..271d7d7e 100644 --- a/0997-INTERNAL-drm-i915-Add-plane-alpha-blending-support-v.patch +++ b/0997-INTERNAL-drm-i915-Add-plane-alpha-blending-support-v.patch @@ -43,10 +43,10 @@ Signed-off-by: kimsehun 5 files changed, 48 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 52adbd4fbacd..baab05dad59a 100644 +index 11a71f83b36f..374e589f0691 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -558,6 +558,8 @@ struct intel_fbc { +@@ -560,6 +560,8 @@ struct intel_fbc { int adjusted_y; int y; diff --git a/1024-drm-i915-add-lock-to-avoid-racing-of-pvmmio-operatio.patch b/1024-drm-i915-add-lock-to-avoid-racing-of-pvmmio-operatio.patch index a9b046da..7e7216a7 100644 --- a/1024-drm-i915-add-lock-to-avoid-racing-of-pvmmio-operatio.patch +++ b/1024-drm-i915-add-lock-to-avoid-racing-of-pvmmio-operatio.patch @@ -37,10 +37,10 @@ index e1391951e244..cf328eed2437 100644 mutex_init(&dev_priv->backlight_lock); spin_lock_init(&dev_priv->uncore.lock); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index baab05dad59a..c7fdcd2563c5 100644 +index 374e589f0691..b3bde94ee3ab 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1612,6 +1612,8 @@ struct drm_i915_private { +@@ -1614,6 +1614,8 @@ struct drm_i915_private { void __iomem *regs; struct gvt_shared_page *shared_page; spinlock_t shared_page_lock; diff --git a/1136-drm-i915-Remove-i915-ggtt-WA-since-GT-E.patch b/1136-drm-i915-Remove-i915-ggtt-WA-since-GT-E.patch index 939378aa..203dc591 100644 --- a/1136-drm-i915-Remove-i915-ggtt-WA-since-GT-E.patch +++ b/1136-drm-i915-Remove-i915-ggtt-WA-since-GT-E.patch @@ -14,10 +14,10 @@ Signed-off-by: Yang, Dong 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index c7fdcd2563c5..3f1a37f787d4 100644 +index b3bde94ee3ab..71c8dca55f6b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -2477,6 +2477,8 @@ intel_info(const struct drm_i915_private *dev_priv) +@@ -2479,6 +2479,8 @@ intel_info(const struct drm_i915_private *dev_priv) #define BXT_REVID_B0 0x3 #define BXT_REVID_B_LAST 0x8 #define BXT_REVID_C0 0x9 @@ -26,7 +26,7 @@ index c7fdcd2563c5..3f1a37f787d4 100644 #define IS_BXT_REVID(dev_priv, since, until) \ (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until)) -@@ -2735,7 +2737,7 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) +@@ -2739,7 +2741,7 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) static inline bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv) { diff --git a/1216-add-support-for-virtio-i2c-FE-driver.patch b/1216-add-support-for-virtio-i2c-FE-driver.patch index 4616577f..3b9c7c15 100644 --- a/1216-add-support-for-virtio-i2c-FE-driver.patch +++ b/1216-add-support-for-virtio-i2c-FE-driver.patch @@ -20,7 +20,7 @@ Reviewed-by: Zhao Yakui create mode 100644 drivers/i2c/busses/i2c-virtio.c diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index ee6dd1b84fac..879d5577a614 100644 +index 017aec34a238..afd909560705 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -20,6 +20,17 @@ config I2C_ALI1535