diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-05-24 14:01:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-05-24 14:01:00 +1000 |
| commit | e1e52981f292b4e321781794eaf6e8a087f4f300 (patch) | |
| tree | 75e8850862467810d93049f3a4c49f1ce7db61f8 /drivers/gpu/drm/i915/gvt/gtt.c | |
| parent | 6b0538da5a6ca2129b93cea5afc997226875c402 (diff) | |
| parent | 57cb853d1d5b07ed4e4647ad61b0c16a9c21996e (diff) | |
Merge tag 'drm-intel-fixes-2019-05-23' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixesdrm-fixes-2019-05-24
- Fix boosting of new client to be non-preemptive
- Fix to actually bump ready tasks ahead of busywaits
- Includes gvt-fixes-2019-05-21
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190523094221.GA26026@jlahtine-desk.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/gtt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/gtt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 08c74e65836b..244ad1729764 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)) { |