mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/rockchip: Avoid drm_dp_link helpers

Browse source 
During the discussion of patches that enhance the drm_dp_link helpers it
was concluded that these helpers aren't very useful to begin with. Start
pushing the equivalent code into individual drivers to ultimately remove
them.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191021143437.1477719-13-thierry.reding@gmail.com
This commit is contained in:
Thierry Reding 2019-10-21 16:34:36 +02:00
parent 8ef8261491
commit 2589c4025f
3 changed files with 17 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/rockchip/cdn-dp-core.c
View file

@ -477,8 +477,8 @@ static int cdn_dp_disable(struct cdn_dp_device *dp)
cdn_dp_set_firmware_active(dp, false); cdn_dp_set_firmware_active(dp, false);
cdn_dp_clk_disable(dp); cdn_dp_clk_disable(dp);
dp->active = false; dp->active = false;
dp->link.rate = 0; dp->max_lanes = 0;
dp->link.num_lanes = 0; dp->max_rate = 0;
if (!dp->connected) { if (!dp->connected) {
kfree(dp->edid); kfree(dp->edid);
dp->edid = NULL; dp->edid = NULL;
@ -570,7 +570,7 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
struct cdn_dp_port *port = cdn_dp_connected_port(dp); struct cdn_dp_port *port = cdn_dp_connected_port(dp);
u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd); u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
if (!port || !dp->link.rate || !dp->link.num_lanes) if (!port || !dp->max_rate || !dp->max_lanes)
return false; return false;
if (cdn_dp_dpcd_read(dp, DP_LANE0_1_STATUS, link_status, if (cdn_dp_dpcd_read(dp, DP_LANE0_1_STATUS, link_status,
@ -952,8 +952,8 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* Enabled and connected with a sink, re-train if requested */ /* Enabled and connected with a sink, re-train if requested */
} else if (!cdn_dp_check_link_status(dp)) { } else if (!cdn_dp_check_link_status(dp)) {
unsigned int rate = dp->link.rate; unsigned int rate = dp->max_rate;
unsigned int lanes = dp->link.num_lanes; unsigned int lanes = dp->max_lanes;
struct drm_display_mode *mode = &dp->mode; struct drm_display_mode *mode = &dp->mode;
DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n"); DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
@ -966,7 +966,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* If training result is changed, update the video config */ /* If training result is changed, update the video config */
if (mode->clock && if (mode->clock &&
(rate != dp->link.rate || lanes != dp->link.num_lanes)) { (rate != dp->max_rate || lanes != dp->max_lanes)) {
ret = cdn_dp_config_video(dp); ret = cdn_dp_config_video(dp);
if (ret) { if (ret) {
dp->connected = false; dp->connected = false;

3
drivers/gpu/drm/rockchip/cdn-dp-core.h
View file

@ -92,9 +92,10 @@ struct cdn_dp_device {
struct reset_control *core_rst; struct reset_control *core_rst;
struct audio_info audio_info; struct audio_info audio_info;
struct video_info video_info; struct video_info video_info;
struct drm_dp_link link;
struct cdn_dp_port *port[MAX_PHY]; struct cdn_dp_port *port[MAX_PHY];
u8 ports; u8 ports;
u8 max_lanes;
u8 max_rate;
u8 lanes; u8 lanes;
int active_port; int active_port;

19
drivers/gpu/drm/rockchip/cdn-dp-reg.c
View file

@ -535,8 +535,8 @@ static int cdn_dp_get_training_status(struct cdn_dp_device *dp)
if (ret) if (ret)
goto err_get_training_status; goto err_get_training_status;
dp->link.rate = drm_dp_bw_code_to_link_rate(status[0]); dp->max_rate = drm_dp_bw_code_to_link_rate(status[0]);
dp->link.num_lanes = status[1]; dp->max_lanes = status[1];
err_get_training_status: err_get_training_status:
if (ret) if (ret)
@ -560,8 +560,8 @@ int cdn_dp_train_link(struct cdn_dp_device *dp)
return ret; return ret;
} }
DRM_DEV_DEBUG_KMS(dp->dev, "rate:0x%x, lanes:%d\n", dp->link.rate, DRM_DEV_DEBUG_KMS(dp->dev, "rate:0x%x, lanes:%d\n", dp->max_rate,
dp->link.num_lanes); dp->max_lanes);
return ret; return ret;
} }
@ -639,7 +639,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ? bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ?
(video->color_depth * 2) : (video->color_depth * 3); (video->color_depth * 2) : (video->color_depth * 3);
link_rate = dp->link.rate / 1000; link_rate = dp->max_rate / 1000;
ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE); ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
if (ret) if (ret)
@ -659,14 +659,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
do { do {
tu_size_reg += 2; tu_size_reg += 2;
symbol = tu_size_reg * mode->clock * bit_per_pix; symbol = tu_size_reg * mode->clock * bit_per_pix;
do_div(symbol, dp->link.num_lanes * link_rate * 8); do_div(symbol, dp->max_lanes * link_rate * 8);
rem = do_div(symbol, 1000); rem = do_div(symbol, 1000);
if (tu_size_reg > 64) { if (tu_size_reg > 64) {
ret = -EINVAL; ret = -EINVAL;
DRM_DEV_ERROR(dp->dev, DRM_DEV_ERROR(dp->dev,
"tu error, clk:%d, lanes:%d, rate:%d\n", "tu error, clk:%d, lanes:%d, rate:%d\n",
mode->clock, dp->link.num_lanes, mode->clock, dp->max_lanes, link_rate);
link_rate);
goto err_config_video; goto err_config_video;
} }
} while ((symbol <= 1) || (tu_size_reg - symbol < 4) || } while ((symbol <= 1) || (tu_size_reg - symbol < 4) ||
@ -680,7 +679,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
/* set the FIFO Buffer size */ /* set the FIFO Buffer size */
val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate; val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate;
val /= (dp->link.num_lanes * link_rate); val /= (dp->max_lanes * link_rate);
val = div_u64(8 * (symbol + 1), bit_per_pix) - val; val = div_u64(8 * (symbol + 1), bit_per_pix) - val;
val += 2; val += 2;
ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val); ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val);
@ -833,7 +832,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
u32 val; u32 val;
if (audio->channels == 2) { if (audio->channels == 2) {
if (dp->link.num_lanes == 1) if (dp->max_lanes == 1)
sub_pckt_num = 2; sub_pckt_num = 2;
else else
sub_pckt_num = 4; sub_pckt_num = 4;