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

sna/present: Refuse to queue a vblank on a disabled CRTC 

Kick the error back to the upper layer for it to sort out.

Reported-by: Timo Aaltonen <tjaalton@ubuntu.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-04-08 21:07:10 +01:00
parent edcfb3efb8
commit de44aaa2dd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sna/sna_present.c
View File

@ -150,9 +150,7 @@ static uint32_t msc_to_delay(xf86CrtcPtr crtc, uint64_t target)
const struct ust_msc *swap = sna_crtc_last_swap(crtc);
int64_t delay, subframe;
/* XXX How to handle CRTC being off? */
if (mode->Clock == 0)
return 0;
assert(mode->Clock);
delay = target - swap->msc;
assert(delay >= 0);
@ -403,6 +401,9 @@ sna_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
struct sna_present_event *info, *tmp;
const struct ust_msc *swap;
if (!sna_crtc_is_on(crtc->devPrivate))
return BadAlloc;
swap = sna_crtc_last_swap(crtc->devPrivate);
DBG(("%s(pipe=%d, event=%lld, msc=%lld, last swap=%lld)\n",
__FUNCTION__, sna_crtc_pipe(crtc->devPrivate),