UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: drop alignment ringbuffer parameter 

Always PAGE_SIZE and only complicates the code.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Daniel Vetter 2010-08-02 17:22:48 +02:00 committed by Chris Wilson
parent fa7ed4d206
commit a9db5c8fdd
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -610,7 +610,7 @@ int intel_init_ring_buffer(struct drm_device *dev,
ring->gem_object = obj; ring->gem_object = obj;
ret = i915_gem_object_pin(obj, ring->alignment); ret = i915_gem_object_pin(obj, PAGE_SIZE);
if (ret) if (ret)
goto err_unref; goto err_unref;
@ -767,7 +767,6 @@ static const struct intel_ring_buffer render_ring = {
.id = RING_RENDER, .id = RING_RENDER,
.mmio_base = RENDER_RING_BASE, .mmio_base = RENDER_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE,
.setup_status_page = render_setup_status_page, .setup_status_page = render_setup_status_page,
.init = init_render_ring, .init = init_render_ring,
.set_tail = ring_set_tail, .set_tail = ring_set_tail,
@ -787,7 +786,6 @@ static const struct intel_ring_buffer bsd_ring = {
.id = RING_BSD, .id = RING_BSD,
.mmio_base = BSD_RING_BASE, .mmio_base = BSD_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE,
.setup_status_page = bsd_setup_status_page, .setup_status_page = bsd_setup_status_page,
.init = init_bsd_ring, .init = init_bsd_ring,
.set_tail = ring_set_tail, .set_tail = ring_set_tail,
@ -874,7 +872,6 @@ static const struct intel_ring_buffer gen6_bsd_ring = {
.id = RING_BSD, .id = RING_BSD,
.mmio_base = GEN6_BSD_RING_BASE, .mmio_base = GEN6_BSD_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE,
.setup_status_page = gen6_bsd_setup_status_page, .setup_status_page = gen6_bsd_setup_status_page,
.init = init_bsd_ring, .init = init_bsd_ring,
.set_tail = gen6_bsd_ring_set_tail, .set_tail = gen6_bsd_ring_set_tail,

1
drivers/gpu/drm/i915/intel_ringbuffer.h
View File

@ -25,7 +25,6 @@ struct intel_ring_buffer {
} id; } id;
u32 mmio_base; u32 mmio_base;
unsigned long size; unsigned long size;
unsigned int alignment;
void *virtual_start; void *virtual_start;
struct drm_device *dev; struct drm_device *dev;
struct drm_gem_object *gem_object; struct drm_gem_object *gem_object;