Skip to content

Commit 95c4ea2

Browse files
committed
drm/display: dp-tunnel: use new DCPD access helpers
Switch drm_dp_tunnel.c to use new set of DPCD read / write helpers. Reviewed-by: Lyude Paul <lyude@redhat.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20250324-drm-rework-dpcd-access-v4-6-e80ff89593df@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
1 parent 2554da0 commit 95c4ea2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/gpu/drm/display/drm_dp_tunnel.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static int read_tunnel_regs(struct drm_dp_aux *aux, struct drm_dp_tunnel_regs *r
222222
while ((len = next_reg_area(&offset))) {
223223
int address = DP_TUNNELING_BASE + offset;
224224

225-
if (drm_dp_dpcd_read(aux, address, tunnel_reg_ptr(regs, address), len) < 0)
225+
if (drm_dp_dpcd_read_data(aux, address, tunnel_reg_ptr(regs, address), len) < 0)
226226
return -EIO;
227227

228228
offset += len;
@@ -913,15 +913,15 @@ static int set_bw_alloc_mode(struct drm_dp_tunnel *tunnel, bool enable)
913913
u8 mask = DP_DISPLAY_DRIVER_BW_ALLOCATION_MODE_ENABLE | DP_UNMASK_BW_ALLOCATION_IRQ;
914914
u8 val;
915915

916-
if (drm_dp_dpcd_readb(tunnel->aux, DP_DPTX_BW_ALLOCATION_MODE_CONTROL, &val) < 0)
916+
if (drm_dp_dpcd_read_byte(tunnel->aux, DP_DPTX_BW_ALLOCATION_MODE_CONTROL, &val) < 0)
917917
goto out_err;
918918

919919
if (enable)
920920
val |= mask;
921921
else
922922
val &= ~mask;
923923

924-
if (drm_dp_dpcd_writeb(tunnel->aux, DP_DPTX_BW_ALLOCATION_MODE_CONTROL, val) < 0)
924+
if (drm_dp_dpcd_write_byte(tunnel->aux, DP_DPTX_BW_ALLOCATION_MODE_CONTROL, val) < 0)
925925
goto out_err;
926926

927927
tunnel->bw_alloc_enabled = enable;
@@ -1039,7 +1039,7 @@ static int clear_bw_req_state(struct drm_dp_aux *aux)
10391039
{
10401040
u8 bw_req_mask = DP_BW_REQUEST_SUCCEEDED | DP_BW_REQUEST_FAILED;
10411041

1042-
if (drm_dp_dpcd_writeb(aux, DP_TUNNELING_STATUS, bw_req_mask) < 0)
1042+
if (drm_dp_dpcd_write_byte(aux, DP_TUNNELING_STATUS, bw_req_mask) < 0)
10431043
return -EIO;
10441044

10451045
return 0;
@@ -1052,7 +1052,7 @@ static int bw_req_complete(struct drm_dp_aux *aux, bool *status_changed)
10521052
u8 val;
10531053
int err;
10541054

1055-
if (drm_dp_dpcd_readb(aux, DP_TUNNELING_STATUS, &val) < 0)
1055+
if (drm_dp_dpcd_read_byte(aux, DP_TUNNELING_STATUS, &val) < 0)
10561056
return -EIO;
10571057

10581058
*status_changed = val & status_change_mask;
@@ -1095,7 +1095,7 @@ static int allocate_tunnel_bw(struct drm_dp_tunnel *tunnel, int bw)
10951095
if (err)
10961096
goto out;
10971097

1098-
if (drm_dp_dpcd_writeb(tunnel->aux, DP_REQUEST_BW, request_bw) < 0) {
1098+
if (drm_dp_dpcd_write_byte(tunnel->aux, DP_REQUEST_BW, request_bw) < 0) {
10991099
err = -EIO;
11001100
goto out;
11011101
}
@@ -1196,13 +1196,13 @@ static int check_and_clear_status_change(struct drm_dp_tunnel *tunnel)
11961196
u8 mask = DP_BW_ALLOCATION_CAPABILITY_CHANGED | DP_ESTIMATED_BW_CHANGED;
11971197
u8 val;
11981198

1199-
if (drm_dp_dpcd_readb(tunnel->aux, DP_TUNNELING_STATUS, &val) < 0)
1199+
if (drm_dp_dpcd_read_byte(tunnel->aux, DP_TUNNELING_STATUS, &val) < 0)
12001200
goto out_err;
12011201

12021202
val &= mask;
12031203

12041204
if (val) {
1205-
if (drm_dp_dpcd_writeb(tunnel->aux, DP_TUNNELING_STATUS, val) < 0)
1205+
if (drm_dp_dpcd_write_byte(tunnel->aux, DP_TUNNELING_STATUS, val) < 0)
12061206
goto out_err;
12071207

12081208
return 1;
@@ -1215,7 +1215,7 @@ static int check_and_clear_status_change(struct drm_dp_tunnel *tunnel)
12151215
* Check for estimated BW changes explicitly to account for lost
12161216
* BW change notifications.
12171217
*/
1218-
if (drm_dp_dpcd_readb(tunnel->aux, DP_ESTIMATED_BW, &val) < 0)
1218+
if (drm_dp_dpcd_read_byte(tunnel->aux, DP_ESTIMATED_BW, &val) < 0)
12191219
goto out_err;
12201220

12211221
if (val * tunnel->bw_granularity != tunnel->estimated_bw)
@@ -1300,7 +1300,7 @@ int drm_dp_tunnel_handle_irq(struct drm_dp_tunnel_mgr *mgr, struct drm_dp_aux *a
13001300
{
13011301
u8 val;
13021302

1303-
if (drm_dp_dpcd_readb(aux, DP_TUNNELING_STATUS, &val) < 0)
1303+
if (drm_dp_dpcd_read_byte(aux, DP_TUNNELING_STATUS, &val) < 0)
13041304
return -EIO;
13051305

13061306
if (val & (DP_BW_REQUEST_SUCCEEDED | DP_BW_REQUEST_FAILED))

0 commit comments

Comments
 (0)