drm: Branch 'xgi-0-0-2' - 3 commits

[<id...@ke...>]

 linux-core/xgi_cmdlist.c |   13 +++++--------
 linux-core/xgi_drv.c     |   38 --------------------------------------
 linux-core/xgi_regs.h    |    3 ++-
 3 files changed, 7 insertions(+), 47 deletions(-)

New commits:
diff-tree 46214fc3979ed60b32289ade1b8efbba1c8bf732 (from 388a2c54eea7575a5b046da3df09f7a1c63551d6)
Author: Ian Romanick <id...@us...>
Date:   Mon Jul 23 18:50:52 2007 -0700

    Minor log message clean up.

diff --git a/linux-core/xgi_regs.h b/linux-core/xgi_regs.h
index b211626..f5311c1 100644
--- a/linux-core/xgi_regs.h
+++ b/linux-core/xgi_regs.h
@@ -76,9 +76,10 @@ static inline u8 IN3CFB(struct drm_map *
  */
 static inline void dwWriteReg(struct drm_map * map, u32 addr, u32 data)
 {
+#ifdef XGI_MMIO_DEBUG
 	DRM_INFO("mmio_map->handle = 0x%p, addr = 0x%x, data = 0x%x\n",
 		 map->handle, addr, data);
-
+#endif
 	DRM_WRITE32(map, addr, data);
 }
 
diff-tree 388a2c54eea7575a5b046da3df09f7a1c63551d6 (from 2097d743f287d994bd001baedd39e3bc808999c6)
Author: Ian Romanick <id...@us...>
Date:   Mon Jul 23 18:50:07 2007 -0700

    Minor log message clean up.

diff --git a/linux-core/xgi_cmdlist.c b/linux-core/xgi_cmdlist.c
index 98d80ef..f5fc1b9 100644
--- a/linux-core/xgi_cmdlist.c
+++ b/linux-core/xgi_cmdlist.c
@@ -116,7 +116,7 @@ static void xgi_submit_cmdlist(struct xg
 		dwWriteReg(info->mmio_map, portOffset +  8, begin[2]);
 		dwWriteReg(info->mmio_map, portOffset + 12, begin[3]);
 	} else {
-		DRM_INFO("info->cmdring.last_ptr != NULL\n");
+		DRM_DEBUG("info->cmdring.last_ptr != NULL\n");
 
 		if (pCmdInfo->type == BTYPE_3D) {
 			addFlush2D(info);
@@ -132,7 +132,6 @@ static void xgi_submit_cmdlist(struct xg
 	}
 
 	info->cmdring.last_ptr = xgi_find_pcie_virt(info, pCmdInfo->hw_addr);
-	DRM_INFO("%s: exit\n", __func__);
 }
 
 
@@ -172,19 +171,17 @@ int xgi_state_change(struct xgi_info * i
 #define STATE_SHUTDOWN  5
 
 	if ((from == STATE_GRAPHIC) && (to == STATE_CONSOLE)) {
-		DRM_INFO("[kd] I see, now is to leaveVT\n");
-		// stop to received batch
+		DRM_INFO("Leaving graphical mode (probably VT switch)\n");
 	} else if ((from == STATE_CONSOLE) && (to == STATE_GRAPHIC)) {
-		DRM_INFO("[kd] I see, now is to enterVT\n");
+		DRM_INFO("Entering graphical mode (probably VT switch)\n");
 		xgi_cmdlist_reset(info);
 	} else if ((from == STATE_GRAPHIC)
 		   && ((to == STATE_LOGOUT)
 		       || (to == STATE_REBOOT)
 		       || (to == STATE_SHUTDOWN))) {
-		DRM_INFO("[kd] I see, not is to exit from X\n");
-		// stop to received batch
+		DRM_INFO("Leaving graphical mode (probably X shutting down)\n");
 	} else {
-		DRM_ERROR("[kd] Should not happen\n");
+		DRM_ERROR("Invalid state change.\n");
 		return DRM_ERR(EINVAL);
 	}
 
diff-tree 2097d743f287d994bd001baedd39e3bc808999c6 (from 94203840fe53edaf1556d1a0a8a27773c24a7fc5)
Author: Ian Romanick <id...@us...>
Date:   Mon Jul 23 13:26:28 2007 -0700

    Eliminate XGI_CHECK_PCI_CONFIG.
    
    Based on review comments from airlied, XGI_CHECK_PCI_CONFIG is
    removed.  He believes (and I tend to agree) that this is a largely
    unnecessary workaround for a bug elsewhere.

diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index bcb6946..19a9a10 100644
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -139,40 +139,6 @@ MODULE_LICENSE("GPL and additional right
 
 void xgi_kern_isr_bh(struct drm_device *dev);
 
-/*
- * verify access to pci config space wasn't disabled behind our back
- * unfortunately, XFree86 enables/disables memory access in pci config space at
- * various times (such as restoring initial pci config space settings during vt
- * switches or when doing mulicard). As a result, all of our register accesses
- * are garbage at this point. add a check to see if access was disabled and
- * reenable any such access.
- */
-#define XGI_CHECK_PCI_CONFIG(xgi) \
-    xgi_check_pci_config(xgi, __LINE__)
-
-static inline void xgi_check_pci_config(struct xgi_info * info, int line)
-{
-	u16 cmd;
-	bool flag = 0;
-
-	pci_read_config_word(info->dev->pdev, PCI_COMMAND, &cmd);
-	if (!(cmd & PCI_COMMAND_MASTER)) {
-		DRM_INFO("restoring bus mastering! (%d)\n", line);
-		cmd |= PCI_COMMAND_MASTER;
-		flag = 1;
-	}
-
-	if (!(cmd & PCI_COMMAND_MEMORY)) {
-		DRM_INFO("restoring MEM access! (%d)\n", line);
-		cmd |= PCI_COMMAND_MEMORY;
-		flag = 1;
-	}
-
-	if (flag)
-		pci_write_config_word(info->dev->pdev, PCI_COMMAND, cmd);
-}
-
-
 int xgi_bootstrap(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
@@ -262,8 +228,6 @@ irqreturn_t xgi_kern_isr(DRM_IRQ_ARGS)
 
 	//DRM_INFO("xgi_kern_isr \n");
 
-	//XGI_CHECK_PCI_CONFIG(info);
-
 	//xgi_dvi_irq_handler(info);
 
 	if (need_to_run_bottom_half) {
@@ -280,8 +244,6 @@ void xgi_kern_isr_bh(struct drm_device *
 	DRM_INFO("xgi_kern_isr_bh \n");
 
 	//xgi_dvi_irq_handler(info);
-
-	XGI_CHECK_PCI_CONFIG(info);
 }
 
 int xgi_driver_load(struct drm_device *dev, unsigned long flags)