From f5e5c0c1017d309684718804dbfac7f16518014e Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 21 Mar 2017 14:46:39 -0700 Subject: [PATCH] i965: Stop using legacy dri_bufmgr_* and intel_* names. Eric renamed these from dri_bufmgr_* and intel_bufmgr_* to drm_intel_* in libdrm commit 4b9826408f65976a1a13387beda748b65e03ec52, circa 2008, but we've been using the legacy names this whole time. Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/brw_compute.c | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 2 +- src/mesa/drivers/dri/i965/brw_context.h | 2 +- src/mesa/drivers/dri/i965/brw_draw.c | 2 +- src/mesa/drivers/dri/i965/genX_blorp_exec.c | 2 +- src/mesa/drivers/dri/i965/intel_batchbuffer.c | 9 ++++++--- src/mesa/drivers/dri/i965/intel_batchbuffer.h | 3 ++- src/mesa/drivers/dri/i965/intel_blit.c | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 6 +++--- src/mesa/drivers/dri/i965/intel_screen.h | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_compute.c b/src/mesa/drivers/dri/i965/brw_compute.c index 21da2ad17b5..c0044818011 100644 --- a/src/mesa/drivers/dri/i965/brw_compute.c +++ b/src/mesa/drivers/dri/i965/brw_compute.c @@ -212,7 +212,7 @@ brw_dispatch_compute_common(struct gl_context *ctx) brw->no_batch_wrap = false; - if (dri_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { + if (drm_intel_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { if (!fail_next) { intel_batchbuffer_reset_to_saved(brw); intel_batchbuffer_flush(brw); diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 2fafee07674..81c05446520 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -891,7 +891,7 @@ brw_process_driconf_options(struct brw_context *brw) case DRI_CONF_BO_REUSE_DISABLED: break; case DRI_CONF_BO_REUSE_ALL: - intel_bufmgr_gem_enable_reuse(brw->bufmgr); + drm_intel_bufmgr_gem_enable_reuse(brw->bufmgr); break; } diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index a042e4b2ff6..1d571107fa0 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -656,7 +656,7 @@ struct brw_context } vtbl; - dri_bufmgr *bufmgr; + drm_intel_bufmgr *bufmgr; drm_intel_context *hw_ctx; diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index b7860ae26e7..1828a6c5a6d 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -601,7 +601,7 @@ retry: brw->no_batch_wrap = false; - if (dri_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { + if (drm_intel_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { if (!fail_next) { intel_batchbuffer_reset_to_saved(brw); intel_batchbuffer_flush(brw); diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index b8dcf9fd3b5..f9334ee13d7 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -232,7 +232,7 @@ retry: * map all the BOs into the GPU at batch exec time later. If so, flush the * batch and try again with nothing else in the batch. */ - if (dri_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { + if (drm_intel_bufmgr_check_aperture_space(&brw->batch.bo, 1)) { if (!check_aperture_failed_once) { check_aperture_failed_once = true; intel_batchbuffer_reset_to_saved(brw); diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 1599a2c2a53..4c3b7dcc411 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -39,7 +39,8 @@ #include static void -intel_batchbuffer_reset(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr, +intel_batchbuffer_reset(struct intel_batchbuffer *batch, + drm_intel_bufmgr *bufmgr, bool has_llc); static bool @@ -55,7 +56,8 @@ uint_key_hash(const void *key) } void -intel_batchbuffer_init(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr, +intel_batchbuffer_init(struct intel_batchbuffer *batch, + drm_intel_bufmgr *bufmgr, bool has_llc) { intel_batchbuffer_reset(batch, bufmgr, has_llc); @@ -73,7 +75,8 @@ intel_batchbuffer_init(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr, } static void -intel_batchbuffer_reset(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr, +intel_batchbuffer_reset(struct intel_batchbuffer *batch, + drm_intel_bufmgr *bufmgr, bool has_llc) { if (batch->last_bo != NULL) { diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h index cf545ec1886..9d5e8ce7e9c 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h @@ -38,7 +38,8 @@ extern "C" { struct intel_batchbuffer; -void intel_batchbuffer_init(struct intel_batchbuffer *batch, dri_bufmgr *bufmgr, +void intel_batchbuffer_init(struct intel_batchbuffer *batch, + drm_intel_bufmgr *bufmgr, bool has_llc); void intel_batchbuffer_free(struct intel_batchbuffer *batch); void intel_batchbuffer_save_state(struct brw_context *brw); diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index ca24abef3b2..a6140e7df2f 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -516,7 +516,7 @@ intelEmitCopyBlit(struct brw_context *brw, aper_array[1] = dst_buffer; aper_array[2] = src_buffer; - if (dri_bufmgr_check_aperture_space(aper_array, 3) != 0) { + if (drm_intel_bufmgr_check_aperture_space(aper_array, 3) != 0) { intel_batchbuffer_flush(brw); pass++; } else diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index bc998abce1c..811a9c5a867 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1103,7 +1103,7 @@ intelDestroyScreen(__DRIscreen * sPriv) { struct intel_screen *screen = sPriv->driverPrivate; - dri_bufmgr_destroy(screen->bufmgr); + drm_intel_bufmgr_destroy(screen->bufmgr); driDestroyOptionInfo(&screen->optionCache); ralloc_free(screen); @@ -1265,7 +1265,7 @@ intel_init_bufmgr(struct intel_screen *screen) screen->no_hw = getenv("INTEL_NO_HW") != NULL; - screen->bufmgr = intel_bufmgr_gem_init(dri_screen->fd, BATCH_SZ); + screen->bufmgr = drm_intel_bufmgr_gem_init(dri_screen->fd, BATCH_SZ); if (screen->bufmgr == NULL) { fprintf(stderr, "[%s:%u] Error initializing buffer manager.\n", __func__, __LINE__); @@ -1765,7 +1765,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) brw_process_intel_debug_variable(); if (INTEL_DEBUG & DEBUG_BUFMGR) - dri_bufmgr_set_debug(screen->bufmgr, true); + drm_intel_bufmgr_set_debug(screen->bufmgr, true); if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && devinfo->gen < 7) { fprintf(stderr, diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index d8cda58c964..18a0bd97dd7 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -72,7 +72,7 @@ struct intel_screen #define KERNEL_ALLOWS_HSW_SCRATCH1_AND_ROW_CHICKEN3 (1<<3) #define KERNEL_ALLOWS_COMPUTE_DISPATCH (1<<4) - dri_bufmgr *bufmgr; + drm_intel_bufmgr *bufmgr; /** * A unique ID for shader programs. -- 2.30.2