diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-07-22 15:14:14 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-07-22 15:40:34 +0800 |
| commit | 0403234dd1cdf4aa02709c1fbd815f002e1ace63 (patch) | |
| tree | d996a14c9561355339b42c6025e7a1ffaf14a744 | |
| parent | e7533a253178a867a9ad37f5fd3789b21ff38162 (diff) | |
only check pipe underrun if vtSema is true.
(cherry picked from commit 577c4d1a0c753fb46d43be05a9781d2e204fac45)
| -rw-r--r-- | src/i830_driver.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 390b5e75..5a06079a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2512,16 +2512,18 @@ I830BlockHandler(int i, * (except for mode setting, where it may occur naturally). * Check & ack the condition. */ - if (xf86_config->crtc[0]->enabled && - (INREG(PIPEASTAT) & FIFO_UNDERRUN)) { + if (pScrn->vtSema) { + if (xf86_config->crtc[0]->enabled && + (INREG(PIPEASTAT) & FIFO_UNDERRUN)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "underrun on pipe A!\n"); OUTREG(PIPEASTAT, INREG(PIPEASTAT) | FIFO_UNDERRUN); - } - if (xf86_config->num_crtc > 1 && - xf86_config->crtc[1]->enabled && - (INREG(PIPEBSTAT) & FIFO_UNDERRUN)) { + } + if (xf86_config->num_crtc > 1 && + xf86_config->crtc[1]->enabled && + (INREG(PIPEBSTAT) & FIFO_UNDERRUN)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "underrun on pipe B!\n"); OUTREG(PIPEBSTAT, INREG(PIPEBSTAT) | FIFO_UNDERRUN); + } } I830VideoBlockHandler(i, blockData, pTimeout, pReadmask); |