diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-02-14 13:03:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-14 13:04:46 +1000 |
| commit | 6f4134b30b6ee33e2fd4d602099e6c5e60d0351a (patch) | |
| tree | 79ef7a82bcbf67d06f3e37de9271b9e80d0b9395 /drivers/gpu/drm/i915/gvt/firmware.c | |
| parent | e44c1e3a2941fa51d8a2455e61340309d49fc3a5 (diff) | |
| parent | 2aaaa5ee1c3d624a5bcad4ee25f954559c565bc2 (diff) | |
Merge tag 'drm-intel-next-fixes-2020-02-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixesdrm-fixes-2020-02-14
drm/i915 fixes for v5.6-rc2
Most of these were aimed at a "next fixes" pull already during the merge
window, but there were issues with the baseline I used, which resulted
in a lot of issues in CI. I've regenerated this stuff piecemeal now,
adding gradually to it, and it seems healthy now.
Due to the issues this is much bigger than I'd like. But it was
obviously necessary to take the time to ensure it's not garbage...
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/878sl6yfrn.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/firmware.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/firmware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c index 049775e8e350..b0c1fda32977 100644 --- a/drivers/gpu/drm/i915/gvt/firmware.c +++ b/drivers/gpu/drm/i915/gvt/firmware.c @@ -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); |