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

Commit 89a6e5d5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: fix out-of-bound access and NULL dereference"

parents 74f32856 0cbfaf1a

msm/sde/sde_encoder.c

+2 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,8 @@ static int _sde_encoder_dsc_2_lm_2_enc_2_intf(struct sde_encoder_virt *sde_enc, 
	SDE_DEBUG_ENC(sde_enc, "pic_w: %d pic_h: %d mode:%d\n",

			roi->w, roi->h, dsc_common_mode);



	for (i = 0; i < sde_enc->num_phys_encs; i++) {

	for (i = 0; i < sde_enc->num_phys_encs &&

				i < MAX_CHANNELS_PER_ENC; i++) {

		bool active = !!((1 << i) & params->affected_displays);



		SDE_EVT32(DRMID(&sde_enc->base), roi->w, roi->h,

msm/sde/sde_hw_catalog.c

+4 −7
Original line number Diff line number Diff line
@@ -2588,19 +2588,16 @@ static int sde_uidle_parse_dt(struct device_node *np, 


	if (!sde_cfg) {

		SDE_ERROR("invalid argument\n");

		rc = -EINVAL;

		goto end;

		return -EINVAL;

	}



	if (!sde_cfg->uidle_cfg.uidle_rev)

		goto end;

		return 0;



	prop_value = kcalloc(UIDLE_PROP_MAX,

		sizeof(struct sde_prop_value), GFP_KERNEL);

	if (!prop_value) {

		rc = -ENOMEM;

		goto end;

	}

	if (!prop_value)

		return -ENOMEM;



	rc = _validate_dt_entry(np, uidle_prop, ARRAY_SIZE(uidle_prop),

			prop_count, &off_count);

msm/sde/sde_hw_reg_dma_v1_color_proc.c

+2 −0
Original line number Diff line number Diff line
@@ -2267,6 +2267,7 @@ void reg_dmav1_setup_vig_igcv5(struct sde_hw_pipe *ctx, void *cfg) 
	if (!igc_lut) {

		DRM_DEBUG_DRIVER("disable igc feature\n");

		vig_igcv5_off(ctx, hw_cfg);

		return;

	}



	dma_ops = sde_reg_dma_get_ops();
@@ -2317,6 +2318,7 @@ void reg_dmav1_setup_vig_igcv6(struct sde_hw_pipe *ctx, void *cfg) 
		DRM_DEBUG_DRIVER("disable igc feature\n");

		/* Both v5 and v6 call same igcv5_off */

		vig_igcv5_off(ctx, hw_cfg);

		return;

	}



	dma_ops = sde_reg_dma_get_ops();

msm/sde/sde_plane.c

+21 −6
Original line number Diff line number Diff line
@@ -2818,10 +2818,7 @@ static void _sde_plane_setup_uidle(struct drm_crtc *crtc, 
		SDE_ERROR("invalid settings, will disable UIDLE %d %d %d %d\n",

			line_time, fal10_threshold, fal10_target_idle_time_ns,

			fal1_target_idle_time_ns);

		cfg.enable = false;

		cfg.fal10_threshold = 0;

		cfg.fal1_threshold = 0;

		cfg.fal_allowed_threshold = 0;

		memset(&cfg, 0, sizeof(struct sde_hw_pipe_uidle_cfg));

	}



	SDE_DEBUG_PLANE(psde,
@@ -2863,6 +2860,7 @@ static void _sde_plane_update_roi_config(struct drm_plane *plane, 
	struct drm_crtc *crtc, struct drm_framebuffer *fb)

{

	const struct sde_format *fmt;

	const struct msm_format *msm_fmt;

	struct sde_plane *psde;

	struct drm_plane_state *state;

	struct sde_plane_state *pstate;
@@ -2875,7 +2873,15 @@ static void _sde_plane_update_roi_config(struct drm_plane *plane, 
	state = plane->state;



	pstate = to_sde_plane_state(state);

	fmt = to_sde_format(msm_framebuffer_format(fb));



	msm_fmt = msm_framebuffer_format(fb);

	if (!msm_fmt) {

		SDE_ERROR("crtc%d plane%d: null format\n",

			DRMID(crtc), DRMID(plane));

		return;

	}



	fmt = to_sde_format(msm_fmt);



	POPULATE_RECT(&src, state->src_x, state->src_y,

		state->src_w, state->src_h, q16_data);
@@ -3033,6 +3039,7 @@ static void _sde_plane_update_properties(struct drm_plane *plane, 
	struct drm_crtc *crtc, struct drm_framebuffer *fb)

{

	uint32_t nplanes;

	const struct msm_format *msm_fmt;

	const struct sde_format *fmt;

	struct sde_plane *psde;

	struct drm_plane_state *state;
@@ -3042,7 +3049,15 @@ static void _sde_plane_update_properties(struct drm_plane *plane, 
	state = plane->state;



	pstate = to_sde_plane_state(state);

	fmt = to_sde_format(msm_framebuffer_format(fb));



	msm_fmt = msm_framebuffer_format(fb);

	if (!msm_fmt) {

		SDE_ERROR("crtc%d plane%d: null format\n",

			DRMID(crtc), DRMID(plane));

		return;

	}



	fmt = to_sde_format(msm_fmt);

	nplanes = fmt->num_planes;



	/* update secure session flag */

pll/pll_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -208,9 +208,12 @@ static inline int mdss_pll_get_ioresurces(struct platform_device *pdev, 
	struct resource *rsc = platform_get_resource_byname(pdev,

						IORESOURCE_MEM, resource_name);

	if (rsc) {

		if (!regmap)

			return -ENOMEM;



		*regmap = devm_ioremap(&pdev->dev,

					rsc->start, resource_size(rsc));

		if (!regmap)

		if (!*regmap)

			return -ENOMEM;

	}

	return rc;