fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/drm: Drop cliprects and dr4 from execbuf variants.

Browse source 
Legacy DRI1 leftovers.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-04-04 14:51:52 -07:00
parent 2c257ff226
commit b0d1c5983b
4 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,6 @@
extern "C" {
#endif
struct drm_clip_rect;
typedef struct _drm_bacon_bufmgr drm_bacon_bufmgr;
typedef struct _drm_bacon_context drm_bacon_context;
typedef struct _drm_bacon_bo drm_bacon_bo;
@ -198,13 +196,10 @@ void drm_bacon_bo_wait_rendering(drm_bacon_bo *bo);
void drm_bacon_bufmgr_destroy(drm_bacon_bufmgr *bufmgr);
/** Executes the command buffer pointed to by bo. */
int drm_bacon_bo_exec(drm_bacon_bo *bo, int used,
struct drm_clip_rect *cliprects, int num_cliprects, int DR4);
int drm_bacon_bo_exec(drm_bacon_bo *bo, int used);
/** Executes the command buffer pointed to by bo on the selected ring buffer */
int drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used,
struct drm_clip_rect *cliprects, int num_cliprects, int DR4,
unsigned int flags);
int drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used, unsigned int flags);
int drm_bacon_bufmgr_check_aperture_space(drm_bacon_bo ** bo_array, int count);
/**

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

@ -488,7 +488,7 @@ do_flush_locked(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)
assert(in_fence_fd == -1);
assert(out_fence_fd == NULL);
ret = drm_bacon_bo_mrb_exec(batch->bo, 4 * USED_BATCH(*batch),
NULL, 0, 0, flags);
flags);
} else {
ret = drm_bacon_gem_bo_fence_exec(batch->bo, brw->hw_ctx,
4 * USED_BATCH(*batch),

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

@ -2000,7 +2000,6 @@ drm_bacon_update_buffer_offsets2 (drm_bacon_bufmgr_gem *bufmgr_gem)
static int
do_exec2(drm_bacon_bo *bo, int used, drm_bacon_context *ctx,
drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
int in_fence, int *out_fence,
unsigned int flags)
{
@ -2046,10 +2045,10 @@ do_exec2(drm_bacon_bo *bo, int used, drm_bacon_context *ctx,
execbuf.buffer_count = bufmgr_gem->exec_count;
execbuf.batch_start_offset = 0;
execbuf.batch_len = used;
execbuf.cliprects_ptr = (uintptr_t)cliprects;
execbuf.num_cliprects = num_cliprects;
execbuf.cliprects_ptr = 0;
execbuf.num_cliprects = 0;
execbuf.DR1 = 0;
execbuf.DR4 = DR4;
execbuf.DR4 = 0;
execbuf.flags = flags;
if (ctx == NULL)
i915_execbuffer2_set_context_id(execbuf, 0);
@ -2108,28 +2107,22 @@ skip_execution:
}
int
drm_bacon_bo_exec(drm_bacon_bo *bo, int used,
drm_clip_rect_t *cliprects, int num_cliprects,
int DR4)
drm_bacon_bo_exec(drm_bacon_bo *bo, int used)
{
return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4,
-1, NULL, I915_EXEC_RENDER);
return do_exec2(bo, used, NULL, -1, NULL, I915_EXEC_RENDER);
}
int
drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used,
drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
unsigned int flags)
drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used, unsigned int flags)
{
return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4,
-1, NULL, flags);
return do_exec2(bo, used, NULL, -1, NULL, flags);
}
int
drm_bacon_gem_bo_context_exec(drm_bacon_bo *bo, drm_bacon_context *ctx,
int used, unsigned int flags)
{
return do_exec2(bo, used, ctx, NULL, 0, 0, -1, NULL, flags);
return do_exec2(bo, used, ctx, -1, NULL, flags);
}
int
@ -2140,7 +2133,7 @@ drm_bacon_gem_bo_fence_exec(drm_bacon_bo *bo,
int *out_fence,
unsigned int flags)
{
return do_exec2(bo, used, ctx, NULL, 0, 0, in_fence, out_fence, flags);
return do_exec2(bo, used, ctx, in_fence, out_fence, flags);
}
static int

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

@ -1411,7 +1411,6 @@ intel_detect_pipelined_register(struct intel_screen *screen,
*batch++ = MI_BATCH_BUFFER_END;
drm_bacon_bo_mrb_exec(bo, ALIGN((char *)batch - (char *)bo->virtual, 8),
NULL, 0, 0,
I915_EXEC_RENDER);
/* Check whether the value got written. */