From f31f78f873cb8e608fc8e8ba8e0f0638f73f130d Mon Sep 17 00:00:00 2001 From: Rajshekar Eashwarappa Date: Sat, 14 Dec 2019 20:19:19 +0530 Subject: [PATCH] Workaround: These are work around which need to de addressed DONOT MERGE Change-Id: Ie1f5607e97c8ab5eaf74941fdb63151b5a7244c5 Signed-off-by: Naitik Bharadiya Signed-off-by: Rajshekar Eashwarappa --- drivers/clk/clk.c | 1 + drivers/gpu/msm/kgsl_iommu.c | 4 +++- drivers/gpu/msm/kgsl_pwrctrl.c | 3 ++- drivers/media/platform/msm/sde/rotator/sde_rotator_base.c | 4 ++-- security/selinux/include/classmap.h | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e68700ef36d5..830f7cc855be 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -3471,6 +3471,7 @@ static int __init clk_debug_init(void) struct clk_core *core; struct dentry *d; + return 0; rootdir = debugfs_create_dir("clk", NULL); if (!rootdir) diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c index 0181939930b8..a1b32210e04c 100644 --- a/drivers/gpu/msm/kgsl_iommu.c +++ b/drivers/gpu/msm/kgsl_iommu.c @@ -1279,6 +1279,8 @@ static int _init_global_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) goto done; } context_bank_number = cb_num; +#if 0 +/* Disable mmu_aperture pgming call temporarly as its not supported in SDM660 */ if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) && scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) { ret = kgsl_program_smmu_aperture(); @@ -1288,7 +1290,7 @@ static int _init_global_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) goto done; } } - +#endif ctx->cb_num = cb_num; ctx->regbase = iommu->regbase + KGSL_IOMMU_CB0_OFFSET + (cb_num << KGSL_IOMMU_CB_SHIFT); diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c index bf18aa0807d1..45ba15d427c3 100644 --- a/drivers/gpu/msm/kgsl_pwrctrl.c +++ b/drivers/gpu/msm/kgsl_pwrctrl.c @@ -2510,7 +2510,8 @@ int kgsl_pwrctrl_init(struct kgsl_device *device) KGSL_PWR_ERR(device, "Failed to register client with CX Ipeak %d\n", result); - goto error_cleanup_pwr_limit; + //goto error_cleanup_pwr_limit; + result = 0; } } return result; diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_base.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_base.c index af6338d6f9e0..399c293f0ffc 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_base.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_base.c @@ -147,7 +147,7 @@ void vbif_lock(struct platform_device *parent_pdev) if (!parent_pdev) return; - mdp_vbif_lock(parent_pdev, true); +// mdp_vbif_lock(parent_pdev, true); } void vbif_unlock(struct platform_device *parent_pdev) @@ -155,7 +155,7 @@ void vbif_unlock(struct platform_device *parent_pdev) if (!parent_pdev) return; - mdp_vbif_lock(parent_pdev, false); +// mdp_vbif_lock(parent_pdev, false); } void sde_mdp_halt_vbif_xin(struct sde_mdp_vbif_halt_params *params) diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 5ae315ab060b..06933434abce 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -28,9 +28,9 @@ #define COMMON_CAP2_PERMS "mac_override", "mac_admin", "syslog", \ "wake_alarm", "block_suspend", "audit_read" -#if CAP_LAST_CAP > CAP_AUDIT_READ -#error New capability defined, please update COMMON_CAP2_PERMS. -#endif +//#if CAP_LAST_CAP > CAP_AUDIT_READ +//#error New capability defined, please update COMMON_CAP2_PERMS. +//#endif /* * Note: The name for any socket class should be suffixed by "socket",