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

Commit 4bf6bb10 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: use "all" option to dump the sde register"

parents 8f80156c 7ca510f7

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

+3 −2
Original line number Diff line number Diff line
@@ -2017,7 +2017,8 @@ void sde_encoder_helper_hw_reset(struct sde_encoder_phys *phys_enc) 
			if (rc) {

				SDE_ERROR_ENC(sde_enc,

						"connector soft reset failure\n");

				SDE_DBG_DUMP("panic");

				SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus",

								"panic");

			}

		}

	}
@@ -2025,7 +2026,7 @@ void sde_encoder_helper_hw_reset(struct sde_encoder_phys *phys_enc) 
	rc = ctl->ops.reset(ctl);

	if (rc) {

		SDE_ERROR_ENC(sde_enc, "ctl %d reset failure\n",  ctl->idx);

		SDE_DBG_DUMP("panic");

		SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");

	}



	phys_enc->enable_state = SDE_ENC_ENABLED;

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

+2 −6
Original line number Diff line number Diff line
@@ -359,9 +359,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");

		SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");

	}



	atomic_add_unless(&phys_enc->pending_kickoff_cnt, -1, 0);
@@ -418,9 +416,7 @@ static int _sde_encoder_phys_cmd_poll_write_pointer_started( 
				phys_enc->hw_pp->idx - PINGPONG_0,

				timeout_us,

				ret);

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

				"dsi1_phy", "vbif_rt", "dbg_bus",

				"vbif_dbg_bus", "panic");

		SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");

	}



	return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ static void sde_encoder_phys_vid_prepare_for_kickoff( 
		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");

		SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");

	}



	programmable_rot_fetch_config(phys_enc, params->inline_rotate_prefill);