Merge tag ‘gvt-fixes-2019-05-21’ of https://github.com/intel/gvt-linux into drm-intel-fixes [Linux 5.2]

Merge tag ‘gvt-fixes-2019-05-21’ of https://github.com/intel/gvt-linux into drm-intel-fixes [Linux 5.2]

This Linux kernel change "Merge tag ‘gvt-fixes-2019-05-21’ of https://github.com/intel/gvt-linux into drm-intel-fixes" is included in the Linux 5.2 release. This change is authored by Joonas Lahtinen <joonas.lahtinen [at] linux.intel.com> on Tue May 21 14:37:37 2019 +0300. The commit for this change in Linux stable tree is 57cb853 (patch). Other info about this change: Merge: a491cc8 591c39f

Merge tag 'gvt-fixes-2019-05-21' of https://github.com/intel/gvt-linux into drm-intel-fixes

gvt-fixes-2019-05-21

- vGPU reset fix with sane init breadcrumb (Weinan)
- Fix TRTT handling to use context state (Yan)
- Fix one error return (Dan)

Signed-off-by: Joonas Lahtinen <[email protected]>
From: Zhenyu Wang <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/gpu/drm/i915/gvt/gtt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 08c74e6..244ad17 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1076,8 +1076,10 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_populate_spt_by_guest_entry(
    } else {
        int type = get_next_pt_type(we->type);

-       if (!gtt_type_is_pt(type))
+       if (!gtt_type_is_pt(type)) {
+           ret = -EINVAL;
            goto err;
+       }

        spt = ppgtt_alloc_spt_gfn(vgpu, type, ops->get_pfn(we), ips);
        if (IS_ERR(spt)) {

Leave a Reply

Your email address will not be published. Required fields are marked *