update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/i915/gvt/firmware.c
..
..
@@ -68,16 +68,15 @@
68
68
 
69
69
 static int mmio_snapshot_handler(struct intel_gvt *gvt, u32 offset, void *data)
70
70
 {
71
-	struct drm_i915_private *dev_priv = gvt->dev_priv;
72
-
73
-	*(u32 *)(data + offset) = I915_READ_NOTRACE(_MMIO(offset));
71
+	*(u32 *)(data + offset) = intel_uncore_read_notrace(gvt->gt->uncore,
72
+							    _MMIO(offset));
74
73
 	return 0;
75
74
 }
76
75
 
77
76
 static int expose_firmware_sysfs(struct intel_gvt *gvt)
78
77
 {
79
78
 	struct intel_gvt_device_info *info = &gvt->device_info;
80
-	struct pci_dev *pdev = gvt->dev_priv->drm.pdev;
79
+	struct pci_dev *pdev = gvt->gt->i915->drm.pdev;
81
80
 	struct gvt_firmware_header *h;
82
81
 	void *firmware;
83
82
 	void *p;
..
..
@@ -128,7 +127,7 @@
128
127
 
129
128
 static void clean_firmware_sysfs(struct intel_gvt *gvt)
130
129
 {
131
-	struct pci_dev *pdev = gvt->dev_priv->drm.pdev;
130
+	struct pci_dev *pdev = gvt->gt->i915->drm.pdev;
132
131
 
133
132
 	device_remove_bin_file(&pdev->dev, &firmware_attr);
134
133
 	vfree(firmware_attr.private);
..
..
@@ -145,15 +144,14 @@
145
144
 		clean_firmware_sysfs(gvt);
146
145
 
147
146
 	kfree(gvt->firmware.cfg_space);
148
-	kfree(gvt->firmware.mmio);
147
+	vfree(gvt->firmware.mmio);
149
148
 }
150
149
 
151
150
 static int verify_firmware(struct intel_gvt *gvt,
152
151
 			   const struct firmware *fw)
153
152
 {
154
153
 	struct intel_gvt_device_info *info = &gvt->device_info;
155
-	struct drm_i915_private *dev_priv = gvt->dev_priv;
156
-	struct pci_dev *pdev = dev_priv->drm.pdev;
154
+	struct pci_dev *pdev = gvt->gt->i915->drm.pdev;
157
155
 	struct gvt_firmware_header *h;
158
156
 	unsigned long id, crc32_start;
159
157
 	const void *mem;
..
..
@@ -207,8 +205,7 @@
207
205
 int intel_gvt_load_firmware(struct intel_gvt *gvt)
208
206
 {
209
207
 	struct intel_gvt_device_info *info = &gvt->device_info;
210
-	struct drm_i915_private *dev_priv = gvt->dev_priv;
211
-	struct pci_dev *pdev = dev_priv->drm.pdev;
208
+	struct pci_dev *pdev = gvt->gt->i915->drm.pdev;
212
209
 	struct intel_gvt_firmware *firmware = &gvt->firmware;
213
210
 	struct gvt_firmware_header *h;
214
211
 	const struct firmware *fw;
..
..
@@ -228,7 +225,7 @@
228
225
 
229
226
 	firmware->cfg_space = mem;
230
227
 
231
-	mem = kmalloc(info->mmio_size, GFP_KERNEL);
228
+	mem = vmalloc(info->mmio_size);
232
229
 	if (!mem) {
233
230
 		kfree(path);
234
231
 		kfree(firmware->cfg_space);
..
..
@@ -243,7 +240,7 @@
243
240
 
244
241
 	gvt_dbg_core("request hw state firmware %s...\n", path);
245
242
 
246
-	ret = request_firmware(&fw, path, &dev_priv->drm.pdev->dev);
243
+	ret = request_firmware(&fw, path, &gvt->gt->i915->drm.pdev->dev);
247
244
 	kfree(path);
248
245
 
249
246
 	if (ret)