diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2019-01-09 08:27:16 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2019-01-28 14:47:55 +0100 |
| commit | 86189966c3dee0e0c10dd4926cebbe478129c6f0 (patch) | |
| tree | c7d5274a4b9230bc2d96d688e5e3728643fff8a8 | |
| parent | ba4ef498fd1f66f81aaffc3dac504044b2ad7cc3 (diff) | |
vmwgfx: Limit the number of cliprects in a drm dirtyfb command v3
The drm dirtyfb command would error if the number of cliprects were larger
than DRM_MODE_FB_DIRTY_MAX_CLIPS. If that number is exceeded, split the
command up.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com> #v2
Reviewed-by: Deepak Rawat <drawat@vmware.com> #v1
| -rw-r--r-- | src/common_compat.h | 4 | ||||
| -rw-r--r-- | vmwgfx/vmwgfx_driver.c | 39 |
2 files changed, 29 insertions, 14 deletions
diff --git a/src/common_compat.h b/src/common_compat.h index 4efe350..fa6adc2 100644 --- a/src/common_compat.h +++ b/src/common_compat.h @@ -37,5 +37,9 @@ xf86SaveModeContents(DisplayModePtr intern, const DisplayModeRec *mode) #define fbGetRotatedPixmap(_pGC) NULL #endif +#ifndef DRM_MODE_FB_DIRTY_MAX_CLIPS +#define DRM_MODE_FB_DIRTY_MAX_CLIPS 256 +#endif + #endif diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index e5f0caf..8297d53 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -650,26 +650,37 @@ drv_pre_init(ScrnInfoPtr pScrn, int flags) static Bool vmwgfx_scanout_update(int drm_fd, int fb_id, RegionPtr dirty) { - unsigned num_cliprects = REGION_NUM_RECTS(dirty); - drmModeClip *clip = alloca(num_cliprects * sizeof(drmModeClip)); + unsigned int num_cliprects = REGION_NUM_RECTS(dirty); + unsigned int alloc_cliprects = min(num_cliprects, + DRM_MODE_FB_DIRTY_MAX_CLIPS); + drmModeClip *clip = alloca(alloc_cliprects * sizeof(drmModeClip)); BoxPtr rect = REGION_RECTS(dirty); int i, ret; - if (!num_cliprects) - return TRUE; + while (num_cliprects > 0) { + unsigned int cur_cliprects = min(num_cliprects, + DRM_MODE_FB_DIRTY_MAX_CLIPS); + + memset(clip, 0, alloc_cliprects * sizeof(drmModeClip)); - for (i = 0; i < num_cliprects; i++, rect++) { - clip[i].x1 = rect->x1; - clip[i].y1 = rect->y1; - clip[i].x2 = rect->x2; - clip[i].y2 = rect->y2; + for (i = 0; i < cur_cliprects; i++, rect++) { + clip[i].x1 = rect->x1; + clip[i].y1 = rect->y1; + clip[i].x2 = rect->x2; + clip[i].y2 = rect->y2; + } + + ret = drmModeDirtyFB(drm_fd, fb_id, clip, cur_cliprects); + if (ret) { + LogMessage(X_ERROR, "%s: failed to send dirty (%i, %s)\n", + __func__, ret, strerror(-ret)); + return FALSE; + } + + num_cliprects -= cur_cliprects; } - ret = drmModeDirtyFB(drm_fd, fb_id, clip, num_cliprects); - if (ret) - LogMessage(X_ERROR, "%s: failed to send dirty (%i, %s)\n", - __func__, ret, strerror(-ret)); - return (ret == 0); + return TRUE; } static Bool |