diff --git a/drivers/gpu/drm/msm/dsi-staging/dsi_phy.c b/drivers/gpu/drm/msm/dsi-staging/dsi_phy.c
index ebc699a..32497ff 100644
--- a/drivers/gpu/drm/msm/dsi-staging/dsi_phy.c
+++ b/drivers/gpu/drm/msm/dsi-staging/dsi_phy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -883,6 +883,8 @@
 						 &phy->cfg.timing, true);
 	if (rc)
 		pr_err("failed to calculate phy timings %d\n", rc);
+	else
+		phy->cfg.is_phy_timing_present = true;
 
 	return rc;
 }
@@ -1045,6 +1047,9 @@
 		return -EINVAL;
 	}
 
+	if (phy->cfg.is_phy_timing_present)
+		return rc;
+
 	mutex_lock(&phy->phy_lock);
 
 	if (phy->hw.ops.phy_timing_val)