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

Commit a9db5c8f authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

drm/i915: drop alignment ringbuffer parameter 



Always PAGE_SIZE and only complicates the code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent fa7ed4d2

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −4
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ int intel_init_ring_buffer(struct drm_device *dev, 


	ring->gem_object = obj;



	ret = i915_gem_object_pin(obj, ring->alignment);

	ret = i915_gem_object_pin(obj, PAGE_SIZE);

	if (ret)

		goto err_unref;
@@ -767,7 +767,6 @@ static const struct intel_ring_buffer render_ring = { 
	.id			= RING_RENDER,

	.mmio_base		= RENDER_RING_BASE,

	.size			= 32 * PAGE_SIZE,

	.alignment		= PAGE_SIZE,

	.setup_status_page	= render_setup_status_page,

	.init			= init_render_ring,

	.set_tail		= ring_set_tail,
@@ -787,7 +786,6 @@ static const struct intel_ring_buffer bsd_ring = { 
	.id			= RING_BSD,

	.mmio_base		= BSD_RING_BASE,

	.size			= 32 * PAGE_SIZE,

	.alignment		= PAGE_SIZE,

	.setup_status_page	= bsd_setup_status_page,

	.init			= init_bsd_ring,

	.set_tail		= ring_set_tail,
@@ -874,7 +872,6 @@ static const struct intel_ring_buffer gen6_bsd_ring = { 
       .id			= RING_BSD,

       .mmio_base		= GEN6_BSD_RING_BASE,

       .size			= 32 * PAGE_SIZE,

       .alignment		= PAGE_SIZE,

       .setup_status_page	= gen6_bsd_setup_status_page,

       .init			= init_bsd_ring,

       .set_tail		= gen6_bsd_ring_set_tail,

drivers/gpu/drm/i915/intel_ringbuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ struct intel_ring_buffer { 
	} id;

	u32		mmio_base;

	unsigned long	size;

	unsigned int	alignment;

	void		*virtual_start;

	struct		drm_device *dev;

	struct		drm_gem_object *gem_object;