From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 6 Apr 2017 06:27:47 +0000 (+0200)
Subject: i965/bufmgr: remove start_gtt_access
X-Git-Tag: upstream/17.1.0~312
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edd85c1f040b4d91ae31fd80fbba2554d55bc13d;p=platform%2Fupstream%2Fmesa.git

i965/bufmgr: remove start_gtt_access

Iirc this was used by uxa for persistent mmpas of the frontbuffer. For
mesa all the set_domain stuff needed before a synchronized mmap is handled
within the bufmgr, so no reason ever to call this.

Inline the implementation into its only internal user.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 5420629..080a4bd 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -1000,7 +1000,20 @@ brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
 void
 brw_bo_wait_rendering(struct brw_bo *bo)
 {
-   brw_bo_start_gtt_access(bo, 1);
+   struct brw_bufmgr *bufmgr = bo->bufmgr;
+   struct drm_i915_gem_set_domain set_domain;
+   int ret;
+
+   memclear(set_domain);
+   set_domain.handle = bo->gem_handle;
+   set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+   set_domain.write_domain = I915_GEM_DOMAIN_GTT;
+   ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
+   if (ret != 0) {
+      DBG("%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
+          __FILE__, __LINE__, bo->gem_handle,
+          set_domain.read_domains, set_domain.write_domain, strerror(errno));
+   }
 }
 
 /**
@@ -1047,32 +1060,6 @@ brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns)
    return ret;
 }
 
-/**
- * Sets the object to the GTT read and possibly write domain, used by the X
- * 2D driver in the absence of kernel support to do brw_bo_map_gtt().
- *
- * In combination with brw_bo_pin() and manual fence management, we
- * can do tiled pixmaps this way.
- */
-void
-brw_bo_start_gtt_access(struct brw_bo *bo, int write_enable)
-{
-   struct brw_bufmgr *bufmgr = bo->bufmgr;
-   struct drm_i915_gem_set_domain set_domain;
-   int ret;
-
-   memclear(set_domain);
-   set_domain.handle = bo->gem_handle;
-   set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-   set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0;
-   ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
-   if (ret != 0) {
-      DBG("%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
-          __FILE__, __LINE__, bo->gem_handle,
-          set_domain.read_domains, set_domain.write_domain, strerror(errno));
-   }
-}
-
 void
 brw_bufmgr_destroy(struct brw_bufmgr *bufmgr)
 {
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index 53d51f2..170909d 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -278,8 +278,6 @@ void *brw_bo_map__cpu(struct brw_bo *bo);
 void *brw_bo_map__gtt(struct brw_bo *bo);
 void *brw_bo_map__wc(struct brw_bo *bo);
 
-void brw_bo_start_gtt_access(struct brw_bo *bo, int write_enable);
-
 int brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns);
 
 uint32_t brw_create_hw_context(struct brw_bufmgr *bufmgr);