Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Give names to more ring registers

Browse Source 
The logical render context population has a bunch of raw ring register
offsets. Use the names we have for them, and in cases where we we don't,
give them names.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446672017-24497-23-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Ville Syrjälä 2015-11-04 23:20:10 +02:00
parent 9244a81701
commit 35dc3f97a6
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_reg.h
View File

@ -1653,8 +1653,16 @@ enum skl_disp_power_wells {
#define HWSTAM 0x02098 #define HWSTAM 0x02098
#define DMA_FADD_I8XX 0x020d0 #define DMA_FADD_I8XX 0x020d0
#define RING_BBSTATE(base) ((base)+0x110) #define RING_BBSTATE(base) ((base)+0x110)
#define RING_BB_PPGTT (1 << 5)
#define RING_SBBADDR(base) ((base)+0x114) /* hsw+ */
#define RING_SBBSTATE(base) ((base)+0x118) /* hsw+ */
#define RING_SBBADDR_UDW(base) ((base)+0x11c) /* gen8+ */
#define RING_BBADDR(base) ((base)+0x140) #define RING_BBADDR(base) ((base)+0x140)
#define RING_BBADDR_UDW(base) ((base)+0x168) /* gen8+ */ #define RING_BBADDR_UDW(base) ((base)+0x168) /* gen8+ */
#define RING_BB_PER_CTX_PTR(base) ((base)+0x1c0) /* gen8+ */
#define RING_INDIRECT_CTX(base) ((base)+0x1c4) /* gen8+ */
#define RING_INDIRECT_CTX_OFFSET(base) ((base)+0x1c8) /* gen8+ */
#define RING_CTX_TIMESTAMP(base) ((base)+0x3a8) /* gen8+ */
#define ERROR_GEN6 0x040a0 #define ERROR_GEN6 0x040a0
#define GEN7_ERR_INT 0x44040 #define GEN7_ERR_INT 0x44040

22
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -2261,24 +2261,24 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o
reg_state[CTX_RING_BUFFER_CONTROL] = RING_CTL(ring->mmio_base); reg_state[CTX_RING_BUFFER_CONTROL] = RING_CTL(ring->mmio_base);
reg_state[CTX_RING_BUFFER_CONTROL+1] = reg_state[CTX_RING_BUFFER_CONTROL+1] =
((ringbuf->size - PAGE_SIZE) & RING_NR_PAGES) | RING_VALID; ((ringbuf->size - PAGE_SIZE) & RING_NR_PAGES) | RING_VALID;
reg_state[CTX_BB_HEAD_U] = ring->mmio_base + 0x168; reg_state[CTX_BB_HEAD_U] = RING_BBADDR_UDW(ring->mmio_base);
reg_state[CTX_BB_HEAD_U+1] = 0; reg_state[CTX_BB_HEAD_U+1] = 0;
reg_state[CTX_BB_HEAD_L] = ring->mmio_base + 0x140; reg_state[CTX_BB_HEAD_L] = RING_BBADDR(ring->mmio_base);
reg_state[CTX_BB_HEAD_L+1] = 0; reg_state[CTX_BB_HEAD_L+1] = 0;
reg_state[CTX_BB_STATE] = ring->mmio_base + 0x110; reg_state[CTX_BB_STATE] = RING_BBSTATE(ring->mmio_base);
reg_state[CTX_BB_STATE+1] = (1<<5); reg_state[CTX_BB_STATE+1] = RING_BB_PPGTT;
reg_state[CTX_SECOND_BB_HEAD_U] = ring->mmio_base + 0x11c; reg_state[CTX_SECOND_BB_HEAD_U] = RING_SBBADDR_UDW(ring->mmio_base);
reg_state[CTX_SECOND_BB_HEAD_U+1] = 0; reg_state[CTX_SECOND_BB_HEAD_U+1] = 0;
reg_state[CTX_SECOND_BB_HEAD_L] = ring->mmio_base + 0x114; reg_state[CTX_SECOND_BB_HEAD_L] = RING_SBBADDR(ring->mmio_base);
reg_state[CTX_SECOND_BB_HEAD_L+1] = 0; reg_state[CTX_SECOND_BB_HEAD_L+1] = 0;
reg_state[CTX_SECOND_BB_STATE] = ring->mmio_base + 0x118; reg_state[CTX_SECOND_BB_STATE] = RING_SBBSTATE(ring->mmio_base);
reg_state[CTX_SECOND_BB_STATE+1] = 0; reg_state[CTX_SECOND_BB_STATE+1] = 0;
if (ring->id == RCS) { if (ring->id == RCS) {
reg_state[CTX_BB_PER_CTX_PTR] = ring->mmio_base + 0x1c0; reg_state[CTX_BB_PER_CTX_PTR] = RING_BB_PER_CTX_PTR(ring->mmio_base);
reg_state[CTX_BB_PER_CTX_PTR+1] = 0; reg_state[CTX_BB_PER_CTX_PTR+1] = 0;
reg_state[CTX_RCS_INDIRECT_CTX] = ring->mmio_base + 0x1c4; reg_state[CTX_RCS_INDIRECT_CTX] = RING_INDIRECT_CTX(ring->mmio_base);
reg_state[CTX_RCS_INDIRECT_CTX+1] = 0; reg_state[CTX_RCS_INDIRECT_CTX+1] = 0;
reg_state[CTX_RCS_INDIRECT_CTX_OFFSET] = ring->mmio_base + 0x1c8; reg_state[CTX_RCS_INDIRECT_CTX_OFFSET] = RING_INDIRECT_CTX_OFFSET(ring->mmio_base);
reg_state[CTX_RCS_INDIRECT_CTX_OFFSET+1] = 0; reg_state[CTX_RCS_INDIRECT_CTX_OFFSET+1] = 0;
if (ring->wa_ctx.obj) { if (ring->wa_ctx.obj) {
struct i915_ctx_workarounds *wa_ctx = &ring->wa_ctx; struct i915_ctx_workarounds *wa_ctx = &ring->wa_ctx;
@ -2298,7 +2298,7 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o
} }
reg_state[CTX_LRI_HEADER_1] = MI_LOAD_REGISTER_IMM(9); reg_state[CTX_LRI_HEADER_1] = MI_LOAD_REGISTER_IMM(9);
reg_state[CTX_LRI_HEADER_1] |= MI_LRI_FORCE_POSTED; reg_state[CTX_LRI_HEADER_1] |= MI_LRI_FORCE_POSTED;
reg_state[CTX_CTX_TIMESTAMP] = ring->mmio_base + 0x3a8; reg_state[CTX_CTX_TIMESTAMP] = RING_CTX_TIMESTAMP(ring->mmio_base);
reg_state[CTX_CTX_TIMESTAMP+1] = 0; reg_state[CTX_CTX_TIMESTAMP+1] = 0;
reg_state[CTX_PDP3_UDW] = GEN8_RING_PDP_UDW(ring, 3); reg_state[CTX_PDP3_UDW] = GEN8_RING_PDP_UDW(ring, 3);
reg_state[CTX_PDP3_LDW] = GEN8_RING_PDP_LDW(ring, 3); reg_state[CTX_PDP3_LDW] = GEN8_RING_PDP_LDW(ring, 3);