Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8a1337 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Consolidate init_hw vfunc 



Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 604096d7

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −4
Original line number Diff line number Diff line
@@ -2887,6 +2887,7 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req, 
static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,

				      struct intel_engine_cs *engine)

{

	engine->init_hw = init_ring_common;

	engine->write_tail = ring_write_tail;

	engine->get_seqno = ring_get_seqno;

	engine->set_seqno = ring_set_seqno;
@@ -3105,7 +3106,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) 
		}

		engine->dispatch_execbuffer = i965_dispatch_execbuffer;

	}

	engine->init_hw = init_ring_common;



	return intel_init_ring_buffer(dev, engine);

}
@@ -3136,7 +3136,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) 
		engine->semaphore.signal = gen8_xcs_signal;

		GEN8_RING_SEMAPHORE_INIT(engine);

	}

	engine->init_hw = init_ring_common;



	return intel_init_ring_buffer(dev, engine);

}
@@ -3189,7 +3188,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) 
			engine->semaphore.mbox.signal[VCS2] = GEN6_NOSYNC;

		}

	}

	engine->init_hw = init_ring_common;



	return intel_init_ring_buffer(dev, engine);

}
@@ -3238,7 +3236,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) 
			engine->semaphore.mbox.signal[VCS2] = GEN6_NOSYNC;

		}

	}

	engine->init_hw = init_ring_common;



	return intel_init_ring_buffer(dev, engine);

}