mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

drm/bridge: ti-sn65dsi86: Use bitmask to store valid rates

Browse source 
The valid rates are stored in an array of 8 booleans. Replace it with a
bitmask to save space.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210624000304.16281-4-laurent.pinchart+renesas@ideasonboard.com
This commit is contained in:
Laurent Pinchart 2021-06-24 03:03:01 +03:00 committed by Robert Foss
parent bbda1704fc
commit d4d643f9ef
No known key found for this signature in database
GPG key ID: 3EFD900F76D1D784
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/gpu/drm/bridge/ti-sn65dsi86.c
View file

@ -616,9 +616,9 @@ static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn65dsi86 *pdata)
return i; return i;
} }
static void ti_sn_bridge_read_valid_rates(struct ti_sn65dsi86 *pdata, static unsigned int ti_sn_bridge_read_valid_rates(struct ti_sn65dsi86 *pdata)
bool rate_valid[])
{ {
unsigned int valid_rates = 0;
unsigned int rate_per_200khz; unsigned int rate_per_200khz;
unsigned int rate_mhz; unsigned int rate_mhz;
u8 dpcd_val; u8 dpcd_val;
@ -658,13 +658,13 @@ static void ti_sn_bridge_read_valid_rates(struct ti_sn65dsi86 *pdata,
j < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut); j < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut);
j++) { j++) {
if (ti_sn_bridge_dp_rate_lut[j] == rate_mhz) if (ti_sn_bridge_dp_rate_lut[j] == rate_mhz)
rate_valid[j] = true; valid_rates |= BIT(j);
} }
} }
for (i = 0; i < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut); i++) { for (i = 0; i < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut); i++) {
if (rate_valid[i]) if (valid_rates & BIT(i))
return; return valid_rates;
} }
DRM_DEV_ERROR(pdata->dev, DRM_DEV_ERROR(pdata->dev,
"No matching eDP rates in table; falling back\n"); "No matching eDP rates in table; falling back\n");
@ -686,15 +686,17 @@ static void ti_sn_bridge_read_valid_rates(struct ti_sn65dsi86 *pdata,
(int)dpcd_val); (int)dpcd_val);
fallthrough; fallthrough;
case DP_LINK_BW_5_4: case DP_LINK_BW_5_4:
rate_valid[7] = 1; valid_rates |= BIT(7);
fallthrough; fallthrough;
case DP_LINK_BW_2_7: case DP_LINK_BW_2_7:
rate_valid[4] = 1; valid_rates |= BIT(4);
fallthrough; fallthrough;
case DP_LINK_BW_1_62: case DP_LINK_BW_1_62:
rate_valid[1] = 1; valid_rates |= BIT(1);
break; break;
} }
return valid_rates;
} }
static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata) static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata)
@ -812,8 +814,8 @@ static int ti_sn_link_training(struct ti_sn65dsi86 *pdata, int dp_rate_idx,
static void ti_sn_bridge_enable(struct drm_bridge *bridge) static void ti_sn_bridge_enable(struct drm_bridge *bridge)
{ {
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge); struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
bool rate_valid[ARRAY_SIZE(ti_sn_bridge_dp_rate_lut)] = { };
const char *last_err_str = "No supported DP rate"; const char *last_err_str = "No supported DP rate";
unsigned int valid_rates;
int dp_rate_idx; int dp_rate_idx;
unsigned int val; unsigned int val;
int ret = -EINVAL; int ret = -EINVAL;
@ -852,13 +854,13 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)
regmap_update_bits(pdata->regmap, SN_SSC_CONFIG_REG, DP_NUM_LANES_MASK, regmap_update_bits(pdata->regmap, SN_SSC_CONFIG_REG, DP_NUM_LANES_MASK,
val); val);
ti_sn_bridge_read_valid_rates(pdata, rate_valid); valid_rates = ti_sn_bridge_read_valid_rates(pdata);
/* Train until we run out of rates */ /* Train until we run out of rates */
for (dp_rate_idx = ti_sn_bridge_calc_min_dp_rate_idx(pdata); for (dp_rate_idx = ti_sn_bridge_calc_min_dp_rate_idx(pdata);
dp_rate_idx < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut); dp_rate_idx < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut);
dp_rate_idx++) { dp_rate_idx++) {
if (!rate_valid[dp_rate_idx]) if (!(valid_rates & BIT(dp_rate_idx)))
continue; continue;
ret = ti_sn_link_training(pdata, dp_rate_idx, &last_err_str); ret = ti_sn_link_training(pdata, dp_rate_idx, &last_err_str);