KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/drm: Rename drm_bacon_reg_read() to brw_reg_read(). 

Less bacon.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-04-03 20:14:11 -07:00
parent 662a733dbc
commit dfd81373b6
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_bufmgr.h
View File

@ -309,9 +309,7 @@ int drm_bacon_bo_gem_export_to_prime(drm_bacon_bo *bo, int *prime_fd);
drm_bacon_bo *drm_bacon_bo_gem_create_from_prime(struct brw_bufmgr *bufmgr,
int prime_fd, int size);
int drm_bacon_reg_read(struct brw_bufmgr *bufmgr,
uint32_t offset,
uint64_t *result);
int brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset, uint64_t *result);
/** @{ */

6
src/mesa/drivers/dri/i965/brw_queryobj.c
View File

@ -539,14 +539,14 @@ brw_get_timestamp(struct gl_context *ctx)
switch (brw->screen->hw_has_timestamp) {
case 3: /* New kernel, always full 36bit accuracy */
drm_bacon_reg_read(brw->bufmgr, TIMESTAMP | 1, &result);
brw_reg_read(brw->bufmgr, TIMESTAMP | 1, &result);
break;
case 2: /* 64bit kernel, result is left-shifted by 32bits, losing 4bits */
drm_bacon_reg_read(brw->bufmgr, TIMESTAMP, &result);
brw_reg_read(brw->bufmgr, TIMESTAMP, &result);
result = result >> 32;
break;
case 1: /* 32bit kernel, result is 36bit wide but may be inaccurate! */
drm_bacon_reg_read(brw->bufmgr, TIMESTAMP, &result);
brw_reg_read(brw->bufmgr, TIMESTAMP, &result);
break;
}

4
src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
View File

@ -1442,9 +1442,7 @@ brw_destroy_hw_context(struct brw_bufmgr *bufmgr, uint32_t ctx_id)
}
int
drm_bacon_reg_read(struct brw_bufmgr *bufmgr,
uint32_t offset,
uint64_t *result)
brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset, uint64_t *result)
{
struct drm_i915_reg_read reg_read;
int ret;

6
src/mesa/drivers/dri/i965/intel_screen.c
View File

@ -1324,13 +1324,13 @@ intel_detect_timestamp(struct intel_screen *screen)
* More recent kernels offer an interface to read the full 36bits
* everywhere.
*/
if (drm_bacon_reg_read(screen->bufmgr, TIMESTAMP | 1, &dummy) == 0)
if (brw_reg_read(screen->bufmgr, TIMESTAMP | 1, &dummy) == 0)
return 3;
/* Determine if we have a 32bit or 64bit kernel by inspecting the
* upper 32bits for a rapidly changing timestamp.
*/
if (drm_bacon_reg_read(screen->bufmgr, TIMESTAMP, &last))
if (brw_reg_read(screen->bufmgr, TIMESTAMP, &last))
return 0;
upper = lower = 0;
@ -1338,7 +1338,7 @@ intel_detect_timestamp(struct intel_screen *screen)
/* The TIMESTAMP should change every 80ns, so several round trips
* through the kernel should be enough to advance it.
*/
if (drm_bacon_reg_read(screen->bufmgr, TIMESTAMP, &dummy))
if (brw_reg_read(screen->bufmgr, TIMESTAMP, &dummy))
return 0;
upper += (dummy >> 32) != (last >> 32);