evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Remove unused ring->setup_seqno

Browse source 
As we now no longer track a pipelined fence change, we never use
ring->setup_seqno and can kill it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2012-04-17 15:31:26 +01:00 • committed by Daniel Vetter
parent a360bb1a83
commit 69963e7c76
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_drv.h
View file

@ -146,7 +146,6 @@ struct drm_i915_master_private {
struct drm_i915_fence_reg { struct drm_i915_fence_reg {
struct list_head lru_list; struct list_head lru_list;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
uint32_t setup_seqno;
int pin_count; int pin_count;
}; };

17
drivers/gpu/drm/i915/i915_gem.c
View file

@ -2432,19 +2432,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
goto update; goto update;
} }
if (reg->setup_seqno) {
if (!ring_passed_seqno(obj->last_fenced_ring,
reg->setup_seqno)) {
ret = i915_wait_request(obj->last_fenced_ring,
reg->setup_seqno,
true);
if (ret)
return ret;
}
reg->setup_seqno = 0;
}
return 0; return 0;
} }
@ -2482,9 +2469,6 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
obj->fence_reg = reg - dev_priv->fence_regs; obj->fence_reg = reg - dev_priv->fence_regs;
obj->last_fenced_ring = NULL; obj->last_fenced_ring = NULL;
reg->setup_seqno = 0;
obj->last_fenced_seqno = reg->setup_seqno;
update: update:
obj->tiling_changed = false; obj->tiling_changed = false;
switch (INTEL_INFO(dev)->gen) { switch (INTEL_INFO(dev)->gen) {
@ -2543,7 +2527,6 @@ i915_gem_clear_fence_reg(struct drm_device *dev,
list_del_init(&reg->lru_list); list_del_init(&reg->lru_list);
reg->obj = NULL; reg->obj = NULL;
reg->setup_seqno = 0;
reg->pin_count = 0; reg->pin_count = 0;
} }