Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1a93b1 authored by Xiong Zhang's avatar Xiong Zhang Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Correct the calculation of plane size 



stride isn't in unit of pixel, it is bytes, so calculation of
plane size doesn't need to multiple bpp.

Fixes: e546e281 ("drm/i915/gvt: Dmabuf support for GVT-g")
Signed-off-by: default avatarXiong Zhang <xiong.y.zhang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 663a50ce

drivers/gpu/drm/i915/gvt/dmabuf.c

+2 −6
Original line number Diff line number Diff line
@@ -238,9 +238,6 @@ static int vgpu_get_plane_info(struct drm_device *dev, 
		default:

			gvt_vgpu_err("invalid tiling mode: %x\n", p.tiled);

		}



		info->size = (((p.stride * p.height * p.bpp) / 8) +

			      (PAGE_SIZE - 1)) >> PAGE_SHIFT;

	} else if (plane_id == DRM_PLANE_TYPE_CURSOR) {

		ret = intel_vgpu_decode_cursor_plane(vgpu, &c);

		if (ret)
@@ -262,14 +259,13 @@ static int vgpu_get_plane_info(struct drm_device *dev, 
			info->x_hot = UINT_MAX;

			info->y_hot = UINT_MAX;

		}



		info->size = (((info->stride * c.height * c.bpp) / 8)

				+ (PAGE_SIZE - 1)) >> PAGE_SHIFT;

	} else {

		gvt_vgpu_err("invalid plane id:%d\n", plane_id);

		return -EINVAL;

	}



	info->size = (info->stride * info->height + PAGE_SIZE - 1)

		      >> PAGE_SHIFT;

	if (info->size == 0) {

		gvt_vgpu_err("fb size is zero\n");

		return -EINVAL;