Commit 81039adc authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Replace ast_cursor_move() with ast_cursor_show() 



Having a cursor move function is misleading, as it actually enables the
cursor's image for displaying. So rename it to ast_cursor_show(). It's
semantics is to show a cursor at the specified location on the screen.
The displayed cursor is always the image in the cursor front BO.

This change also simplifies struct ast_crtc to being a mere wrapper around
around struct drm_crtc. It will be removed by a later patch.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200702115029.5281-7-tzimmermann@suse.de
parent 75d9d8e6

drivers/gpu/drm/ast/ast_cursor.c

+27 −15
Original line number Diff line number Diff line
@@ -227,12 +227,27 @@ void ast_cursor_page_flip(struct ast_private *ast) 
	ast->cursor.next_index %= ARRAY_SIZE(ast->cursor.gbo);

}



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

static void ast_cursor_set_location(struct ast_private *ast, u16 x, u16 y,

				    u8 x_offset, u8 y_offset)

{

	u8 x0 = (x & 0x00ff);

	u8 x1 = (x & 0x0f00) >> 8;

	u8 y0 = (y & 0x00ff);

	u8 y1 = (y & 0x0700) >> 8;



	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc2, x_offset);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc3, y_offset);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc4, x0);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc5, x1);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc6, y0);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc7, y1);

}



int ast_cursor_show(struct ast_private *ast, int x, int y,

		    unsigned int offset_x, unsigned int offset_y)

{

	struct ast_crtc *ast_crtc = to_ast_crtc(crtc);

	struct ast_private *ast = to_ast_private(crtc->dev);

	struct drm_gem_vram_object *gbo;

	int x_offset, y_offset;

	u8 x_offset, y_offset;

	u8 *dst, *sig;

	u8 jreg;
@@ -245,23 +260,20 @@ int ast_cursor_move(struct drm_crtc *crtc, int x, int y) 
	writel(x, sig + AST_HWC_SIGNATURE_X);

	writel(y, sig + AST_HWC_SIGNATURE_Y);



	x_offset = ast_crtc->offset_x;

	y_offset = ast_crtc->offset_y;

	if (x < 0) {

		x_offset = (-x) + ast_crtc->offset_x;

		x_offset = (-x) + offset_x;

		x = 0;

	} else {

		x_offset = offset_x;

	}



	if (y < 0) {

		y_offset = (-y) + ast_crtc->offset_y;

		y_offset = (-y) + offset_y;

		y = 0;

	} else {

		y_offset = offset_y;

	}

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc2, x_offset);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc3, y_offset);

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc4, (x & 0xff));

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc5, ((x >> 8) & 0x0f));

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc6, (y & 0xff));

	ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc7, ((y >> 8) & 0x07));



	ast_cursor_set_location(ast, x, y, x_offset, y_offset);



	/* dummy write to fire HWC */

	jreg = 0x02 |

drivers/gpu/drm/ast/ast_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ struct ast_connector { 


struct ast_crtc {

	struct drm_crtc base;

	u8 offset_x, offset_y;

};



#define to_ast_crtc(x) container_of(x, struct ast_crtc, base)
@@ -320,6 +319,7 @@ int ast_cursor_init(struct ast_private *ast); 
void ast_cursor_fini(struct ast_private *ast);

int ast_cursor_blit(struct ast_private *ast, struct drm_framebuffer *fb);

void ast_cursor_page_flip(struct ast_private *ast);

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

int ast_cursor_show(struct ast_private *ast, int x, int y,

		    unsigned int offset_x, unsigned int offset_y);



#endif

drivers/gpu/drm/ast/ast_mode.c

+6 −6
Original line number Diff line number Diff line
@@ -661,21 +661,21 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane, 
				      struct drm_plane_state *old_state)

{

	struct drm_plane_state *state = plane->state;

	struct drm_crtc *crtc = state->crtc;

	struct drm_framebuffer *fb = state->fb;

	struct ast_private *ast = to_ast_private(plane->dev);

	struct ast_crtc *ast_crtc = to_ast_crtc(crtc);

	struct ast_private *ast = plane->dev->dev_private;

	unsigned int offset_x, offset_y;

	u8 jreg;



	ast_crtc->offset_x = AST_MAX_HWC_WIDTH - fb->width;

	ast_crtc->offset_y = AST_MAX_HWC_WIDTH - fb->height;

	offset_x = AST_MAX_HWC_WIDTH - fb->width;

	offset_y = AST_MAX_HWC_WIDTH - fb->height;



	if (state->fb != old_state->fb) {

		/* A new cursor image was installed. */

		ast_cursor_page_flip(ast);

	}



	ast_cursor_move(crtc, state->crtc_x, state->crtc_y);

	ast_cursor_show(ast, state->crtc_x, state->crtc_y,

			offset_x, offset_y);



	jreg = 0x2;

	/* enable ARGB cursor */