summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2011-08-12 11:21:33 +0200
committerMichel Dänzer <michel@daenzer.net>2011-09-20 13:04:43 +0200
commitd78860ba53d9bfcf6c28e1cfd2d970709b5e20fa (patch)
treeb67a6bab975ff896eb5ae418530a0ad47a7ff12f
parent11330ca5dc61a70fe4507e63230f9133ca22d891 (diff)
Only call radeon_dri2_close_screen() if DRI2 was enabled.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-rw-r--r--src/radeon_kms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e1615527..32065fb9 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -876,7 +876,8 @@ static Bool RADEONCloseScreen_KMS(int scrnIndex, ScreenPtr pScreen)
if (info->cursor) xf86DestroyCursorInfoRec(info->cursor);
info->cursor = NULL;
- radeon_dri2_close_screen(pScreen);
+ if (info->dri2.enabled)
+ radeon_dri2_close_screen(pScreen);
pScrn->vtSema = FALSE;
xf86ClearPrimInitDone(info->pEnt->index);
r1-0/+16 2010-09-08RDS: Inline rdma_prepare into cmsg_rdma_argsAndy Grover1-26/+12 2010-09-08RDS: WhitespaceAndy Grover1-1/+0 2010-09-08RDS: Do not mask address when pinning pagesAndy Grover1-2/+2 2010-09-08RDS: Base init_depth and responder_resources on hw valuesAndy Grover1-2/+1 2010-09-08RDS: Implement atomic operationsAndy Grover1-0/+73 2010-09-08RDS: make sure all sgs alloced are initializedAndy Grover1-2/+1 2010-09-08RDS: make m_rdma_op a member of rds_messageAndy Grover1-53/+60 2010-09-08RDS: fold rdma.h into rds.hAndy Grover1-1/+1 2010-09-08RDS: cleanup/fix rds_rdma_unuseAndy Grover1-12/+15 2010-09-08RDS: break out rdma and data ops into nested structs in rds_messageAndy Grover1-4/+5 2010-09-08RDS: cleanup: remove "== NULL"s and "!= NULL"s in ptr comparisonsAndy Grover1-9/+9 2010-09-08RDS: Fix corrupted rds_mrsTina Yang1-0/+8 2010-09-08RDS: Fix BUG_ONs to not fire when in a taskletAndy Grover1-1/+1 2010-04-11Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller1-0/+1 2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo1-0/+1 2010-03-16RDS: Do not call set_page_dirty() with irqs offAndy Grover1-1/+3 2009-11-29net: Move && and || to end of previous lineJoe Perches1-6/+6 2009-10-30RDS: Add GET_MR_FOR_DEST sockoptAndy Grover1-0/+24 2009-04-09RDS: use get_user_pages_fast()Andy Grover1-4/+1 2009-04-09RDS: Fix ordering in a conditionalAndy Grover1-1/+1 2009-02-26RDS: RDMA supportAndy Grover1-0/+679