Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Make sure the transformed CRTC box is clipped correctly. 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-09-26 15:41:36 +01:00
parent ec9ffc9e41
commit 455754ca8d
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/sna/sna_display.c
View File

@ -3827,6 +3827,25 @@ void sna_mode_reset(struct sna *sna)
}
}
static void transformed_box(BoxRec *box, xf86CrtcPtr crtc)
{
box->x1 -= crtc->filter_width >> 1;
box->x2 += crtc->filter_width >> 1;
box->y1 -= crtc->filter_height >> 1;
box->y2 += crtc->filter_height >> 1;
pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc, box);
if (box->x1 < 0)
box->x1 = 0;
if (box->y1 < 0)
box->y1 = 0;
if (box->x2 > crtc->mode.HDisplay)
box->x2 = crtc->mode.HDisplay;
if (box->y2 > crtc->mode.VDisplay)
box->y2 = crtc->mode.VDisplay;
}
static void
sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region)
{
@ -3894,11 +3913,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region)
BoxRec box;
box = *b++;
box.x1 -= crtc->filter_width >> 1;
box.x2 += crtc->filter_width >> 1;
box.y1 -= crtc->filter_height >> 1;
box.y2 += crtc->filter_height >> 1;
pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc, & box);
transformed_box(&box, crtc);
DBG(("%s: (%d, %d)x(%d, %d) -> (%d, %d), (%d, %d)\n",
__FUNCTION__,
@ -3993,11 +4008,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region)
BoxRec box;
box = *b++;
box.x1 -= crtc->filter_width >> 1;
box.x2 += crtc->filter_width >> 1;
box.y1 -= crtc->filter_height >> 1;
box.y2 += crtc->filter_height >> 1;
pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc, & box);
transformed_box(&box, crtc);
DBG(("%s: (%d, %d)x(%d, %d) -> (%d, %d), (%d, %d)\n",
__FUNCTION__,