Commit 3cbdb975 authored by Matt Roper's avatar Matt Roper

drm/i915/tgl: TBT AUX should use TC power well ops

As on ICL, we want to use the Type-C aux handlers for the TBT aux wells
to ensure the DP_AUX_CH_CTL_TBT_IO flag is set properly.

Fixes: 656409bb ("drm/i915/tgl: Add power well support")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415233435.3064257-1-matthew.d.roper@intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent cef622d7
...@@ -4147,7 +4147,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4147,7 +4147,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX D TBT1", .name = "AUX D TBT1",
.domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
...@@ -4158,7 +4158,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4158,7 +4158,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX E TBT2", .name = "AUX E TBT2",
.domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
...@@ -4169,7 +4169,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4169,7 +4169,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX F TBT3", .name = "AUX F TBT3",
.domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
...@@ -4180,7 +4180,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4180,7 +4180,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX G TBT4", .name = "AUX G TBT4",
.domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
...@@ -4191,7 +4191,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4191,7 +4191,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX H TBT5", .name = "AUX H TBT5",
.domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
...@@ -4202,7 +4202,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { ...@@ -4202,7 +4202,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
{ {
.name = "AUX I TBT6", .name = "AUX I TBT6",
.domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &icl_tc_phy_aux_power_well_ops,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.regs = &icl_aux_power_well_regs, .hsw.regs = &icl_aux_power_well_regs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment