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

Commit ebd4c6f6 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

vmwgfx: Use the revised fifo hw version register when present 



The driver implements the needed resource management required
to use that register.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 390f9985

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+7 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) 
{

	__le32 __iomem *fifo_mem = dev_priv->mmio_virt;

	uint32_t fifo_min, hwversion;

	const struct vmw_fifo_state *fifo = &dev_priv->fifo;



	if (!(dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO))

		return false;
@@ -41,7 +42,12 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) 
	if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int))

		return false;



	hwversion = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);

	hwversion = ioread32(fifo_mem +

			     ((fifo->capabilities &

			       SVGA_FIFO_CAP_3D_HWVERSION_REVISED) ?

			      SVGA_FIFO_3D_HWVERSION_REVISED :

			      SVGA_FIFO_3D_HWVERSION));



	if (hwversion == 0)

		return false;

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

+8 −2
Original line number Diff line number Diff line
@@ -58,8 +58,14 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 
	case DRM_VMW_PARAM_FIFO_HW_VERSION:

	{

		__le32 __iomem *fifo_mem = dev_priv->mmio_virt;



		param->value = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);

		const struct vmw_fifo_state *fifo = &dev_priv->fifo;



		param->value =

			ioread32(fifo_mem +

				 ((fifo->capabilities &

				   SVGA_FIFO_CAP_3D_HWVERSION_REVISED) ?

				  SVGA_FIFO_3D_HWVERSION_REVISED :

				  SVGA_FIFO_3D_HWVERSION));

		break;

	}

	default: