From 29fecbebc7ad7a50267f2c4fdc6cb6b3c165277d Mon Sep 17 00:00:00 2001 From: Abhijit Kulkarni Date: Wed, 20 Nov 2019 14:28:40 -0800 Subject: [PATCH 1/2] disp: msm: delay msm_drv probe This change delays the probe of msm_drv by changing the init call order to ensure that all the dependent resource drivers are probed and all resources are available for use by the msm_drv. Change-Id: Icc225bd14052a8d83e9976fbaa9c83c17f5319aa Signed-off-by: Abhijit Kulkarni --- msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm/msm_drv.c b/msm/msm_drv.c index 20886e27e3..ac28b379ea 100644 --- a/msm/msm_drv.c +++ b/msm/msm_drv.c @@ -2084,7 +2084,7 @@ static void __exit msm_drm_unregister(void) msm_smmu_driver_cleanup(); } -module_init(msm_drm_register); +late_initcall(msm_drm_register); module_exit(msm_drm_unregister); MODULE_AUTHOR("Rob Clark Date: Fri, 6 Dec 2019 10:23:29 -0800 Subject: [PATCH 2/2] disp: msm: sde: update shmbridge header file path Update the header file path in the code as it has moved to a new location. Change-Id: I36a55b91a121b9bb3d89641da1e4e22407f55b68 Signed-off-by: Abhijit Kulkarni --- msm/sde/sde_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c index 9d68c14080..e160427334 100644 --- a/msm/sde/sde_kms.c +++ b/msm/sde/sde_kms.c @@ -51,7 +51,7 @@ #include #include "soc/qcom/secure_buffer.h" -#include "soc/qcom/qtee_shmbridge.h" +#include #define CREATE_TRACE_POINTS #include "sde_trace.h"