From b302419abe96cdb81878913c164d7ae2209ddcda Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <rscheidegger@gmx.ch>
Date: Fri, 2 Jun 2006 01:52:54 +0000
Subject: remove code dealing with drmMinor version < 6 since all radeon
 drivers request at least drmMinor 6 anyway.

---
 src/mesa/drivers/dri/r300/r300_ioctl.c     | 3 ---
 src/mesa/drivers/dri/r300/radeon_context.c | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/mesa/drivers/dri/r300')

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 159285962d..2a2eef5812 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -875,9 +875,6 @@ GLuint r300GetMemoryOffsetMESA(__DRInativeDisplay * dpy, int scrn,
 	if (!r300IsGartMemory(rmesa, pointer, 0))
 		return ~0;
 
-	if (rmesa->radeon.dri.drmMinor < 6)
-		return ~0;
-
 	card_offset = r300GartOffsetFromVirtual(rmesa, pointer);
 
 	return card_offset - rmesa->radeon.radeonScreen->gart_base;
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 0147c6492e..4172fbcf83 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -175,17 +175,15 @@ GLboolean radeonInitContext(radeonContextPtr radeon,
 	fthrottle_mode = driQueryOptioni(&radeon->optionCache, "fthrottle_mode");
 	radeon->iw.irq_seq = -1;
 	radeon->irqsEmitted = 0;
-	radeon->do_irqs = (radeon->dri.drmMinor >= 6 &&
-			  fthrottle_mode == DRI_CONF_FTHROTTLE_IRQS &&
+	radeon->do_irqs = (fthrottle_mode == DRI_CONF_FTHROTTLE_IRQS &&
 			  radeon->radeonScreen->irq);
 
 	radeon->do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS);
 
 	if (!radeon->do_irqs)
 		fprintf(stderr,
-			"IRQ's not enabled, falling back to %s: %d %d %d\n",
+			"IRQ's not enabled, falling back to %s: %d %d\n",
 			radeon->do_usleeps ? "usleeps" : "busy waits",
-			radeon->dri.drmMinor,
 			fthrottle_mode, radeon->radeonScreen->irq);
 
 	radeon->vblank_flags = (radeon->radeonScreen->irq != 0)
-- 
cgit v1.2.3