Merge tag 'gvt-next-2019-01-24' of https://github.com/intel/gvt-linux into drm-intel-next-queued

gvt-next-2019-01-24

- split kvmgt as seperate module (Zhenyu)
- Coffeelake GVT support (Fred)
- const treatment and change for kernel type (Jani)

Signed-off-by: Rodrigo Vivi <vivijim@rdvivi-cozumel.jf.intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190124054048.GO7203@zhen-hp.sh.intel.com

22 files changed, 204 insertions, 213 deletions

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index f050759686ca..8300efe60fe1 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -200,3 +200,4 @@ endif
 i915-y += intel_lpe_audio.o
 
 obj-$(CONFIG_DRM_I915) += i915.o
+obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
index b016dc753db9..271fb46d4dd0 100644
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -7,4 +7,3 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \
 
 ccflags-y                               += -I$(src) -I$(src)/$(GVT_DIR)
 i915-y                                  += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
-obj-$(CONFIG_DRM_I915_GVT_KVMGT)        += $(GVT_DIR)/kvmgt.o
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 77ae634eb11c..35b4ec3f7618 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -55,10 +55,10 @@ struct sub_op_bits {
         int low;
 };
 struct decode_info {
-        char *name;
+        const char *name;
         int op_len;
         int nr_sub_op;
-        struct sub_op_bits *sub_op;
+        const struct sub_op_bits *sub_op;
 };
 
 #define   MAX_CMD_BUDGET                        0x7fffffff
@@ -375,7 +375,7 @@ typedef int (*parser_cmd_handler)(struct parser_exec_state *s);
 #define ADDR_FIX_5(x1, x2, x3, x4, x5)  (ADDR_FIX_1(x1) | ADDR_FIX_4(x2, x3, x4, x5))
 
 struct cmd_info {
-        char *name;
+        const char *name;
         u32 opcode;
 
 #define F_LEN_MASK      (1U<<0)
@@ -399,10 +399,10 @@ struct cmd_info {
 #define R_VECS  (1 << VECS)
 #define R_ALL (R_RCS | R_VCS | R_BCS | R_VECS)
         /* rings that support this cmd: BLT/RCS/VCS/VECS */
-        uint16_t rings;
+        u16 rings;
 
         /* devices that support this cmd: SNB/IVB/HSW/... */
-        uint16_t devices;
+        u16 devices;
 
         /* which DWords are address that need fix up.
          * bit 0 means a 32-bit non address operand in command
@@ -412,20 +412,20 @@ struct cmd_info {
          * No matter the address length, each address only takes
          * one bit in the bitmap.
          */
-        uint16_t addr_bitmap;
+        u16 addr_bitmap;
 
         /* flag == F_LEN_CONST : command length
          * flag == F_LEN_VAR : length bias bits
          * Note: length is in DWord
          */
-        uint8_t len;
+        u8 len;
 
         parser_cmd_handler handler;
 };
 
 struct cmd_entry {
         struct hlist_node hlist;
-        struct cmd_info *info;
+        const struct cmd_info *info;
 };
 
 enum {
@@ -474,7 +474,7 @@ struct parser_exec_state {
         int saved_buf_addr_type;
         bool is_ctx_wa;
 
-        struct cmd_info *info;
+        const struct cmd_info *info;
 
         struct intel_vgpu_workload *workload;
 };
@@ -485,12 +485,12 @@ struct parser_exec_state {
 static unsigned long bypass_scan_mask = 0;
 
 /* ring ALL, type = 0 */
-static struct sub_op_bits sub_op_mi[] = {
+static const struct sub_op_bits sub_op_mi[] = {
         {31, 29},
         {28, 23},
 };
 
-static struct decode_info decode_info_mi = {
+static const struct decode_info decode_info_mi = {
         "MI",
         OP_LEN_MI,
         ARRAY_SIZE(sub_op_mi),
@@ -498,12 +498,12 @@ static struct decode_info decode_info_mi = {
 };
 
 /* ring RCS, command type 2 */
-static struct sub_op_bits sub_op_2d[] = {
+static const struct sub_op_bits sub_op_2d[] = {
         {31, 29},
         {28, 22},
 };
 
-static struct decode_info decode_info_2d = {
+static const struct decode_info decode_info_2d = {
         "2D",
         OP_LEN_2D,
         ARRAY_SIZE(sub_op_2d),
@@ -511,14 +511,14 @@ static struct decode_info decode_info_2d = {
 };
 
 /* ring RCS, command type 3 */
-static struct sub_op_bits sub_op_3d_media[] = {
+static const struct sub_op_bits sub_op_3d_media[] = {
         {31, 29},
         {28, 27},
         {26, 24},
         {23, 16},
 };
 
-static struct decode_info decode_info_3d_media = {
+static const struct decode_info decode_info_3d_media = {
         "3D_Media",
         OP_LEN_3D_MEDIA,
         ARRAY_SIZE(sub_op_3d_media),
@@ -526,7 +526,7 @@ static struct decode_info decode_info_3d_media = {
 };