Identify 3 possible cases in which the index numbers can be different
from the "port" and add them to the description-based ddi initialization
table. This can be used in place of additional functions mapping from
one to the other. Right now we already cover part of this by creating kind of
virtual phy numbering, but that comes with downsides:
a) there's not really a "phy numbering" in the spec, this is purely a
software thing; hardware uses whatever they want thinking mapping from
one to the other arbitrarily is easy in software.
b) currently the mapping occurs on "leaf" functions, making the decision
based on the platform for each of those functions
With this new table the approach will be: the port, as defined by the
enum port, is merely a driver convention and won't be used anymore to
define the register offset or register bits. For that we have the other
3 indexes, identified as being possibly different from the current usage
of register bits: ddi, vbt and phy. The phy type is also added here,
meant to replace the checks for combo vs tc.
v2: Rebase and add RKL
Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
---
drivers/gpu/drm/i915/display/intel_display.c | 64 ++++++++++---------
drivers/gpu/drm/i915/display/intel_display.h | 8 +++
.../drm/i915/display/intel_display_types.h | 4 ++
3 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index c234b50212b0..d591063502c5 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -16806,57 +16806,59 @@ static void intel_pps_init(struct drm_i915_private *dev_priv)
}
static const struct intel_ddi_port_info rkl_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI TC1", .port = PORT_D },
- { .name = "DDI TC2", .port = PORT_E },
+ { .name = "DDI A", .port = PORT_A, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0, },
+ { .name = "DDI B", .port = PORT_B, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1, },
+ /* TODO: use continguous namespace for port once driver is converted */
+ { .name = "DDI C", .port = PORT_D, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x3, .phy_idx = 0x2, .vbt_idx = 0x2, },
+ { .name = "DDI D", .port = PORT_E, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x4, .phy_idx = 0x3, .vbt_idx = 0x3, },
{ .port = PORT_NONE }
};
static const struct intel_ddi_port_info tgl_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI TC1", .port = PORT_D },
- { .name = "DDI TC2", .port = PORT_E },
- { .name = "DDI TC3", .port = PORT_F },
- { .name = "DDI TC4", .port = PORT_G },
- { .name = "DDI TC5", .port = PORT_H },
- { .name = "DDI TC6", .port = PORT_I },
+ { .name = "DDI A", .port = PORT_A, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0, },
+ { .name = "DDI B", .port = PORT_B, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1, },
+ /* TODO: use continguous namespace for port once driver is converted */
+ { .name = "DDI TC1", .port = PORT_D, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x3, .phy_idx = 0x0, .vbt_idx = 0x2, },
+ { .name = "DDI TC2", .port = PORT_E, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x4, .phy_idx = 0x1, .vbt_idx = 0x3, },
+ { .name = "DDI TC3", .port = PORT_F, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x5, .phy_idx = 0x2, .vbt_idx = 0x4, },
+ { .name = "DDI TC4", .port = PORT_G, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x6, .phy_idx = 0x3, .vbt_idx = 0x5, },
+ { .name = "DDI TC5", .port = PORT_H, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x7, .phy_idx = 0x4, .vbt_idx = 0x6, },
+ { .name = "DDI TC6", .port = PORT_I, .phy_type = PHY_TYPE_DKL, .ddi_idx = 0x8, .phy_idx = 0x5, .vbt_idx = 0x7, },
{ .port = PORT_NONE }
};
static const struct intel_ddi_port_info ehl_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI C", .port = PORT_C },
- { .name = "DDI D", .port = PORT_D },
+ { .name = "DDI A", .port = PORT_A, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0, },
+ { .name = "DDI B", .port = PORT_B, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1, },
+ { .name = "DDI C", .port = PORT_C, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x2, .phy_idx = 0x2, .vbt_idx = 0x2, },
+ { .name = "DDI D", .port = PORT_D, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x3, .phy_idx = 0x0, .vbt_idx = 0x3, },
{ .port = PORT_NONE }
};
static const struct intel_ddi_port_info icl_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI TC1", .port = PORT_C },
- { .name = "DDI TC2", .port = PORT_D },
- { .name = "DDI TC3", .port = PORT_E },
- { .name = "DDI TC4", .port = PORT_F },
+ { .name = "DDI A", .port = PORT_A, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0,},
+ { .name = "DDI B", .port = PORT_B, .phy_type = PHY_TYPE_COMBO, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1,},
+ { .name = "DDI TC1", .port = PORT_C, .phy_type = PHY_TYPE_MG, .ddi_idx = 0x2, .phy_idx = 0x0, .vbt_idx = 0x2,},
+ { .name = "DDI TC2", .port = PORT_D, .phy_type = PHY_TYPE_MG, .ddi_idx = 0x3, .phy_idx = 0x1, .vbt_idx = 0x3,},
+ { .name = "DDI TC3", .port = PORT_E, .phy_type = PHY_TYPE_MG, .ddi_idx = 0x4, .phy_idx = 0x2, .vbt_idx = 0x4,},
+ { .name = "DDI TC4", .port = PORT_F, .phy_type = PHY_TYPE_MG, .ddi_idx = 0x5, .phy_idx = 0x3, .vbt_idx = 0x5,},
{ .port = PORT_NONE }
};
static const struct intel_ddi_port_info gen9lp_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI C", .port = PORT_C },
+ { .name = "DDI A", .port = PORT_A, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0 },
+ { .name = "DDI B", .port = PORT_B, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1 },
+ { .name = "DDI C", .port = PORT_C, .ddi_idx = 0x2, .phy_idx = 0x2, .vbt_idx = 0x2 },
{ .port = PORT_NONE }
};
static const struct intel_ddi_port_info ddi_ports[] = {
- { .name = "DDI A", .port = PORT_A },
- { .name = "DDI B", .port = PORT_B },
- { .name = "DDI C", .port = PORT_C },
- { .name = "DDI D", .port = PORT_D },
- { .name = "DDI E", .port = PORT_E },
- { .name = "DDI F", .port = PORT_F },
+ { .name = "DDI A", .port = PORT_A, .ddi_idx = 0x0, .phy_idx = 0x0, .vbt_idx = 0x0 },
+ { .name = "DDI B", .port = PORT_B, .ddi_idx = 0x1, .phy_idx = 0x1, .vbt_idx = 0x1 },
+ { .name = "DDI C", .port = PORT_C, .ddi_idx = 0x2, .phy_idx = 0x2, .vbt_idx = 0x2 },
+ { .name = "DDI D", .port = PORT_D, .ddi_idx = 0x3, .phy_idx = 0x3, .vbt_idx = 0x3 },
+ { .name = "DDI E", .port = PORT_E, .ddi_idx = 0x4, .phy_idx = 0x4, .vbt_idx = 0x4 },
+ { .name = "DDI F", .port = PORT_F, .ddi_idx = 0x5, .phy_idx = 0x5, .vbt_idx = 0x5 },
{ .port = PORT_NONE }
};
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index b7a6d56bac5f..22c999a54ff1 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -311,6 +311,14 @@ enum phy {
I915_MAX_PHYS
};
+enum phy_type {
+ PHY_TYPE_NONE = 0,
+
+ PHY_TYPE_COMBO,
+ PHY_TYPE_MG,
+ PHY_TYPE_DKL,
+};
+
#define phy_name(a) ((a) + 'A')
enum phy_fia {
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 92cc7fc66bce..df587219c744 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1436,6 +1436,10 @@ struct intel_dp_mst_encoder {
struct intel_ddi_port_info {
const char *name;
enum port port;
+ s8 phy_type;
+ u8 ddi_idx;
+ u8 phy_idx;
+ u8 vbt_idx;
};
static inline enum dpio_channel
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
