Wed Jul 24 03:24:21 2013 UTC ()
Restore usage of pci_get_bus_and_slot in i915_get_bridge_dev.


(riastradh)
diff -r1.1.1.1.2.15 -r1.1.1.1.2.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs diff -r1.1.1.1.2.15 -r1.1.1.1.2.16 src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c 2013/07/24 03:19:18 1.1.1.1.2.15
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c 2013/07/24 03:24:21 1.1.1.1.2.16
@@ -1150,31 +1150,27 @@ static int i915_set_status_page(struct d @@ -1150,31 +1150,27 @@ static int i915_set_status_page(struct d
1150 I915_WRITE(HWS_PGA, ring->status_page.gfx_addr); 1150 I915_WRITE(HWS_PGA, ring->status_page.gfx_addr);
1151 1151
1152 DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n", 1152 DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n",
1153 ring->status_page.gfx_addr); 1153 ring->status_page.gfx_addr);
1154 DRM_DEBUG_DRIVER("load hws at %p\n", 1154 DRM_DEBUG_DRIVER("load hws at %p\n",
1155 ring->status_page.page_addr); 1155 ring->status_page.page_addr);
1156 return 0; 1156 return 0;
1157} 1157}
1158 1158
1159static int i915_get_bridge_dev(struct drm_device *dev) 1159static int i915_get_bridge_dev(struct drm_device *dev)
1160{ 1160{
1161 struct drm_i915_private *dev_priv = dev->dev_private; 1161 struct drm_i915_private *dev_priv = dev->dev_private;
1162 1162
1163#ifdef __NetBSD__ 
1164 dev_priv->bridge_dev = pci_kludgey_find_dev(dev->pdev, 0, 0, 0); 
1165#else 
1166 dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); 1163 dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
1167#endif 
1168 if (!dev_priv->bridge_dev) { 1164 if (!dev_priv->bridge_dev) {
1169 DRM_ERROR("bridge device not found\n"); 1165 DRM_ERROR("bridge device not found\n");
1170 return -1; 1166 return -1;
1171 } 1167 }
1172 return 0; 1168 return 0;
1173} 1169}
1174 1170
1175#define MCHBAR_I915 0x44 1171#define MCHBAR_I915 0x44
1176#define MCHBAR_I965 0x48 1172#define MCHBAR_I965 0x48
1177#define MCHBAR_SIZE (4*4096) 1173#define MCHBAR_SIZE (4*4096)
1178 1174
1179#define DEVEN_REG 0x54 1175#define DEVEN_REG 0x54
1180#define DEVEN_MCHBAR_EN (1 << 28) 1176#define DEVEN_MCHBAR_EN (1 << 28)