Re: [Intel-gfx] [PATCH] uxa: fix getmsc to not fail hard

[Chris Wilson]

On Wed, May 21, 2014 at 12:41:58PM +1000, Dave Airlie wrote:
 From: Dave Airlie airl...@redhat.com
 
 If some outputs go away we race with this call and apps
 get X errors and fall over. Do what SNA does and don't
 bother trying.

Horrible clients is why I gave up trying to report BadMatch for the
inactive pipe. Though it has been a long time since the kernel turned
off CRTCs without intervention from userspace.

This is a useful safeguard, though it angers the OML sync proponents.
Pushed, thanks.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] uxa: fix getmsc to not fail hard

[Dave Airlie]

From: Dave Airlie airl...@redhat.com

If some outputs go away we race with this call and apps
get X errors and fall over. Do what SNA does and don't
bother trying.

Signed-off-by: Dave Airlie airl...@redhat.com
---
 src/uxa/intel_dri.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
index 0370034..5d1262a 100644
--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -1351,6 +1351,7 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
 
/* Drawable not displayed, make up a *monotonic* value */
if (pipe == -1) {
+fail:
*ust = gettime_us();
*msc = 0;
return TRUE;
@@ -1369,7 +1370,7 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
   strerror(errno));
limit--;
}
-   return FALSE;
+   goto fail;
}
 
*ust = ((CARD64)vbl.reply.tval_sec * 100) + vbl.reply.tval_usec;
-- 
1.9.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx