i915: Drop all has_llc code.
i915 never has llc. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:

committed by
Kenneth Graunke

parent
be63c1c993
commit
d71b7301ec
@@ -40,10 +40,8 @@ intel_batchbuffer_init(struct intel_context *intel)
|
||||
{
|
||||
intel_batchbuffer_reset(intel);
|
||||
|
||||
if (!intel->has_llc) {
|
||||
intel->batch.cpu_map = malloc(intel->maxBatchSize);
|
||||
intel->batch.map = intel->batch.cpu_map;
|
||||
}
|
||||
intel->batch.cpu_map = malloc(intel->maxBatchSize);
|
||||
intel->batch.map = intel->batch.cpu_map;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -57,10 +55,6 @@ intel_batchbuffer_reset(struct intel_context *intel)
|
||||
|
||||
intel->batch.bo = drm_intel_bo_alloc(intel->bufmgr, "batchbuffer",
|
||||
intel->maxBatchSize, 4096);
|
||||
if (intel->has_llc) {
|
||||
drm_intel_bo_map(intel->batch.bo, true);
|
||||
intel->batch.map = intel->batch.bo->virtual;
|
||||
}
|
||||
|
||||
intel->batch.reserved_space = BATCH_RESERVED;
|
||||
intel->batch.state_batch_offset = intel->batch.bo->size;
|
||||
@@ -124,16 +118,12 @@ do_flush_locked(struct intel_context *intel)
|
||||
struct intel_batchbuffer *batch = &intel->batch;
|
||||
int ret = 0;
|
||||
|
||||
if (intel->has_llc) {
|
||||
drm_intel_bo_unmap(batch->bo);
|
||||
} else {
|
||||
ret = drm_intel_bo_subdata(batch->bo, 0, 4*batch->used, batch->map);
|
||||
if (ret == 0 && batch->state_batch_offset != batch->bo->size) {
|
||||
ret = drm_intel_bo_subdata(batch->bo,
|
||||
batch->state_batch_offset,
|
||||
batch->bo->size - batch->state_batch_offset,
|
||||
(char *)batch->map + batch->state_batch_offset);
|
||||
}
|
||||
ret = drm_intel_bo_subdata(batch->bo, 0, 4*batch->used, batch->map);
|
||||
if (ret == 0 && batch->state_batch_offset != batch->bo->size) {
|
||||
ret = drm_intel_bo_subdata(batch->bo,
|
||||
batch->state_batch_offset,
|
||||
batch->bo->size - batch->state_batch_offset,
|
||||
(char *)batch->map + batch->state_batch_offset);
|
||||
}
|
||||
|
||||
if (!intel->intelScreen->no_hw) {
|
||||
|
Reference in New Issue
Block a user