diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 11c3d6c..8322400 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -3043,7 +3043,10 @@ rhdGetCardType(RHDPtr rhdPtr)
 	    switch (cap_id & 0xff) {
 	    case RHD_PCI_CAPID_AGP:
 		xf86DrvMsg(rhdPtr->scrnIndex, X_INFO, "AGP Card Detected\n");
-		return RHD_CARD_AGP;
+		if (rhdPtr->ChipSet >= RHD_R600)
+		    return RHD_CARD_PCIE;
+		else
+		    return RHD_CARD_AGP;
 	    case RHD_PCI_CAPID_PCIE:
 		xf86DrvMsg(rhdPtr->scrnIndex, X_INFO, "PCIE Card Detected\n");
 		return RHD_CARD_PCIE;