Unverified Commit 35bdd106 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Rodrigo Vivi
Browse files

drm/i915/gvt: Remove unused intel_vgpu_decode_sprite_plane 



intel_vgpu_decode_sprite_plane() was added in 2017 by
commit 9f31d106 ("drm/i915/gvt: Add framebuffer decoder support")
but has remained unused.

Remove it.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarZhenyu Wang <zhenyuw.linux@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241222002043.173080-3-linux@treblig.org


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 57af0c0f

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

+0 −117
Original line number Diff line number Diff line
@@ -398,120 +398,3 @@ int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu, 
	plane->y_hot = vgpu_vreg_t(vgpu, vgtif_reg(cursor_y_hot));

	return 0;

}
 


#define SPRITE_FORMAT_NUM	(1 << 3)



static const struct pixel_format sprite_pixel_formats[SPRITE_FORMAT_NUM] = {

	[0x0] = {DRM_FORMAT_YUV422, 16, "YUV 16-bit 4:2:2 packed"},

	[0x1] = {DRM_FORMAT_XRGB2101010, 32, "RGB 32-bit 2:10:10:10"},

	[0x2] = {DRM_FORMAT_XRGB8888, 32, "RGB 32-bit 8:8:8:8"},

	[0x4] = {DRM_FORMAT_AYUV, 32,

		"YUV 32-bit 4:4:4 packed (8:8:8:8 MSB-X:Y:U:V)"},

};



/**

 * intel_vgpu_decode_sprite_plane - Decode sprite plane

 * @vgpu: input vgpu

 * @plane: sprite plane to save decoded info

 * This function is called for decoding plane

 *

 * Returns:

 * 0 on success, non-zero if failed.

 */

int intel_vgpu_decode_sprite_plane(struct intel_vgpu *vgpu,

	struct intel_vgpu_sprite_plane_format *plane)

{

	u32 val, fmt;

	u32 color_order, yuv_order;

	int drm_format;

	int pipe;



	pipe = get_active_pipe(vgpu);

	if (pipe >= I915_MAX_PIPES)

		return -ENODEV;



	val = vgpu_vreg_t(vgpu, SPRCTL(pipe));

	plane->enabled = !!(val & SPRITE_ENABLE);

	if (!plane->enabled)

		return -ENODEV;



	plane->tiled = !!(val & SPRITE_TILED);

	color_order = !!(val & SPRITE_RGB_ORDER_RGBX);

	yuv_order = (val & SPRITE_YUV_ORDER_MASK) >>

				_SPRITE_YUV_ORDER_SHIFT;



	fmt = (val & SPRITE_FORMAT_MASK) >> _SPRITE_FMT_SHIFT;

	if (!sprite_pixel_formats[fmt].bpp) {

		gvt_vgpu_err("Non-supported pixel format (0x%x)\n", fmt);

		return -EINVAL;

	}

	plane->hw_format = fmt;

	plane->bpp = sprite_pixel_formats[fmt].bpp;

	drm_format = sprite_pixel_formats[fmt].drm_format;



	/* Order of RGB values in an RGBxxx buffer may be ordered RGB or

	 * BGR depending on the state of the color_order field

	 */

	if (!color_order) {

		if (drm_format == DRM_FORMAT_XRGB2101010)

			drm_format = DRM_FORMAT_XBGR2101010;

		else if (drm_format == DRM_FORMAT_XRGB8888)

			drm_format = DRM_FORMAT_XBGR8888;

	}



	if (drm_format == DRM_FORMAT_YUV422) {

		switch (yuv_order) {

		case 0:

			drm_format = DRM_FORMAT_YUYV;

			break;

		case 1:

			drm_format = DRM_FORMAT_UYVY;

			break;

		case 2:

			drm_format = DRM_FORMAT_YVYU;

			break;

		case 3:

			drm_format = DRM_FORMAT_VYUY;

			break;

		default:

			/* yuv_order has only 2 bits */

			break;

		}

	}



	plane->drm_format = drm_format;



	plane->base = vgpu_vreg_t(vgpu, SPRSURF(pipe)) & I915_GTT_PAGE_MASK;

	if (!vgpu_gmadr_is_valid(vgpu, plane->base))

		return  -EINVAL;



	plane->base_gpa = intel_vgpu_gma_to_gpa(vgpu->gtt.ggtt_mm, plane->base);

	if (plane->base_gpa == INTEL_GVT_INVALID_ADDR) {

		gvt_vgpu_err("Translate sprite plane gma 0x%x to gpa fail\n",

				plane->base);

		return  -EINVAL;

	}



	plane->stride = vgpu_vreg_t(vgpu, SPRSTRIDE(pipe)) &

				_SPRITE_STRIDE_MASK;



	val = vgpu_vreg_t(vgpu, SPRSIZE(pipe));

	plane->height = (val & _SPRITE_SIZE_HEIGHT_MASK) >>

		_SPRITE_SIZE_HEIGHT_SHIFT;

	plane->width = (val & _SPRITE_SIZE_WIDTH_MASK) >>

		_SPRITE_SIZE_WIDTH_SHIFT;

	plane->height += 1;	/* raw height is one minus the real value */

	plane->width += 1;	/* raw width is one minus the real value */



	val = vgpu_vreg_t(vgpu, SPRPOS(pipe));

	plane->x_pos = (val & _SPRITE_POS_X_MASK) >> _SPRITE_POS_X_SHIFT;

	plane->y_pos = (val & _SPRITE_POS_Y_MASK) >> _SPRITE_POS_Y_SHIFT;



	val = vgpu_vreg_t(vgpu, SPROFFSET(pipe));

	plane->x_offset = (val & _SPRITE_OFFSET_START_X_MASK) >>

			   _SPRITE_OFFSET_START_X_SHIFT;

	plane->y_offset = (val & _SPRITE_OFFSET_START_Y_MASK) >>

			   _SPRITE_OFFSET_START_Y_SHIFT;



	return 0;

}

drivers/gpu/drm/i915/gvt/fb_decoder.h

+0 −2
Original line number Diff line number Diff line
@@ -156,7 +156,5 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu, 
	struct intel_vgpu_primary_plane_format *plane);

int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu,

	struct intel_vgpu_cursor_plane_format *plane);

int intel_vgpu_decode_sprite_plane(struct intel_vgpu *vgpu,

	struct intel_vgpu_sprite_plane_format *plane);



#endif