[Mesa-dev] [PATCH 24/53] i965/drm: Drop deprecated drm_bacon_bo::offset.

[Kenneth Graunke]

This field was the wrong size, so we replaced it with offset64.
---
 src/mesa/drivers/dri/i965/brw_bufmgr.h       | 6 ------
 src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 3 ---
 src/mesa/drivers/dri/i965/intel_screen.c     | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index 84e29fbc168..1e47f75b4a5 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -63,12 +63,6 @@ struct _drm_bacon_bo {
 	unsigned long align;
 
 	/**
-	 * Deprecated field containing (possibly the low 32-bits of) the last
-	 * seen virtual card address.  Use offset64 instead.
-	 */
-	unsigned long offset;
-
-	/**
 	 * Virtual address for accessing the buffer data.  Only valid while
 	 * mapped.
 	 */
diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
index 8f9fbdf74be..40ad89f87a1 100644
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
@@ -977,7 +977,6 @@ drm_bacon_bo_gem_create_from_name(drm_bacon_bufmgr *bufmgr,
 	list_inithead(&bo_gem->vma_list);
 
 	bo_gem->bo.size = open_arg.size;
-	bo_gem->bo.offset = 0;
 	bo_gem->bo.offset64 = 0;
 	bo_gem->bo.virtual = NULL;
 	bo_gem->bo.bufmgr = bufmgr;
@@ -1973,7 +1972,6 @@ drm_bacon_update_buffer_offsets2 (drm_bacon_bufmgr *bufmgr)
 			    upper_32_bits(bufmgr->exec2_objects[i].offset),
 			    lower_32_bits(bufmgr->exec2_objects[i].offset));
 			bo->offset64 = bufmgr->exec2_objects[i].offset;
-			bo->offset = bufmgr->exec2_objects[i].offset;
 		}
 	}
 }
@@ -2199,7 +2197,6 @@ drm_bacon_bo_set_softpin_offset(drm_bacon_bo *bo, uint64_t offset)
 	drm_bacon_bo_gem *bo_gem = (drm_bacon_bo_gem *) bo;
 
 	bo->offset64 = offset;
-	bo->offset = offset;
 	bo_gem->kflags |= EXEC_OBJECT_PINNED;
 
 	return 0;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 3801dc60397..9de2ec0cefd 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1398,7 +1398,7 @@ intel_detect_pipelined_register(struct intel_screen *screen,
                            results, offset*sizeof(uint32_t),
                            I915_GEM_DOMAIN_INSTRUCTION,
                            I915_GEM_DOMAIN_INSTRUCTION);
-   *batch++ = results->offset + offset*sizeof(uint32_t);
+   *batch++ = ((uint32_t) results->offset64) + offset*sizeof(uint32_t);
 
    /* And afterwards clear the register */
    if (reset) {
-- 
2.12.1