Merge tag 'gvt-next-2017-02-24' of https://github.com/01org/gvt-linux into drm-intel...

gvt-next-2017-02-24

- Min's vGPU failsafe to guard against non-secured guest
- Some guest warning fix and host error message cleanup
- Fixed vGPU type refinement for usability issue
- environ string fix from Takashi Iwai
- one kernel oops fix from Chuanxiao
- other misc fixes

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --combined drivers/gpu/drm/i915/gvt/kvmgt.c
index 0f7f5d97f5829d65aeaf7392d0fcb4b19fd4d713,182914c22ac5531a299fbc253f295c8291883ef6..f07cb8ba751f90c425f8e185541272f1c44781f4
--- 1/drivers/gpu/drm/i915/gvt/kvmgt.c
--- 2/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@@ -262,8 -262,8 +262,8 @@@ static struct intel_vgpu_type *intel_gv
        return NULL;
  }
  
 -static ssize_t available_instance_show(struct kobject *kobj, struct device *dev,
 -              char *buf)
 +static ssize_t available_instances_show(struct kobject *kobj,
 +                                      struct device *dev, char *buf)
  {
        struct intel_vgpu_type *type;
        unsigned int num = 0;
@@@ -295,18 -295,18 +295,18 @@@ static ssize_t description_show(struct 
                return 0;
  
        return sprintf(buf, "low_gm_size: %dMB\nhigh_gm_size: %dMB\n"
-                               "fence: %d\n",
-                               BYTES_TO_MB(type->low_gm_size),
-                               BYTES_TO_MB(type->high_gm_size),
-                               type->fence);
+                      "fence: %d\nresolution: %s\n",
+                      BYTES_TO_MB(type->low_gm_size),
+                      BYTES_TO_MB(type->high_gm_size),
+                      type->fence, vgpu_edid_str(type->resolution));
  }
  
 -static MDEV_TYPE_ATTR_RO(available_instance);
 +static MDEV_TYPE_ATTR_RO(available_instances);
  static MDEV_TYPE_ATTR_RO(device_api);
  static MDEV_TYPE_ATTR_RO(description);
  
  static struct attribute *type_attrs[] = {
 -      &mdev_type_attr_available_instance.attr,
 +      &mdev_type_attr_available_instances.attr,
        &mdev_type_attr_device_api.attr,
        &mdev_type_attr_description.attr,
        NULL,