Merge changes I36a55b91,Icc225bd1 into display-kernel.lnx.1.0

* changes:
  disp: msm: sde: update shmbridge header file path
  disp: msm: delay msm_drv probe

msm/msm_drv.c

@@ -1980,7 +1980,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 <[email protected]");

msm/sde/sde_kms.c

@@ -51,7 +51,7 @@
 
 #include <soc/qcom/scm.h>
 #include "soc/qcom/secure_buffer.h"
-#include "soc/qcom/qtee_shmbridge.h"
+#include <linux/qtee_shmbridge.h>
 
 #define CREATE_TRACE_POINTS
 #include "sde_trace.h"