github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 03:59:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/dsi: use intel_de_wait_custom() instead of wait_for_us()

Browse Source 
Prefer the register read specific wait function over i915 wait_for_us().

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/1fe3d5ac314dd644573e9f59941e4c7f1d57b05d.1753956266.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-07-31 13:05:14 +03:00
parent 5a37f08d49
commit 13a5a04ffd
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/gpu/drm/i915/display/icl_dsi.c
View File

@ -137,8 +137,11 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)
/* wait for LP TX in progress bit to be cleared */
for_each_dsi_port(port, intel_dsi->ports) {
dsi_trans = dsi_port_to_transcoder(port);
if (wait_for_us(!(intel_de_read(display, DSI_LP_MSG(dsi_trans)) &
LPTX_IN_PROGRESS), 20))
ret = intel_de_wait_custom(display, DSI_LP_MSG(dsi_trans),
LPTX_IN_PROGRESS, 0,
20, 0, NULL);
if (ret)
drm_err(display->drm, "LPTX bit not cleared\n");
}
}
@ -516,13 +519,15 @@ static void gen11_dsi_enable_ddi_buffer(struct intel_encoder *encoder)
struct intel_display *display = to_intel_display(encoder);
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
enum port port;
int ret;
for_each_dsi_port(port, intel_dsi->ports) {
intel_de_rmw(display, DDI_BUF_CTL(port), 0, DDI_BUF_CTL_ENABLE);
if (wait_for_us(!(intel_de_read(display, DDI_BUF_CTL(port)) &
DDI_BUF_IS_IDLE),
500))
ret = intel_de_wait_custom(display, DDI_BUF_CTL(port),
DDI_BUF_IS_IDLE, 0,
500, 0, NULL);
if (ret)
drm_err(display->drm, "DDI port:%c buffer idle\n",
port_name(port));
}
@ -838,9 +843,14 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,
/* wait for link ready */
for_each_dsi_port(port, intel_dsi->ports) {
int ret;
dsi_trans = dsi_port_to_transcoder(port);
if (wait_for_us((intel_de_read(display, DSI_TRANS_FUNC_CONF(dsi_trans)) &
LINK_READY), 2500))
ret = intel_de_wait_custom(display, DSI_TRANS_FUNC_CONF(dsi_trans),
LINK_READY, LINK_READY,
2500, 0, NULL);
if (ret)
drm_err(display->drm, "DSI link not ready\n");
}
}
@ -1321,6 +1331,7 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)
enum port port;
enum transcoder dsi_trans;
u32 tmp;
int ret;
/* disable periodic update mode */
if (is_cmd_mode(intel_dsi)) {
@ -1337,9 +1348,10 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)
tmp &= ~LINK_ULPS_TYPE_LP11;
intel_de_write(display, DSI_LP_MSG(dsi_trans), tmp);
if (wait_for_us((intel_de_read(display, DSI_LP_MSG(dsi_trans)) &
LINK_IN_ULPS),
10))
ret = intel_de_wait_custom(display, DSI_LP_MSG(dsi_trans),
LINK_IN_ULPS, LINK_IN_ULPS,
10, 0, NULL);
if (ret)
drm_err(display->drm, "DSI link not in ULPS\n");
}
@ -1367,14 +1379,17 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)
struct intel_display *display = to_intel_display(encoder);
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
enum port port;
int ret;
gen11_dsi_ungate_clocks(encoder);
for_each_dsi_port(port, intel_dsi->ports) {
intel_de_rmw(display, DDI_BUF_CTL(port), DDI_BUF_CTL_ENABLE, 0);
if (wait_for_us((intel_de_read(display, DDI_BUF_CTL(port)) &
DDI_BUF_IS_IDLE),
8))
ret = intel_de_wait_custom(display, DDI_BUF_CTL(port),
DDI_BUF_IS_IDLE, DDI_BUF_IS_IDLE,
8, 0, NULL);
if (ret)
drm_err(display->drm,
"DDI port:%c buffer not idle\n",
port_name(port));