Skip to content

Commit fd70e20

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: dp: Change logging to dev for mtk_dp_aux_transfer()
Change logging from drm_{err,info}() to dev_{err,info}() in functions mtk_dp_aux_transfer() and mtk_dp_aux_do_transfer(): this will be essential to avoid getting NULL pointer kernel panics if any kind of error happens during AUX transfers happening before the bridge is attached. This may potentially start happening in a later commit implementing aux-bus support, as AUX transfers will be triggered from the panel driver (for EDID) before the mtk-dp bridge gets attached, and it's done in preparation for the same. Signed-off-by: AngeloGioacchino Del Regno <[email protected]> Tested-by: Chen-Yu Tsai <[email protected]> Reviewed-by: CK Hu <[email protected]> Reviewed-by: Alexandre Mergnat <[email protected]> Link: https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/ Signed-off-by: Chun-Kuang Hu <[email protected]>
1 parent e04b56c commit fd70e20

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/mediatek/mtk_dp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ static int mtk_dp_aux_do_transfer(struct mtk_dp *mtk_dp, bool is_read, u8 cmd,
847847
u32 phy_status = mtk_dp_read(mtk_dp, MTK_DP_AUX_P0_3628) &
848848
AUX_RX_PHY_STATE_AUX_TX_P0_MASK;
849849
if (phy_status != AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE) {
850-
drm_err(mtk_dp->drm_dev,
850+
dev_err(mtk_dp->dev,
851851
"AUX Rx Aux hang, need SW reset\n");
852852
return -EIO;
853853
}
@@ -2054,7 +2054,7 @@ static ssize_t mtk_dp_aux_transfer(struct drm_dp_aux *mtk_aux,
20542054
is_read = true;
20552055
break;
20562056
default:
2057-
drm_err(mtk_aux->drm_dev, "invalid aux cmd = %d\n",
2057+
dev_err(mtk_dp->dev, "invalid aux cmd = %d\n",
20582058
msg->request);
20592059
ret = -EINVAL;
20602060
goto err;
@@ -2070,7 +2070,7 @@ static ssize_t mtk_dp_aux_transfer(struct drm_dp_aux *mtk_aux,
20702070
to_access, &msg->reply);
20712071

20722072
if (ret) {
2073-
drm_info(mtk_dp->drm_dev,
2073+
dev_info(mtk_dp->dev,
20742074
"Failed to do AUX transfer: %d\n", ret);
20752075
goto err;
20762076
}

0 commit comments

Comments
 (0)