Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/gvt/mmio.c b/drivers/gpu/drm/i915/gvt/mmio.c
index 2be1be2cf49a..994366035364 100644
--- a/drivers/gpu/drm/i915/gvt/mmio.c
+++ b/drivers/gpu/drm/i915/gvt/mmio.c
@@ -267,7 +267,7 @@ int intel_vgpu_init_mmio(struct intel_vgpu *vgpu)
 {
         const struct intel_gvt_device_info *info = &vgpu->gvt->device_info;
 
-        vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);
+        vgpu->mmio.vreg = vzalloc(array_size(info->mmio_size, 2));
         if (!vgpu->mmio.vreg)
                 return -ENOMEM;