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

Commit 1c482ab3 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

vmwgfx: Add vblank stubs 



This fixes kernel panics when running the vbltest from the drm repo. We
can't just skip initializing the vblank system since it sets up certain
state for us, see: "vmwgfx: Enable use of the vblank system."

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

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ static struct drm_driver driver = { 
	.irq_uninstall = vmw_irq_uninstall,

	.irq_handler = vmw_irq_handler,

	.get_vblank_counter = vmw_get_vblank_counter,

	.enable_vblank = vmw_enable_vblank,

	.disable_vblank = vmw_disable_vblank,

	.reclaim_buffers_locked = NULL,

	.ioctls = vmw_ioctls,

	.num_ioctls = DRM_ARRAY_SIZE(vmw_ioctls),

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -618,6 +618,8 @@ bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, 
				uint32_t pitch,

				uint32_t height);

u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc);

int vmw_enable_vblank(struct drm_device *dev, int crtc);

void vmw_disable_vblank(struct drm_device *dev, int crtc);

int vmw_kms_present(struct vmw_private *dev_priv,

		    struct drm_file *file_priv,

		    struct vmw_framebuffer *vfb,

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+19 −0
Original line number Diff line number Diff line
@@ -1459,11 +1459,30 @@ bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, 
	return ((u64) pitch * (u64) height) < (u64) dev_priv->vram_size;

}





/**

 * Function called by DRM code called with vbl_lock held.

 */

u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc)

{

	return 0;

}



/**

 * Function called by DRM code called with vbl_lock held.

 */

int vmw_enable_vblank(struct drm_device *dev, int crtc)

{

	return -ENOSYS;

}



/**

 * Function called by DRM code called with vbl_lock held.

 */

void vmw_disable_vblank(struct drm_device *dev, int crtc)

{

}





/*

 * Small shared kms functions.