From a956d478043b44c49aed39c7aa3d576ef32cadc5 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 9 Oct 2009 20:08:31 +1000 Subject: Revert "kms: setup colormap and gamma correctly." This reverts commit 60d9685abddccec17c1a9a5ec48cbe9c92543e0f. which breaks colormap on 1.6 X server Conflicts: src/drmmode_display.c --- src/radeon_kms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/radeon_kms.c') diff --git a/src/radeon_kms.c b/src/radeon_kms.c index faa6025e..b3fe20cd 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -767,8 +767,8 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen, // info->PointerMoved = pScrn->PointerMoved; // pScrn->PointerMoved = RADEONPointerMoved; - if (!miCreateDefColormap(pScreen)) - return FALSE; + if (!drmmode_setup_colormap(pScreen, pScrn)) + return FALSE; /* Note unused options */ if (serverGeneration == 1) -- cgit v1.2.3