inteldrm_chipset_flush -> i915_gem_chipset_flush

4 files changed, 7 insertions, 8 deletions

diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index 245d66b2a76..68e98e78d07 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -1379,9 +1379,9 @@ nope:
 }
 
 void
-inteldrm_chipset_flush(struct inteldrm_softc *dev_priv)
+i915_gem_chipset_flush(struct drm_device *dev)
 {
-	struct drm_device	*dev = (struct drm_device *)dev_priv->drmdev;
+	drm_i915_private_t *dev_priv = dev->dev_private;
 
 	/*
 	 * Write to this flush page flushes the chipset write cache.
diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915_drv.h
index 3f4df0de4ac..01ce5f93dca 100644
--- a/sys/dev/pci/drm/i915_drv.h
+++ b/sys/dev/pci/drm/i915_drv.h
@@ -1142,7 +1142,7 @@ void	i915_driver_close(struct drm_device *, struct drm_file *);
 void	inteldrm_wipe_mappings(struct drm_obj *);
 void	inteldrm_set_max_obj_size(struct inteldrm_softc *);
 void	inteldrm_purge_obj(struct drm_obj *);
-void	inteldrm_chipset_flush(struct inteldrm_softc *);
+void	i915_gem_chipset_flush(struct drm_device *);
 int	intel_gpu_reset(struct drm_device *);
 int	i915_reset(struct drm_device *);
 void	inteldrm_timeout(void *);
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c
index 99976a39caa..051cf44edc7 100644
--- a/sys/dev/pci/drm/i915_gem.c
+++ b/sys/dev/pci/drm/i915_gem.c
@@ -1950,14 +1950,13 @@ i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj)
 void
 i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj)
 {
-	drm_i915_private_t *dev_priv = obj->base.dev->dev_private;
 	uint32_t old_write_domain;
 
 	if (obj->base.write_domain != I915_GEM_DOMAIN_CPU)
 		return;
 
 	i915_gem_clflush_object(obj);
-	inteldrm_chipset_flush(dev_priv);
+	i915_gem_chipset_flush(obj->base.dev);
 	old_write_domain = obj->base.write_domain;
 	obj->base.write_domain = 0;
 
@@ -2940,7 +2939,7 @@ void i915_gem_detach_phys_object(struct drm_device *dev,
 		}
 #endif
 	}
-	inteldrm_chipset_flush(dev->dev_private);
+	i915_gem_chipset_flush(dev);
 
 	obj->phys_obj->cur_obj = NULL;
 	obj->phys_obj = NULL;
@@ -3015,7 +3014,7 @@ i915_gem_phys_pwrite(struct drm_device *dev,
 	ret = copyin((char *)(uintptr_t)args->data_ptr,
 	    vaddr, args->size);
 
-	inteldrm_chipset_flush(dev->dev_private);
+	i915_gem_chipset_flush(dev);
 
 	return ret;
 }
diff --git a/sys/dev/pci/drm/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915_gem_execbuffer.c
index b2cd48e01da..a6dfcc5f6ec 100644
--- a/sys/dev/pci/drm/i915_gem_execbuffer.c
+++ b/sys/dev/pci/drm/i915_gem_execbuffer.c
@@ -143,7 +143,7 @@ i915_gem_execbuffer_move_to_gpu(struct intel_ring_buffer *ring,
 	}
 
 	if (flush_domains & I915_GEM_DOMAIN_CPU)
-		inteldrm_chipset_flush(ring->dev->dev_private);
+		i915_gem_chipset_flush(ring->dev);
 
 	if (flush_domains & I915_GEM_DOMAIN_GTT)
 		DRM_WRITEMEMORYBARRIER();