Merge "msm: mdp3: Map splash addr before smmu attach" (31ca3a6a) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdp3.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -2184,6 +2184,12 @@ void mdp3_release_splash_memory(struct msm_fb_data_type *mfd)
		{
		/* Give back the reserved memory to the system */
		if (mdp3_res->splash_mem_addr) {
		if ((mfd->panel.type == MIPI_VIDEO_PANEL) &&
		(mdp3_res->cont_splash_en)) {
		mdss_smmu_unmap(MDSS_IOMMU_DOMAIN_UNSECURE,
		mdp3_res->splash_mem_addr,
		mdp3_res->splash_mem_size);
		}
		mdp3_free(mfd);
		pr_debug("mdp3_release_splash_memory\n");
		memblock_free(mdp3_res->splash_mem_addr,

+11 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/dma-buf.h>
		#include <linux/pm_runtime.h>
		#include <linux/sw_sync.h>
		#include <linux/iommu.h>

		#include "mdp3_ctrl.h"
		#include "mdp3.h"
		@@ -1173,6 +1174,16 @@ int mdp3_ctrl_reset(struct msm_fb_data_type *mfd)
		mdp3_qos_remapper_setup(panel);
		}

		/Map the splash addr for VIDEO mode panel before smmu attach/
		if ((mfd->panel.type == MIPI_VIDEO_PANEL) &&
		(mdp3_session->in_splash_screen)) {
		rc = mdss_smmu_map(MDSS_IOMMU_DOMAIN_UNSECURE,
		mdp3_res->splash_mem_addr,
		mdp3_res->splash_mem_addr,
		mdp3_res->splash_mem_size,
		IOMMU_READ \| IOMMU_NOEXEC);
		}

		rc = mdp3_iommu_enable(MDP3_CLIENT_DMA_P);
		if (rc) {
		pr_err("fail to attach dma iommu\n");