From: Jani Nikula Date: Wed, 8 Mar 2017 09:42:23 +0000 (+0200) Subject: Merge tag 'gvt-next-2017-02-24' of https://github.com/01org/gvt-linux into drm-intel... X-Git-Tag: v5.15~11636^2~3^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77e14ae6d785b436be4961b5f5dff80490e35227;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'gvt-next-2017-02-24' of https://github.com/01org/gvt-linux into drm-intel-fixes 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 --- 77e14ae6d785b436be4961b5f5dff80490e35227 diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c index 0f7f5d9,182914c..f07cb8b --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@@ -295,13 -295,13 +295,13 @@@ 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);