diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-06-03 10:50:33 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-06-03 10:50:33 +0000 |
| commit | 874ff105bc63c4fc242fbabaec04fde2cb81fdd4 (patch) | |
| tree | 91b0cea0a8a7071c183e8be804488238632ba68d | |
| parent | f9db5595fe4d62c54b3a501b2af64b4e2b7035cd (diff) | |
Bug #1889: Stop the CCE before an engine reset. (Conn)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/r128_accel.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2006-06-03 Daniel Stone <daniel@freedesktop.org> + + * src/r128_accel.c: + Bug #1889: Stop the CCE before an engine reset. (Conn) + 2006-05-21 Michel Dänzer <michel@tungstengraphics.com> * configure.ac: diff --git a/src/r128_accel.c b/src/r128_accel.c index bdaa258..351594b 100644 --- a/src/r128_accel.c +++ b/src/r128_accel.c @@ -221,6 +221,9 @@ void R128WaitForIdle(ScrnInfoPtr pScrn) INREG(R128_GUI_PROBE))); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Idle timed out, resetting engine...\n"); +#ifdef XF86DRI + R128CCE_STOP(pScrn, info); +#endif R128EngineReset(pScrn); #ifdef XF86DRI R128CCE_RESET(pScrn, info); |