Commit 6567bc98 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/ast: Don't enable HW cursors twice during atomic update

The ast_cursor_show() helper enables the cursor to be displayed. No need
to repeat that operation in the plane's atomic-update function.
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-8-tzimmermann@suse.de
parent 81039adc
...@@ -664,7 +664,6 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane, ...@@ -664,7 +664,6 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
struct drm_framebuffer *fb = state->fb; struct drm_framebuffer *fb = state->fb;
struct ast_private *ast = plane->dev->dev_private; struct ast_private *ast = plane->dev->dev_private;
unsigned int offset_x, offset_y; unsigned int offset_x, offset_y;
u8 jreg;
offset_x = AST_MAX_HWC_WIDTH - fb->width; offset_x = AST_MAX_HWC_WIDTH - fb->width;
offset_y = AST_MAX_HWC_WIDTH - fb->height; offset_y = AST_MAX_HWC_WIDTH - fb->height;
...@@ -676,11 +675,6 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane, ...@@ -676,11 +675,6 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
ast_cursor_show(ast, state->crtc_x, state->crtc_y, ast_cursor_show(ast, state->crtc_x, state->crtc_y,
offset_x, offset_y); offset_x, offset_y);
jreg = 0x2;
/* enable ARGB cursor */
jreg |= 1;
ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xcb, 0xfc, jreg);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment