mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: don't keep trying if hw doesn't support cursors

Browse Source 
Not all hw supports hw cursors.  Similar to the case with sprites, if
the driver does not support it, don't keep trying and spamming the log
with error messages.

Signed-off-by: Rob Clark <rob@ti.com>
This commit is contained in:
Rob Clark 2012-08-09 13:24:45 -05:00 committed by Kristian Høgsberg
parent 4339add9e9
commit ab5b1e3149
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compositor-drm.c
View File

@ -99,6 +99,8 @@ struct drm_compositor {
struct wl_list sprite_list;
int sprites_are_broken;
int cursors_are_broken;
uint32_t prev_state;
};
@ -736,6 +738,8 @@ drm_output_prepare_cursor_surface(struct weston_output *output_base,
return NULL;
if (es->output_mask != (1u << output_base->id))
return NULL;
if (c->cursors_are_broken)
return;
if (es->buffer == NULL || !wl_buffer_is_shm(es->buffer) ||
es->geometry.width > 64 || es->geometry.height > 64)
return NULL;
@ -780,15 +784,20 @@ drm_output_set_cursor(struct drm_output *output)
handle = gbm_bo_get_handle(bo).s32;
if (drmModeSetCursor(c->drm.fd,
output->crtc_id, handle, 64, 64))
output->crtc_id, handle, 64, 64)) {
weston_log("failed to set cursor: %m\n");
c->cursors_are_broken = 1;
}
}
x = es->geometry.x - output->base.x;
y = es->geometry.y - output->base.y;
if (output->cursor_plane.x != x || output->cursor_plane.y != y) {
if (drmModeMoveCursor(c->drm.fd, output->crtc_id, x, y))
if (drmModeMoveCursor(c->drm.fd, output->crtc_id, x, y)) {
weston_log("failed to move cursor: %m\n");
c->cursors_are_broken = 1;
}
output->cursor_plane.x = x;
output->cursor_plane.y = y;
}