Merge tag 'gvt-fixes-2020-02-12' of https://github.com/intel/gvt-linux into drm-intel-next-fixes
gvt-fixes-2020-02-12 - fix possible high-order allocation fail for late load (Igor) - fix one missed lock for ppgtt mm LRU list (Igor) Signed-off-by: Jani Nikula <jani.nikula@intel.com> From: Zhenyu Wang <zhenyuw@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200212065912.GB4997@zhen-hp.sh.intel.com
This commit is contained in:
Коммит
cc3251d8ef
|
@ -146,7 +146,7 @@ void intel_gvt_free_firmware(struct intel_gvt *gvt)
|
|||
clean_firmware_sysfs(gvt);
|
||||
|
||||
kfree(gvt->firmware.cfg_space);
|
||||
kfree(gvt->firmware.mmio);
|
||||
vfree(gvt->firmware.mmio);
|
||||
}
|
||||
|
||||
static int verify_firmware(struct intel_gvt *gvt,
|
||||
|
@ -229,7 +229,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt)
|
|||
|
||||
firmware->cfg_space = mem;
|
||||
|
||||
mem = kmalloc(info->mmio_size, GFP_KERNEL);
|
||||
mem = vmalloc(info->mmio_size);
|
||||
if (!mem) {
|
||||
kfree(path);
|
||||
kfree(firmware->cfg_space);
|
||||
|
|
|
@ -1956,7 +1956,11 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)
|
|||
|
||||
if (mm->type == INTEL_GVT_MM_PPGTT) {
|
||||
list_del(&mm->ppgtt_mm.list);
|
||||
|
||||
mutex_lock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock);
|
||||
list_del(&mm->ppgtt_mm.lru_list);
|
||||
mutex_unlock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock);
|
||||
|
||||
invalidate_ppgtt_mm(mm);
|
||||
} else {
|
||||
vfree(mm->ggtt_mm.virtual_ggtt);
|
||||
|
|
Загрузка…
Ссылка в новой задаче