[PATCH 2/3] drm/msm: fix HZ dependency of timeout

Nicholas Mc Guire hofrat at osadl.org
Fri Apr 3 19:39:08 PDT 2015


The timeout is passed as a constant which makes it HZ dependent because
jiffies are expected so it should be converted to jiffies. The actual 
value is not clear from the code - my best guess is that this should be 
300 milliseconds given that other timeouts are in milliseconds based on 
looking at other drm drivers (e.g. exynos_drm_dsi.c:356 300ms, 
tegra/dpaux.c:188 250ms) - this needs to be confirmed by someone who 
knows the details of the driver.

Signed-off-by: Nicholas Mc Guire <hofrat at osadl.org>
---

This was compile tested with qcom_defconfig +    
CONFIG_DRM=m (implies CONFIG_DRM_MSM=m)

Patch is against 4.0-rc6 (localversion-next is -next-20150402)

 drivers/gpu/drm/msm/edp/edp_aux.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/edp/edp_aux.c b/drivers/gpu/drm/msm/edp/edp_aux.c
index 91a1a67..d1b6833 100644
--- a/drivers/gpu/drm/msm/edp/edp_aux.c
+++ b/drivers/gpu/drm/msm/edp/edp_aux.c
@@ -148,7 +148,8 @@ ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux, struct drm_dp_aux_msg *msg)
 		goto unlock_exit;
 
 	DBG("wait_for_completion");
-	time_left = wait_for_completion_timeout(&aux->msg_comp, 300);
+	time_left = wait_for_completion_timeout(&aux->msg_comp,
+						msecs_to_jiffies(300));
 	if (!time_left) {
 		/*
 		 * Clear GO and reset AUX channel
-- 
1.7.10.4



More information about the dri-devel mailing list