Commit 4bebe91a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vmwgfx: Convert to CRTC VBLANK callbacks 



VBLANK callbacks in struct drm_driver are deprecated in favor of
their equivalents in struct drm_crtc_funcs. Convert vmwgfx over.

v2:
	* remove accidental whitespace fixes

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123135943.24140-21-tzimmermann@suse.de
parent dc3260d0

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -1393,9 +1393,6 @@ static struct drm_driver driver = { 
	DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC,

	.load = vmw_driver_load,

	.unload = vmw_driver_unload,

	.get_vblank_counter = vmw_get_vblank_counter,

	.enable_vblank = vmw_enable_vblank,

	.disable_vblank = vmw_disable_vblank,

	.ioctls = vmw_ioctls,

	.num_ioctls = ARRAY_SIZE(vmw_ioctls),

	.master_set = vmw_master_set,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -1100,9 +1100,9 @@ int vmw_kms_write_svga(struct vmw_private *vmw_priv, 
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, unsigned int pipe);

int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe);

void vmw_disable_vblank(struct drm_device *dev, unsigned int pipe);

u32 vmw_get_vblank_counter(struct drm_crtc *crtc);

int vmw_enable_vblank(struct drm_crtc *crtc);

void vmw_disable_vblank(struct drm_crtc *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

+3 −3
Original line number Diff line number Diff line
@@ -1991,7 +1991,7 @@ bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, 
/**

 * Function called by DRM code called with vbl_lock held.

 */

u32 vmw_get_vblank_counter(struct drm_device *dev, unsigned int pipe)

u32 vmw_get_vblank_counter(struct drm_crtc *crtc)

{

	return 0;

}
@@ -1999,7 +1999,7 @@ u32 vmw_get_vblank_counter(struct drm_device *dev, unsigned int pipe) 
/**

 * Function called by DRM code called with vbl_lock held.

 */

int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)

int vmw_enable_vblank(struct drm_crtc *crtc)

{

	return -EINVAL;

}
@@ -2007,7 +2007,7 @@ int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe) 
/**

 * Function called by DRM code called with vbl_lock held.

 */

void vmw_disable_vblank(struct drm_device *dev, unsigned int pipe)

void vmw_disable_vblank(struct drm_crtc *crtc)

{

}

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = { 
	.atomic_duplicate_state = vmw_du_crtc_duplicate_state,

	.atomic_destroy_state = vmw_du_crtc_destroy_state,

	.set_config = drm_atomic_helper_set_config,

	.get_vblank_counter = vmw_get_vblank_counter,

	.enable_vblank = vmw_enable_vblank,

	.disable_vblank = vmw_disable_vblank,

};

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

+3 −0
Original line number Diff line number Diff line
@@ -319,6 +319,9 @@ static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { 
	.atomic_destroy_state = vmw_du_crtc_destroy_state,

	.set_config = drm_atomic_helper_set_config,

	.page_flip = drm_atomic_helper_page_flip,

	.get_vblank_counter = vmw_get_vblank_counter,

	.enable_vblank = vmw_enable_vblank,

	.disable_vblank = vmw_disable_vblank,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE