XLibre/xf86-video-vmware
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-vmware.git synced 2026-03-24 01:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmwgfx: Limit the number of cliprects in a drm dirtyfb command v3

Browse Source 
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
This commit is contained in:
Thomas Hellstrom
2019-01-09 08:27:16 +01:00
parent ba4ef498fd
commit 86189966c3
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common_compat.h
View File

@@ -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

39
vmwgfx/vmwgfx_driver.c
View File

@@ -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);
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;
memset(clip, 0, alloc_cliprects * sizeof(drmModeClip));
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