xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/tegra: dp: Track link capabilities alongside settings

Browse Source 
Store capabilities in max_* fields and add separate fields for the
currently selected settings.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding
2015-07-21 16:33:48 +02:00
parent 1abd6b3304
commit c728e2d4a6
4 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/tegra/dp.c
View File

@@ -14,9 +14,12 @@ static void drm_dp_link_reset(struct drm_dp_link *link)
return; return;
link->revision = 0; link->revision = 0;
link->rate = 0; link->max_rate = 0;
link->num_lanes = 0; link->max_lanes = 0;
link->capabilities = 0; link->capabilities = 0;
link->rate = 0;
link->lanes = 0;
} }
/** /**
@@ -42,12 +45,15 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link)
return err; return err;
link->revision = values[0]; link->revision = values[0];
link->rate = drm_dp_bw_code_to_link_rate(values[1]); link->max_rate = drm_dp_bw_code_to_link_rate(values[1]);
link->num_lanes = values[2] & DP_MAX_LANE_COUNT_MASK; link->max_lanes = values[2] & DP_MAX_LANE_COUNT_MASK;
if (values[2] & DP_ENHANCED_FRAME_CAP) if (values[2] & DP_ENHANCED_FRAME_CAP)
link->capabilities |= DP_LINK_CAP_ENHANCED_FRAMING; link->capabilities |= DP_LINK_CAP_ENHANCED_FRAMING;
link->rate = link->max_rate;
link->lanes = link->max_lanes;
return 0; return 0;
} }
@@ -131,7 +137,7 @@ int drm_dp_link_configure(struct drm_dp_aux *aux, struct drm_dp_link *link)
int err; int err;
values[0] = drm_dp_link_rate_to_bw_code(link->rate); values[0] = drm_dp_link_rate_to_bw_code(link->rate);
values[1] = link->num_lanes; values[1] = link->lanes;
if (link->capabilities & DP_LINK_CAP_ENHANCED_FRAMING) if (link->capabilities & DP_LINK_CAP_ENHANCED_FRAMING)
values[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN; values[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;

15
drivers/gpu/drm/tegra/dp.h
View File

@@ -12,17 +12,22 @@ struct drm_dp_aux;
#define DP_LINK_CAP_ENHANCED_FRAMING (1 << 0) #define DP_LINK_CAP_ENHANCED_FRAMING (1 << 0)
/** /**
* struct drm_dp_link - DP link capabilities * struct drm_dp_link - DP link capabilities and configuration
* @revision: DP specification revision supported on the link * @revision: DP specification revision supported on the link
* @rate: maximum clock rate supported on the link * @max_rate: maximum clock rate supported on the link
* @num_lanes: maximum number of lanes supported on the link * @max_lanes: maximum number of lanes supported on the link
* @capabilities: bitmask of capabilities supported on the link * @capabilities: bitmask of capabilities supported on the link
* @rate: currently configured link rate
* @lanes: currently configured number of lanes
*/ */
struct drm_dp_link { struct drm_dp_link {
unsigned char revision; unsigned char revision;
unsigned int rate; unsigned int max_rate;
unsigned int num_lanes; unsigned int max_lanes;
unsigned long capabilities; unsigned long capabilities;
unsigned int rate;
unsigned int lanes;
}; };
int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link); int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link);

8
drivers/gpu/drm/tegra/dpaux.c
View File

@@ -849,14 +849,14 @@ int drm_dp_aux_train(struct drm_dp_aux *aux, struct drm_dp_link *link,
if (tp == DP_TRAINING_PATTERN_DISABLE) if (tp == DP_TRAINING_PATTERN_DISABLE)
return 0; return 0;
for (i = 0; i < link->num_lanes; i++) for (i = 0; i < link->lanes; i++)
values[i] = DP_TRAIN_MAX_PRE_EMPHASIS_REACHED | values[i] = DP_TRAIN_MAX_PRE_EMPHASIS_REACHED |
DP_TRAIN_PRE_EMPH_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0 |
DP_TRAIN_MAX_SWING_REACHED | DP_TRAIN_MAX_SWING_REACHED |
DP_TRAIN_VOLTAGE_SWING_LEVEL_0; DP_TRAIN_VOLTAGE_SWING_LEVEL_0;
err = drm_dp_dpcd_write(aux, DP_TRAINING_LANE0_SET, values, err = drm_dp_dpcd_write(aux, DP_TRAINING_LANE0_SET, values,
link->num_lanes); link->lanes);
if (err < 0) if (err < 0)
return err; return err;
@@ -868,13 +868,13 @@ int drm_dp_aux_train(struct drm_dp_aux *aux, struct drm_dp_link *link,
switch (tp) { switch (tp) {
case DP_TRAINING_PATTERN_1: case DP_TRAINING_PATTERN_1:
if (!drm_dp_clock_recovery_ok(status, link->num_lanes)) if (!drm_dp_clock_recovery_ok(status, link->lanes))
return -EAGAIN; return -EAGAIN;
break; break;
case DP_TRAINING_PATTERN_2: case DP_TRAINING_PATTERN_2:
if (!drm_dp_channel_eq_ok(status, link->num_lanes)) if (!drm_dp_channel_eq_ok(status, link->lanes))
return -EAGAIN; return -EAGAIN;
break; break;

28
drivers/gpu/drm/tegra/sor.c
View File

@@ -650,7 +650,7 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
if (err < 0) if (err < 0)
return err; return err;
for (i = 0, value = 0; i < link->num_lanes; i++) { for (i = 0, value = 0; i < link->lanes; i++) {
unsigned long lane = SOR_DP_TPG_CHANNEL_CODING | unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
SOR_DP_TPG_SCRAMBLER_NONE | SOR_DP_TPG_SCRAMBLER_NONE |
SOR_DP_TPG_PATTERN_TRAIN1; SOR_DP_TPG_PATTERN_TRAIN1;
@@ -671,7 +671,7 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
value |= SOR_DP_SPARE_MACRO_SOR_CLK; value |= SOR_DP_SPARE_MACRO_SOR_CLK;
tegra_sor_writel(sor, value, SOR_DP_SPARE0); tegra_sor_writel(sor, value, SOR_DP_SPARE0);
for (i = 0, value = 0; i < link->num_lanes; i++) { for (i = 0, value = 0; i < link->lanes; i++) {
unsigned long lane = SOR_DP_TPG_CHANNEL_CODING | unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
SOR_DP_TPG_SCRAMBLER_NONE | SOR_DP_TPG_SCRAMBLER_NONE |
SOR_DP_TPG_PATTERN_TRAIN2; SOR_DP_TPG_PATTERN_TRAIN2;
@@ -686,7 +686,7 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
if (err < 0) if (err < 0)
return err; return err;
for (i = 0, value = 0; i < link->num_lanes; i++) { for (i = 0, value = 0; i < link->lanes; i++) {
unsigned long lane = SOR_DP_TPG_CHANNEL_CODING | unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
SOR_DP_TPG_SCRAMBLER_GALIOS | SOR_DP_TPG_SCRAMBLER_GALIOS |
SOR_DP_TPG_PATTERN_NONE; SOR_DP_TPG_PATTERN_NONE;
@@ -913,11 +913,11 @@ static int tegra_sor_compute_config(struct tegra_sor *sor,
u32 num_syms_per_line; u32 num_syms_per_line;
unsigned int i; unsigned int i;
if (!link_rate || !link->num_lanes || !pclk || !config->bits_per_pixel) if (!link_rate || !link->lanes || !pclk || !config->bits_per_pixel)
return -EINVAL; return -EINVAL;
output = link_rate * 8 * link->num_lanes;
input = pclk * config->bits_per_pixel; input = pclk * config->bits_per_pixel;
output = link_rate * 8 * link->lanes;
if (input >= output) if (input >= output)
return -ERANGE; return -ERANGE;
@@ -960,7 +960,7 @@ static int tegra_sor_compute_config(struct tegra_sor *sor,
watermark = div_u64(watermark + params.error, f); watermark = div_u64(watermark + params.error, f);
config->watermark = watermark + (config->bits_per_pixel / 8) + 2; config->watermark = watermark + (config->bits_per_pixel / 8) + 2;
num_syms_per_line = (mode->hdisplay * config->bits_per_pixel) * num_syms_per_line = (mode->hdisplay * config->bits_per_pixel) *
(link->num_lanes * 8); (link->lanes * 8);
if (config->watermark > 30) { if (config->watermark > 30) {
config->watermark = 30; config->watermark = 30;
@@ -980,12 +980,12 @@ static int tegra_sor_compute_config(struct tegra_sor *sor,
if (link->capabilities & DP_LINK_CAP_ENHANCED_FRAMING) if (link->capabilities & DP_LINK_CAP_ENHANCED_FRAMING)
config->hblank_symbols -= 3; config->hblank_symbols -= 3;
config->hblank_symbols -= 12 / link->num_lanes; config->hblank_symbols -= 12 / link->lanes;
/* compute the number of symbols per vertical blanking interval */ /* compute the number of symbols per vertical blanking interval */
num = (mode->hdisplay - 25) * link_rate; num = (mode->hdisplay - 25) * link_rate;
config->vblank_symbols = div_u64(num, pclk); config->vblank_symbols = div_u64(num, pclk);
config->vblank_symbols -= 36 / link->num_lanes + 4; config->vblank_symbols -= 36 / link->lanes + 4;
dev_dbg(sor->dev, "blank symbols: H:%u V:%u\n", config->hblank_symbols, dev_dbg(sor->dev, "blank symbols: H:%u V:%u\n", config->hblank_symbols,
config->vblank_symbols); config->vblank_symbols);
@@ -1831,17 +1831,17 @@ static void tegra_sor_edp_enable(struct drm_encoder *encoder)
/* power DP lanes */ /* power DP lanes */
value = tegra_sor_readl(sor, sor->soc->regs->dp_padctl0); value = tegra_sor_readl(sor, sor->soc->regs->dp_padctl0);
if (link.num_lanes <= 2) if (link.lanes <= 2)
value &= ~(SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_2); value &= ~(SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_2);
else else
value |= SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_2; value |= SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_2;
if (link.num_lanes <= 1) if (link.lanes <= 1)
value &= ~SOR_DP_PADCTL_PD_TXD_1; value &= ~SOR_DP_PADCTL_PD_TXD_1;
else else
value |= SOR_DP_PADCTL_PD_TXD_1; value |= SOR_DP_PADCTL_PD_TXD_1;
if (link.num_lanes == 0) if (link.lanes == 0)
value &= ~SOR_DP_PADCTL_PD_TXD_0; value &= ~SOR_DP_PADCTL_PD_TXD_0;
else else
value |= SOR_DP_PADCTL_PD_TXD_0; value |= SOR_DP_PADCTL_PD_TXD_0;
@@ -1850,7 +1850,7 @@ static void tegra_sor_edp_enable(struct drm_encoder *encoder)
value = tegra_sor_readl(sor, SOR_DP_LINKCTL0); value = tegra_sor_readl(sor, SOR_DP_LINKCTL0);
value &= ~SOR_DP_LINKCTL_LANE_COUNT_MASK; value &= ~SOR_DP_LINKCTL_LANE_COUNT_MASK;
value |= SOR_DP_LINKCTL_LANE_COUNT(link.num_lanes); value |= SOR_DP_LINKCTL_LANE_COUNT(link.lanes);
tegra_sor_writel(sor, value, SOR_DP_LINKCTL0); tegra_sor_writel(sor, value, SOR_DP_LINKCTL0);
/* start lane sequencer */ /* start lane sequencer */
@@ -1907,7 +1907,7 @@ static void tegra_sor_edp_enable(struct drm_encoder *encoder)
dev_err(sor->dev, "failed to configure eDP link: %d\n", err); dev_err(sor->dev, "failed to configure eDP link: %d\n", err);
rate = drm_dp_link_rate_to_bw_code(link.rate); rate = drm_dp_link_rate_to_bw_code(link.rate);
lanes = link.num_lanes; lanes = link.lanes;
value = tegra_sor_readl(sor, SOR_CLK_CNTRL); value = tegra_sor_readl(sor, SOR_CLK_CNTRL);
value &= ~SOR_CLK_CNTRL_DP_LINK_SPEED_MASK; value &= ~SOR_CLK_CNTRL_DP_LINK_SPEED_MASK;
@@ -1925,7 +1925,7 @@ static void tegra_sor_edp_enable(struct drm_encoder *encoder)
/* disable training pattern generator */ /* disable training pattern generator */
for (i = 0; i < link.num_lanes; i++) { for (i = 0; i < link.lanes; i++) {
unsigned long lane = SOR_DP_TPG_CHANNEL_CODING | unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
SOR_DP_TPG_SCRAMBLER_GALIOS | SOR_DP_TPG_SCRAMBLER_GALIOS |
SOR_DP_TPG_PATTERN_NONE; SOR_DP_TPG_PATTERN_NONE;