Skip to content

Commit

Permalink
drm/i915: Remove 'retire' parameter from intel_fb_obj_flush
Browse files Browse the repository at this point in the history 
Setting retire=true is identical to using origin=ORIGIN_CS, so make the
same simplification to intel_fb_obj_flush() as already employed for
intel_fb_obj_invalidate().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170222114049.28456-6-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Feb 22, 2017
1 parent 57822dc commit d59b21e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
12 changes: 6 additions & 6 deletions drivers/gpu/drm/i915/i915_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,
drm_clflush_virt_range(vaddr, args->size);
i915_gem_chipset_flush(to_i915(obj->base.dev));

intel_fb_obj_flush(obj, false, ORIGIN_CPU);
intel_fb_obj_flush(obj, ORIGIN_CPU);
return 0;
}

Expand Down Expand Up @@ -1275,7 +1275,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj,
user_data += page_length;
offset += page_length;
}
intel_fb_obj_flush(obj, false, ORIGIN_CPU);
intel_fb_obj_flush(obj, ORIGIN_CPU);

mutex_lock(&i915->drm.struct_mutex);
out_unpin:
Expand Down Expand Up @@ -1411,7 +1411,7 @@ i915_gem_shmem_pwrite(struct drm_i915_gem_object *obj,
offset = 0;
}

intel_fb_obj_flush(obj, false, ORIGIN_CPU);
intel_fb_obj_flush(obj, ORIGIN_CPU);
i915_gem_obj_finish_shmem_access(obj);
return ret;
}
Expand Down Expand Up @@ -3162,7 +3162,7 @@ i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj)
if (INTEL_GEN(dev_priv) >= 6 && !HAS_LLC(dev_priv))
POSTING_READ(RING_ACTHD(dev_priv->engine[RCS]->mmio_base));

intel_fb_obj_flush(obj, false, write_origin(obj, I915_GEM_DOMAIN_GTT));
intel_fb_obj_flush(obj, write_origin(obj, I915_GEM_DOMAIN_GTT));

obj->base.write_domain = 0;
}
Expand Down Expand Up @@ -3552,7 +3552,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,

/* Treat this as an end-of-frame, like intel_user_framebuffer_dirty() */
__i915_gem_object_flush_for_display(obj);
intel_fb_obj_flush(obj, false, ORIGIN_DIRTYFB);
intel_fb_obj_flush(obj, ORIGIN_DIRTYFB);

/* It should now be out of any other write domains, and we can update
* the domain values for our changes.
Expand Down Expand Up @@ -3953,7 +3953,7 @@ frontbuffer_retire(struct i915_gem_active *active,
struct drm_i915_gem_object *obj =
container_of(active, typeof(*obj), frontbuffer_write);

intel_fb_obj_flush(obj, true, ORIGIN_CS);
intel_fb_obj_flush(obj, ORIGIN_CS);
}

void i915_gem_object_init(struct drm_i915_gem_object *obj,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_gem_clflush.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static void __i915_do_clflush(struct drm_i915_gem_object *obj)
drm_clflush_sg(obj->mm.pages);
obj->cache_dirty = false;

intel_fb_obj_flush(obj, false, ORIGIN_CPU);
intel_fb_obj_flush(obj, ORIGIN_CPU);
}

static void i915_clflush_work(struct work_struct *work)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14285,7 +14285,7 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb,
struct drm_i915_gem_object *obj = intel_fb_obj(fb);

i915_gem_object_flush_if_display(obj);
intel_fb_obj_flush(obj, false, ORIGIN_DIRTYFB);
intel_fb_obj_flush(obj, ORIGIN_DIRTYFB);

return 0;
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/intel_frontbuffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,12 @@ static void intel_frontbuffer_flush(struct drm_i915_private *dev_priv,
}

void __intel_fb_obj_flush(struct drm_i915_gem_object *obj,
bool retire,
enum fb_op_origin origin,
unsigned int frontbuffer_bits)
{
struct drm_i915_private *dev_priv = to_i915(obj->base.dev);

if (retire) {
if (origin == ORIGIN_CS) {
spin_lock(&dev_priv->fb_tracking.lock);
/* Filter out new bits since rendering started. */
frontbuffer_bits &= dev_priv->fb_tracking.busy_bits;
Expand Down
8 changes: 2 additions & 6 deletions drivers/gpu/drm/i915/intel_frontbuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ void __intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
enum fb_op_origin origin,
unsigned int frontbuffer_bits);
void __intel_fb_obj_flush(struct drm_i915_gem_object *obj,
bool retire,
enum fb_op_origin origin,
unsigned int frontbuffer_bits);

Expand Down Expand Up @@ -69,15 +68,12 @@ static inline bool intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
/**
* intel_fb_obj_flush - flush frontbuffer object
* @obj: GEM object to flush
* @retire: set when retiring asynchronous rendering
* @origin: which operation caused the flush
*
* This function gets called every time rendering on the given object has
* completed and frontbuffer caching can be started again. If @retire is true
* then any delayed flushes will be unblocked.
* completed and frontbuffer caching can be started again.
*/
static inline void intel_fb_obj_flush(struct drm_i915_gem_object *obj,
bool retire,
enum fb_op_origin origin)
{
unsigned int frontbuffer_bits;
Expand All @@ -86,7 +82,7 @@ static inline void intel_fb_obj_flush(struct drm_i915_gem_object *obj,
if (!frontbuffer_bits)
return;

__intel_fb_obj_flush(obj, retire, origin, frontbuffer_bits);
__intel_fb_obj_flush(obj, origin, frontbuffer_bits);
}

#endif /* __INTEL_FRONTBUFFER_H__ */

0 comments on commit d59b21e

Please sign in to comment.