diff options
| author |   jsg <jsg@openbsd.org> | 2015-04-11 02:24:43 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-04-11 02:24:43 +0000 |
| commit | 01d60376c27ccbba26a7d8c5a2be2023dd2e7f5b (patch) | |
| tree | c77b1662224c42564f41ca14f386be7092b00dbe | |
| parent | Axe vq_free_entry_locked (diff) | |
| download | wireguard-openbsd-01d60376c27ccbba26a7d8c5a2be2023dd2e7f5b.tar.xz wireguard-openbsd-01d60376c27ccbba26a7d8c5a2be2023dd2e7f5b.zip | |
Rename i915_gem_chipset_flush() to intel_gtt_chipset_flush()
so we can use the inline definition of i915_gem_chipset_flush()
that avoids the flush entirely on gen >= 6.
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 7ed26ace120..9f5560187fb 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.76 2015/04/03 13:10:59 jsg Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.77 2015/04/11 02:24:43 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -1338,7 +1338,7 @@ nope: } void -i915_gem_chipset_flush(struct drm_device *dev) +intel_gtt_chipset_flush(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private; diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index b9f3fb4b04b..ed992095b95 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.58 2015/04/05 11:53:53 kettenis Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.59 2015/04/11 02:24:43 jsg Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -1652,7 +1652,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, #endif /* i915_drv.c */ -void i915_gem_chipset_flush(struct drm_device *); +void intel_gtt_chipset_flush(struct drm_device *); int intel_gpu_reset(struct drm_device *); int i915_reset(struct drm_device *); void inteldrm_timeout(void *); @@ -1690,13 +1690,11 @@ void i915_gem_init_global_gtt(struct drm_device *dev, unsigned long end); int i915_gem_gtt_init(struct drm_device *dev); void i915_gem_gtt_fini(struct drm_device *dev); -#ifdef notyet static inline void i915_gem_chipset_flush(struct drm_device *dev) { if (INTEL_INFO(dev)->gen < 6) - intel_gtt_chipset_flush(); + intel_gtt_chipset_flush(dev); } -#endif /* i915_gem_evict.c */ |