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

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

Merge "drm/msm: Fix uninitialization and out of bound access issues"

parents b2375c3a 60da7263

drivers/gpu/drm/msm/msm_atomic.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
			funcs->commit(encoder);

	}



	if (kms->funcs->commit) {

	if (kms && kms->funcs && kms->funcs->commit) {

		DRM_DEBUG_ATOMIC("triggering commit\n");

		kms->funcs->commit(kms, old_state);

	}

drivers/gpu/drm/msm/msm_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev, 
		}

	}



	if (num_planes > ARRAY_SIZE(msm_fb->planes)) {

	if (num_planes > ARRAY_SIZE(msm_fb->planes) - 1) {

		ret = -EINVAL;

		goto fail;

	}

drivers/gpu/drm/msm/sde/sde_encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3888,7 +3888,7 @@ static void _sde_encoder_update_master(struct drm_encoder *drm_enc, 


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

		enum sde_enc_split_role prv_role, new_role;

		bool active;

		bool active = false;



		phys = sde_enc->phys_encs[i];

		if (!phys || !phys->ops.update_split_role || !phys->hw_pp)

drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void sde_encoder_phys_vid_vblank_irq(void *arg, int irq_idx) 
	u32 reset_status = 0;

	int new_cnt = -1, old_cnt = -1;

	u32 event = 0;

	int pend_ret_fence_cnt;

	int pend_ret_fence_cnt = 0;



	if (!phys_enc)

		return;