summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-02-08 11:20:21 -0500
committerKristian Høgsberg <krh@bitplanet.net>2011-02-08 11:22:58 -0500
commitcf899235a6c7c3bd5665fcd38dd7cc9b877417ad (patch)
treea17c9a0765a34ad9f89dfb4fa1ed9f3a246c6ab2
parentc022fc5832713291a9df1fd522a67aef1c9bea49 (diff)
Don't call hosted function unless hosted is enabledhosted
It crashes with an unresolved symbol error."
-rw-r--r--src/intel_dri.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/intel_dri.c b/src/intel_dri.c
index 56c76652..00e20b06 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -1162,6 +1162,10 @@ static int intel_auth_magic(int fd, uint32_t magic)
intel_screen_private *intel;
int i;
+ /* Not hosted, go stragight to drm */
+ if (!xorgHosted)
+ return drmAuthMagic(fd, magic);
+
for (i = 0; i < 1; i++) {
scrn = xf86Screens[i];
intel = intel_get_screen_private(scrn);
@@ -1169,14 +1173,8 @@ static int intel_auth_magic(int fd, uint32_t magic)
break;
}
- if (i == 1) {
- /* Not hosted, go stragight to drm */
- return drmAuthMagic(fd, magic);
- } else {
- /* Forward the request to our host */
- return hosted_screen_authenticate(intel->hosted_screen,
- magic);
- }
+ /* Forward the request to our host */
+ return hosted_screen_authenticate(intel->hosted_screen, magic);
}
#endif