Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc3c5f14 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: hide additional kernel addresses from unprivileged users"

parents 6f4c99df a67bc21c

drivers/video/fbdev/msm/mdss_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -2068,7 +2068,7 @@ static int mdss_retrieve_dp_ctrl_resources(struct platform_device *pdev, 
					"hdcp_physical"))

		pr_warn("unable to remap dp hdcp resources\n");



	pr_debug("DP Driver base=%p size=%x\n",

	pr_debug("DP Driver base=%pK size=%x\n",

		dp_drv->base, dp_drv->base_size);



	mdss_debug_register_base("dp",

drivers/video/fbdev/msm/mdss_mdp_intf_video.c

+4 −4
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ static int mdss_mdp_video_intfs_stop(struct mdss_mdp_ctl *ctl, 
		pr_err("Intf %d not in use\n", (inum + MDSS_MDP_INTF0));

		return -ENODEV;

	}

	pr_debug("stop ctl=%d video Intf #%d base=%p", ctl->num, ctx->intf_num,

	pr_debug("stop ctl=%d video Intf #%d base=%pK", ctl->num, ctx->intf_num,

			ctx->base);



	ret = mdss_mdp_video_ctx_stop(ctl, pinfo, ctx);
@@ -978,7 +978,7 @@ static int mdss_mdp_video_intfs_stop(struct mdss_mdp_ctl *ctl, 
			pr_err("Intf %d not in use\n", (inum + MDSS_MDP_INTF0));

			return -ENODEV;

		}

		pr_debug("stop ctl=%d video Intf #%d base=%p", ctl->num,

		pr_debug("stop ctl=%d video Intf #%d base=%pK", ctl->num,

				sctx->intf_num, sctx->base);



		ret = mdss_mdp_video_ctx_stop(ctl, pinfo, sctx);
@@ -2021,7 +2021,7 @@ static int mdss_mdp_video_intfs_setup(struct mdss_mdp_ctl *ctl, 
					(inum + MDSS_MDP_INTF0));

			return -EBUSY;

		}

		pr_debug("video Intf #%d base=%p", ctx->intf_num, ctx->base);

		pr_debug("video Intf #%d base=%pK", ctx->intf_num, ctx->base);

		ctx->ref_cnt++;

	} else {

		pr_err("Invalid intf number: %d\n", (inum + MDSS_MDP_INTF0));
@@ -2054,7 +2054,7 @@ static int mdss_mdp_video_intfs_setup(struct mdss_mdp_ctl *ctl, 
					(inum + MDSS_MDP_INTF0));

			return -EBUSY;

		}

		pr_debug("video Intf #%d base=%p", ctx->intf_num, ctx->base);

		pr_debug("video Intf #%d base=%pK", ctx->intf_num, ctx->base);

		ctx->ref_cnt++;



		ctl->intf_ctx[SLAVE_CTX] = ctx;

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ static int __overlay_queue_pipes(struct msm_fb_data_type *mfd) 
				}

				break;

			default:

				pr_err("invalid state of buf %p=%d\n",

				pr_err("invalid state of buf %pK=%d\n",

						buf, buf->state);

				BUG();

				break;

drivers/video/fbdev/msm/mdss_mdp_pp.c

+7 −7
Original line number Diff line number Diff line
@@ -2906,7 +2906,7 @@ int mdss_mdp_pp_resume(struct msm_fb_data_type *mfd) 
			mfd->index);

		return 0;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -3250,7 +3250,7 @@ static int pp_ad_calc_bl(struct msm_fb_data_type *mfd, int bl_in, int *bl_out, 
			mfd->index);

		return 0;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -5754,7 +5754,7 @@ static int pp_ad_invalidate_input(struct msm_fb_data_type *mfd) 
			mfd->index);

		return 0;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -5789,7 +5789,7 @@ int mdss_mdp_ad_config(struct msm_fb_data_type *mfd, 
			mfd->index);

		return ret;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -5929,7 +5929,7 @@ int mdss_mdp_ad_input(struct msm_fb_data_type *mfd, 
			mfd->index);

		return ret;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -6298,7 +6298,7 @@ static int mdss_mdp_ad_ipc_reset(struct msm_fb_data_type *mfd) 
			mfd->index);

		return 0;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}
@@ -6339,7 +6339,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) 
			mfd->index);

		return 0;

	} else if (ret || !ad) {

		pr_err("Failed to get ad info: ret = %d, ad = 0x%p.\n",

		pr_err("Failed to get ad info: ret = %d, ad = 0x%pK\n",

			ret, ad);

		return ret;

	}

drivers/video/fbdev/msm/mdss_mdp_pp_cache_config.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ int pp_dither_cache_params(struct mdp_dither_cfg_data *config, 
{

	int ret = 0;

	if (!config || !mdss_pp_res) {

		pr_err("invalid param config %pi pp_res %pK\n",

		pr_err("invalid param config %pK pp_res %pK\n",

			config, mdss_pp_res);

		return -EINVAL;

	}