kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/i915/gvt/opregion.c
..
..
@@ -30,7 +30,7 @@
30
30
  * not do like this.
31
31
  */
32
32
 #define _INTEL_BIOS_PRIVATE
33
-#include "intel_vbt_defs.h"
33
+#include "display/intel_vbt_defs.h"
34
34
 
35
35
 #define OPREGION_SIGNATURE "IntelGraphicsMem"
36
36
 #define MBOX_VBT      (1<<3)
..
..
@@ -147,15 +147,14 @@
147
147
 	/* there's features depending on version! */
148
148
 	v->header.version = 155;
149
149
 	v->header.header_size = sizeof(v->header);
150
-	v->header.vbt_size = sizeof(struct vbt) - sizeof(v->header);
150
+	v->header.vbt_size = sizeof(struct vbt);
151
151
 	v->header.bdb_offset = offsetof(struct vbt, bdb_header);
152
152
 
153
153
 	strcpy(&v->bdb_header.signature[0], "BIOS_DATA_BLOCK");
154
154
 	v->bdb_header.version = 186; /* child_dev_size = 33 */
155
155
 	v->bdb_header.header_size = sizeof(v->bdb_header);
156
156
 
157
-	v->bdb_header.bdb_size = sizeof(struct vbt) - sizeof(struct vbt_header)
158
-		- sizeof(struct bdb_header);
157
+	v->bdb_header.bdb_size = sizeof(struct vbt) - sizeof(struct vbt_header);
159
158
 
160
159
 	/* general features */
161
160
 	v->general_features_header.id = BDB_GENERAL_FEATURES;
..
..
@@ -214,7 +213,6 @@
214
213
 /**
215
214
  * intel_vgpu_init_opregion - initialize the stuff used to emulate opregion
216
215
  * @vgpu: a vGPU
217
- * @gpa: guest physical address of opregion
218
216
  *
219
217
  * Returns:
220
218
  * Zero on success, negative error code if failed.