| Message ID | 20190605080424.28731-1-sandor.yu@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | de85ec271a864c05e99ad5ffbed9e95d1b65c757 |
| Headers | show |
| Series | DRM: Rockchip: correct rate in the struct drm_dp_link assignment | expand |
Hi, Am Mittwoch, 5. Juni 2019, 10:04:24 CEST schrieb sandor.yu@nxp.com: > From: Sandor Yu <Sandor.yu@nxp.com> > > variable of rate in the struct drm_dp_link should assign to > 162000/270000/540000/810000. > > Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> applied to drm-misc-next after fixing patch subject and description to be in line with subsystem conventions: https://cgit.freedesktop.org/drm/drm-misc/commit/?id=de85ec271a864c05e99ad5ffbed9e95d1b65c757 Thanks Heiko > --- > drivers/gpu/drm/rockchip/cdn-dp-reg.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c > index 6c8b14f..0a2aebe 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c > @@ -543,7 +543,7 @@ static int cdn_dp_get_training_status(struct cdn_dp_device *dp) > if (ret) > goto err_get_training_status; > > - dp->link.rate = status[0]; > + dp->link.rate = drm_dp_bw_code_to_link_rate(status[0]); > dp->link.num_lanes = status[1]; > > err_get_training_status: > @@ -647,7 +647,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp) > bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ? > (video->color_depth * 2) : (video->color_depth * 3); > > - link_rate = drm_dp_bw_code_to_link_rate(dp->link.rate) / 1000; > + link_rate = dp->link.rate / 1000; > > ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE); > if (ret) >
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c index 6c8b14f..0a2aebe 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -543,7 +543,7 @@ static int cdn_dp_get_training_status(struct cdn_dp_device *dp) if (ret) goto err_get_training_status; - dp->link.rate = status[0]; + dp->link.rate = drm_dp_bw_code_to_link_rate(status[0]); dp->link.num_lanes = status[1]; err_get_training_status: @@ -647,7 +647,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp) bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ? (video->color_depth * 2) : (video->color_depth * 3); - link_rate = drm_dp_bw_code_to_link_rate(dp->link.rate) / 1000; + link_rate = dp->link.rate / 1000; ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE); if (ret)