Commit 52e32da9 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Rename cursor functions to use mgag200_ prefix 



Although the driver source code is fairly inconsistent wrt naming, the
prefix should be mgag200. Rename cursor functions accordingly.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190927091301.10574-2-tzimmermann@suse.de
parent 0090ef3e

drivers/gpu/drm/mgag200/mgag200_cursor.c

+8 −11
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ static bool warn_transparent = true; 
static bool warn_palette = true;



/*

  Hide the cursor off screen. We can't disable the cursor hardware because it

  takes too long to re-activate and causes momentary corruption

 * Hide the cursor off screen. We can't disable the cursor hardware because

 * it takes too long to re-activate and causes momentary corruption.

 */

static void mga_hide_cursor(struct mga_device *mdev)

static void mgag200_hide_cursor(struct mga_device *mdev)

{

	WREG8(MGA_CURPOSXL, 0);

	WREG8(MGA_CURPOSXH, 0);
@@ -25,11 +25,8 @@ static void mga_hide_cursor(struct mga_device *mdev) 
	mdev->cursor.pixels_current = NULL;

}



int mga_crtc_cursor_set(struct drm_crtc *crtc,

			struct drm_file *file_priv,

			uint32_t handle,

			uint32_t width,

			uint32_t height)

int mgag200_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,

			    uint32_t handle, uint32_t width, uint32_t height)

{

	struct drm_device *dev = crtc->dev;

	struct mga_device *mdev = (struct mga_device *)dev->dev_private;
@@ -66,7 +63,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, 
	}



	if (!handle || !file_priv) {

		mga_hide_cursor(mdev);

		mgag200_hide_cursor(mdev);

		return 0;

	}
@@ -224,7 +221,7 @@ err_drm_gem_object_put_unlocked: 
	return ret;

}



int mga_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)

int mgag200_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)

{

	struct mga_device *mdev = (struct mga_device *)crtc->dev->dev_private;

	/* Our origin is at (64,64) */

drivers/gpu/drm/mgag200/mgag200_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ int mgag200_mm_init(struct mga_device *mdev); 
void mgag200_mm_fini(struct mga_device *mdev);

int mgag200_mmap(struct file *filp, struct vm_area_struct *vma);



int mga_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,

int mgag200_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,

			    uint32_t handle, uint32_t width, uint32_t height);

int mga_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);

int mgag200_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);



#endif				/* __MGAG200_DRV_H__ */

drivers/gpu/drm/mgag200/mgag200_mode.c

+2 −2
Original line number Diff line number Diff line
@@ -1413,8 +1413,8 @@ static void mga_crtc_disable(struct drm_crtc *crtc) 


/* These provide the minimum set of functions required to handle a CRTC */

static const struct drm_crtc_funcs mga_crtc_funcs = {

	.cursor_set = mga_crtc_cursor_set,

	.cursor_move = mga_crtc_cursor_move,

	.cursor_set = mgag200_crtc_cursor_set,

	.cursor_move = mgag200_crtc_cursor_move,

	.gamma_set = mga_crtc_gamma_set,

	.set_config = drm_crtc_helper_set_config,

	.destroy = mga_crtc_destroy,

CRA Git | Maintained and supported by SUSTech CRA and CCSE