leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: use new macros to access the ring ctl register

Browse Source 
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:06:59 +02:00 committed by Chris Wilson
parent 570ef60859
commit 7f2ab69913
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ static int init_ring_common(struct drm_device *dev,
obj_priv = to_intel_bo(ring->gem_object); obj_priv = to_intel_bo(ring->gem_object);
/* Stop the ring if it's running. */ /* Stop the ring if it's running. */
I915_WRITE(ring->regs.ctl, 0); I915_WRITE_CTL(ring, 0);
I915_WRITE_HEAD(ring, 0); I915_WRITE_HEAD(ring, 0);
ring->set_tail(dev, ring, 0); ring->set_tail(dev, ring, 0);
@ -158,7 +158,7 @@ static int init_ring_common(struct drm_device *dev,
DRM_ERROR("%s head not reset to zero " DRM_ERROR("%s head not reset to zero "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x head %08x tail %08x start %08x\n",
ring->name, ring->name,
I915_READ(ring->regs.ctl), I915_READ_CTL(ring),
I915_READ_HEAD(ring), I915_READ_HEAD(ring),
I915_READ_TAIL(ring), I915_READ_TAIL(ring),
I915_READ_START(ring)); I915_READ_START(ring));
@ -168,13 +168,13 @@ static int init_ring_common(struct drm_device *dev,
DRM_ERROR("%s head forced to zero " DRM_ERROR("%s head forced to zero "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x head %08x tail %08x start %08x\n",
ring->name, ring->name,
I915_READ(ring->regs.ctl), I915_READ_CTL(ring),
I915_READ_HEAD(ring), I915_READ_HEAD(ring),
I915_READ_TAIL(ring), I915_READ_TAIL(ring),
I915_READ_START(ring)); I915_READ_START(ring));
} }
I915_WRITE(ring->regs.ctl, I915_WRITE_CTL(ring,
((ring->gem_object->size - PAGE_SIZE) & RING_NR_PAGES) ((ring->gem_object->size - PAGE_SIZE) & RING_NR_PAGES)
| RING_NO_REPORT | RING_VALID); | RING_NO_REPORT | RING_VALID);
@ -184,7 +184,7 @@ static int init_ring_common(struct drm_device *dev,
DRM_ERROR("%s initialization failed " DRM_ERROR("%s initialization failed "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x head %08x tail %08x start %08x\n",
ring->name, ring->name,
I915_READ(ring->regs.ctl), I915_READ_CTL(ring),
I915_READ_HEAD(ring), I915_READ_HEAD(ring),
I915_READ_TAIL(ring), I915_READ_TAIL(ring),
I915_READ_START(ring)); I915_READ_START(ring));
@ -765,9 +765,6 @@ void intel_fill_struct(struct drm_device *dev,
static const struct intel_ring_buffer render_ring = { static const struct intel_ring_buffer render_ring = {
.name = "render ring", .name = "render ring",
.id = RING_RENDER, .id = RING_RENDER,
.regs = {
.ctl = PRB0_CTL,
},
.mmio_base = RENDER_RING_BASE, .mmio_base = RENDER_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE, .alignment = PAGE_SIZE,
@ -799,9 +796,6 @@ static const struct intel_ring_buffer render_ring = {
static const struct intel_ring_buffer bsd_ring = { static const struct intel_ring_buffer bsd_ring = {
.name = "bsd ring", .name = "bsd ring",
.id = RING_BSD, .id = RING_BSD,
.regs = {
.ctl = BSD_RING_CTL,
},
.mmio_base = BSD_RING_BASE, .mmio_base = BSD_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE, .alignment = PAGE_SIZE,
@ -900,9 +894,6 @@ gen6_bsd_ring_dispatch_gem_execbuffer(struct drm_device *dev,
static const struct intel_ring_buffer gen6_bsd_ring = { static const struct intel_ring_buffer gen6_bsd_ring = {
.name = "gen6 bsd ring", .name = "gen6 bsd ring",
.id = RING_BSD, .id = RING_BSD,
.regs = {
.ctl = GEN6_BSD_RING_CTL,
},
.mmio_base = GEN6_BSD_RING_BASE, .mmio_base = GEN6_BSD_RING_BASE,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE, .alignment = PAGE_SIZE,

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

@ -13,6 +13,8 @@ struct intel_hw_status_page {
#define I915_WRITE_START(ring, val) I915_WRITE(RING_START(ring->mmio_base), val) #define I915_WRITE_START(ring, val) I915_WRITE(RING_START(ring->mmio_base), val)
#define I915_READ_HEAD(ring) I915_READ(RING_HEAD(ring->mmio_base)) #define I915_READ_HEAD(ring) I915_READ(RING_HEAD(ring->mmio_base))
#define I915_WRITE_HEAD(ring, val) I915_WRITE(RING_HEAD(ring->mmio_base), val) #define I915_WRITE_HEAD(ring, val) I915_WRITE(RING_HEAD(ring->mmio_base), val)
#define I915_READ_CTL(ring) I915_READ(RING_CTL(ring->mmio_base))
#define I915_WRITE_CTL(ring, val) I915_WRITE(RING_CTL(ring->mmio_base), val)
struct drm_i915_gem_execbuffer2; struct drm_i915_gem_execbuffer2;
struct intel_ring_buffer { struct intel_ring_buffer {
@ -21,9 +23,6 @@ struct intel_ring_buffer {
RING_RENDER = 0x1, RING_RENDER = 0x1,
RING_BSD = 0x2, RING_BSD = 0x2,
} id; } id;
struct ring_regs {
u32 ctl;
} regs;
u32 mmio_base; u32 mmio_base;
unsigned long size; unsigned long size;
unsigned int alignment; unsigned int alignment;