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

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

Merge "drm/msm/sde: disable vblank irqs before triggering panic"

parents cf54bfd6 fd6c62ed

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

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static int _sde_encoder_phys_cmd_handle_ppdone_timeout( 


		SDE_EVT32(DRMID(phys_enc->parent), SDE_EVTLOG_FATAL);



		sde_encoder_helper_unregister_irq(phys_enc, INTR_IDX_RDPTR);

		SDE_DBG_DUMP("sde", "dsi0_ctrl", "dsi0_phy", "dsi1_ctrl",

				"dsi1_phy", "vbif", "dbg_bus",

				"vbif_dbg_bus", "panic");

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

+1 −0
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ static void sde_encoder_phys_vid_prepare_for_kickoff( 
	if (rc) {

		SDE_ERROR_VIDENC(vid_enc, "ctl %d reset failure: %d\n",

				ctl->idx, rc);

		sde_encoder_helper_unregister_irq(phys_enc, INTR_IDX_VSYNC);

		SDE_DBG_DUMP("panic");

	}