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

compositor-drm: don't attempt sprite for out of bounds dimensions

Browse Source 
The drmModeAddFB2() call will fail anyways, and cause us to unnecessarily
set sprites_are_broken.

Signed-off-by: Rob Clark <rob@ti.com>
This commit is contained in:
Rob Clark
2012-08-09 14:18:28 -05:00
committed by Kristian Høgsberg
parent 702ffaea3e
commit 4339add9e9
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+24 -1
View File
@@ -89,6 +89,13 @@ struct drm_compositor {
struct gbm_surface *dummy_surface; struct gbm_surface *dummy_surface;
EGLSurface dummy_egl_surface; EGLSurface dummy_egl_surface;
/* we need these parameters in order to not fail drmModeAddFB2()
* due to out of bounds dimensions, and then mistakenly set
* sprites_are_broken:
*/
uint32_t min_width, max_width;
uint32_t min_height, max_height;
struct wl_list sprite_list; struct wl_list sprite_list;
int sprites_are_broken; int sprites_are_broken;
@@ -542,6 +549,7 @@ drm_disable_unused_sprites(struct weston_output *output_base)
struct drm_compositor *c =(struct drm_compositor *) ec; struct drm_compositor *c =(struct drm_compositor *) ec;
struct drm_output *output = (struct drm_output *) output_base; struct drm_output *output = (struct drm_output *) output_base;
struct drm_sprite *s; struct drm_sprite *s;
int32_t width, height;
int ret; int ret;
wl_list_for_each(s, &c->sprite_list, link) { wl_list_for_each(s, &c->sprite_list, link) {
@@ -619,6 +627,16 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base,
if (!found) if (!found)
return NULL; return NULL;
width = es->geometry.width;
height = es->geometry.height;
/* If geometry is out of bounds, don't even bother trying because
* we know the AddFB2() call will fail:
*/
if (c->min_width > width || width > c->max_width ||
c->min_height > height || height > c->max_height)
return -1;
bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER, bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
es->buffer, GBM_BO_USE_SCANOUT); es->buffer, GBM_BO_USE_SCANOUT);
if (!bo) if (!bo)
@@ -640,7 +658,7 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base,
pitches[0] = stride; pitches[0] = stride;
offsets[0] = 0; offsets[0] = 0;
ret = drmModeAddFB2(c->drm.fd, es->geometry.width, es->geometry.height, ret = drmModeAddFB2(c->drm.fd, width, height,
format, handles, pitches, offsets, format, handles, pitches, offsets,
&fb_id, 0); &fb_id, 0);
if (ret) { if (ret) {
@@ -1641,6 +1659,11 @@ create_outputs(struct drm_compositor *ec, uint32_t option_connector,
return -1; return -1;
} }
ec->min_width = resources->min_width;
ec->max_width = resources->max_width;
ec->min_height = resources->min_height;
ec->max_height = resources->max_height;
ec->num_crtcs = resources->count_crtcs; ec->num_crtcs = resources->count_crtcs;
memcpy(ec->crtcs, resources->crtcs, sizeof(uint32_t) * ec->num_crtcs); memcpy(ec->crtcs, resources->crtcs, sizeof(uint32_t) * ec->num_crtcs);