fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/drm: Drop deprecated drm_bacon_bo::offset.

Browse source 
This field was the wrong size, so we replaced it with offset64.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-03-22 11:39:39 -07:00
parent a29fb9b2ee
commit 55ee8f36a8
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_bufmgr.h
View file

@ -62,12 +62,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.

3
src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
View file

@ -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;

2
src/mesa/drivers/dri/i965/intel_screen.c
View file

@ -1399,7 +1399,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) {