diff --git a/linux-core/i915_gem_debug.c b/linux-core/i915_gem_debug.c
index a2d6f28..6d50e5b 100644
--- a/linux-core/i915_gem_debug.c
+++ b/linux-core/i915_gem_debug.c
@@ -35,7 +35,7 @@
 void
 i915_verify_inactive(struct drm_device *dev, char *file, int line)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_gem_object *obj;
 	struct drm_i915_gem_object *obj_priv;
 
@@ -102,7 +102,7 @@ i915_gem_dump_object(struct drm_gem_object *obj, int len,
 void
 i915_dump_lru(struct drm_device *dev, const char *where)
 {
-	drm_i915_private_t		*dev_priv = dev->dev_private;
+	struct drm_i915_private		*dev_priv = dev->dev_private;
 	struct drm_i915_gem_object	*obj_priv;
 
 	DRM_INFO("active list %s {\n", where);
diff --git a/linux-core/i915_gem_tiling.c b/linux-core/i915_gem_tiling.c
index c5825fb..3ac1f35 100644
--- a/linux-core/i915_gem_tiling.c
+++ b/linux-core/i915_gem_tiling.c
@@ -115,7 +115,8 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 	 * since the bridge would only ever use standard BARs 0-1 (though it
 	 * doesn't anyway)
 	 */
-	ret = pci_read_base(bridge, mchbar_offset, &bridge->resource[2]);
+	ret = pci_read_base(bridge, pci_bar_mem64, &bridge->resource[2],
+			    mchbar_offset);
 	if (ret != 0) {
 		DRM_ERROR("pci_read_base failed: %d\n", ret);
 		return;
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 2d18655..8db19a3 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -388,7 +388,7 @@ struct drm_i915_private {
 		/** Bit 6 swizzling required for Y tiling */
 		uint32_t bit_6_swizzle_y;
 	} mm;
-} drm_i915_private_t;
+};
 
 struct drm_i915_file_private {
 	struct {