drm/i915: Reorganize display pipe register accesses
Subsystems (2)
PATCH v5 1/1 drm/i915: Reorganize display pipe register accesses
RFCv2: Reorganize array indexing so that full offsets can be used as is. It makes grepping for registers in i915_reg.h much easier. Also move offset arrays to intel_device_info.
v1: Fixed offsets for VLV, proper eDP handling
v2: Fixed BCLRPAT, PIPESRC, PIPECONF and DSP* macros.
v3: Added EDP pipe comment, removed redundant offset arrays for
MSA_MISC and DDI_FUNC_CTL.
v4: Rename patch and report object size increase.
v5: Change location of commas, add PIPE_EDP into enum pipe
Upcoming hardware will not have the various display pipe register ranges evenly spaced in memory. Change register address calculations into array lookups.
Tested on SNB, VLV, IVB and HSW w/eDP.
I left the UMS cruft untouched.
Size differences:
text data bss dec hex filename 598431 4342 56 602829 932cd i915.ko (old) 601727 4342 56 606125 93fad i915.ko (new)
--- drivers/gpu/drm/i915/i915_drv.c | 37 +++++++ drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_reg.h | 235 +++++++++++++++++++++++----------------- 3 files changed, 181 insertions(+), 101 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +37 -0
@@ -154,16 +154,28 @@ MODULE_PARM_DESC(prefault_disable,static struct drm_driver driver; +#define GEN_DEFAULT_PIPEOFFSETS \ + .pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, PIPE_C_OFFSET }, \ + .trans_offsets = { TRANSCODER_A_OFFSET, TRANSCODER_B_OFFSET, \ + TRANSCODER_C_OFFSET, \ + TRANSCODER_EDP_OFFSET }, \ + .dpll_offsets = { DPLL_A_OFFSET, DPLL_B_OFFSET }, \ + .dpll_md_offsets = { DPLL_A_MD_OFFSET, DPLL_B_MD_OFFSET }, \ + .palette_offsets = { PALETTE_A_OFFSET, PALETTE_B_OFFSET } + +static const struct intel_device_info intel_i830_info = { .gen =2 , .is_mobile =1 , .cursor_needs_physical =1 , .num_pipes =2 , .has_overlay =1 , .overlay_needs_physical =1 , .ring_mask =RENDER_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_845g_info = { .gen =2 , .num_pipes =1 , .has_overlay =1 , .overlay_needs_physical =1 , .ring_mask =RENDER_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_i85x_info = {
@@ -172,18 +184,21 @@ static const struct intel_device_info intel_i85x_info = { .has_overlay = 1, .overlay_needs_physical = 1, .has_fbc = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_i865g_info = { .gen =2 , .num_pipes =1 , .has_overlay =1 , .overlay_needs_physical =1 , .ring_mask =RENDER_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_i915g_info = { .gen =3 , .is_i915g =1 , .cursor_needs_physical =1 , .num_pipes =2 , .has_overlay =1 , .overlay_needs_physical =1 , .ring_mask =RENDER_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_i915gm_info = { .gen =3 , .is_mobile =1 , .num_pipes =2 ,
@@ -192,11 +207,13 @@ static const struct intel_device_info intel_i915gm_info = { .supports_tv = 1, .has_fbc = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_i945g_info = { .gen =3 , .has_hotplug =1 , .cursor_needs_physical =1 , .num_pipes =2 , .has_overlay =1 , .overlay_needs_physical =1 , .ring_mask =RENDER_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_i945gm_info = { .gen =3 , .is_i945gm =1 , .is_mobile =1 , .num_pipes =2 ,
@@ -205,6 +222,7 @@ static const struct intel_device_info intel_i945gm_info = { .supports_tv = 1, .has_fbc = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_i965g_info = {
@@ -212,6 +230,7 @@ static const struct intel_device_info intel_i965g_info = { .has_hotplug = 1, .has_overlay = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_i965gm_info = {
@@ -220,6 +239,7 @@ static const struct intel_device_info intel_i965gm_info = { .has_overlay = 1, .supports_tv = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_g33_info = {
@@ -227,12 +247,14 @@ static const struct intel_device_info intel_g33_info = { .need_gfx_hws = 1, .has_hotplug = 1, .has_overlay = 1, .ring_mask = RENDER_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_g45_info = { .gen =4 , .is_g4x =1 , .need_gfx_hws =1 , .num_pipes =2 , .has_pipe_cxsr =1 , .has_hotplug =1 , .ring_mask =RENDER_RING |BSD_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_gm45_info = {
@@ -241,18 +263,21 @@ static const struct intel_device_info intel_gm45_info = { .has_pipe_cxsr = 1, .has_hotplug = 1, .supports_tv = 1, .ring_mask = RENDER_RING | BSD_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_pineview_info = { .gen =3 , .is_g33 =1 , .is_pineview =1 , .is_mobile =1 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , .has_overlay =1 , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_ironlake_d_info = { .gen =5 , .num_pipes =2 , .need_gfx_hws =1 , .has_hotplug =1 , .ring_mask =RENDER_RING |BSD_RING , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_ironlake_m_info = {
@@ -260,6 +285,7 @@ static const struct intel_device_info intel_ironlake_m_info = { .need_gfx_hws = 1, .has_hotplug = 1, .has_fbc = 1, .ring_mask = RENDER_RING | BSD_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_sandybridge_d_info = {
@@ -268,6 +294,7 @@ static const struct intel_device_info intel_sandybridge_d_info = { .has_fbc = 1, .ring_mask = RENDER_RING | BSD_RING | BLT_RING, .has_llc = 1, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_sandybridge_m_info = {
@@ -276,6 +303,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { .has_fbc = 1, .ring_mask = RENDER_RING | BSD_RING | BLT_RING, .has_llc = 1, + GEN_DEFAULT_PIPEOFFSETS, };#define GEN7_FEATURES \
@@ -288,18 +316,21 @@ static const struct intel_device_info intel_sandybridge_m_info = {static const struct intel_device_info intel_ivybridge_d_info = {GEN7_FEATURES , .is_ivybridge =1 , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_ivybridge_m_info = {GEN7_FEATURES , .is_ivybridge =1 , .is_mobile =1 , +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_ivybridge_q_info = {GEN7_FEATURES , .is_ivybridge =1 , .num_pipes =0 ,/* legal, last one wins */ +GEN_DEFAULT_PIPEOFFSETS , };static const struct intel_device_info intel_valleyview_m_info = {
@@ -310,6 +341,7 @@ static const struct intel_device_info intel_valleyview_m_info = { .display_mmio_offset = VLV_DISPLAY_BASE, .has_fbc = 0, /* legal, last one wins */ .has_llc = 0, /* legal, last one wins */ + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_valleyview_d_info = {
@@ -319,6 +351,7 @@ static const struct intel_device_info intel_valleyview_d_info = { .display_mmio_offset = VLV_DISPLAY_BASE, .has_fbc = 0, /* legal, last one wins */ .has_llc = 0, /* legal, last one wins */ + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_haswell_d_info = {
@@ -327,6 +360,7 @@ static const struct intel_device_info intel_haswell_d_info = { .has_ddi = 1, .has_fpga_dbg = 1, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_haswell_m_info = {
@@ -336,6 +370,7 @@ static const struct intel_device_info intel_haswell_m_info = { .has_ddi = 1, .has_fpga_dbg = 1, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_broadwell_d_info = {
@@ -344,6 +379,7 @@ static const struct intel_device_info intel_broadwell_d_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + GEN_DEFAULT_PIPEOFFSETS, };static const struct intel_device_info intel_broadwell_m_info = {
@@ -352,6 +388,7 @@ static const struct intel_device_info intel_broadwell_m_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + GEN_DEFAULT_PIPEOFFSETS, };/*
drivers/gpu/drm/i915/i915_drv.h +9 -1
@@ -58,6 +58,7 @@ enum pipe {PIPE_A =0 ,PIPE_B ,PIPE_C , +PIPE_EDP , I915_MAX_PIPES };#define pipe_name (p) ((p) + 'A')
@@ -66,7 +67,8 @@ enum transcoder {TRANSCODER_A =0 ,TRANSCODER_B ,TRANSCODER_C , - TRANSCODER_EDP = 0xF, +TRANSCODER_EDP , + I915_MAX_TRANSCODERS };#define transcoder_name (t) ((t) + 'A')
@@ -506,6 +508,12 @@ struct intel_device_info {u8 gen;u8 ring_mask;/* Rings supported by the HW */ DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON ); +/* Register offsets for the various display pipes and transcoders */ +int pipe_offsets[I915_MAX_PIPES ]; +int trans_offsets[I915_MAX_TRANSCODERS ]; +int dpll_offsets[I915_MAX_PIPES ]; +int dpll_md_offsets[I915_MAX_PIPES ]; +int palette_offsets[I915_MAX_PIPES ]; };#undef DEFINE_FLAG
drivers/gpu/drm/i915/i915_reg.h +135 -100
348 lines not on this page · raw message
Signature · 1 line
1.8.1.5