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

Commit 31be2a9b authored by Package Warehouse Build User's avatar Package Warehouse Build User Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: add dsi debug bus control register list" into dev/msm-4.14-display

parents 717cdf0a d40d29fc

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

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -597,7 +597,7 @@ static int _sde_encoder_phys_cmd_handle_ppdone_timeout( 
		sde_connector_event_notify(conn, DRM_EVENT_SDE_HW_RECOVERY,

				sizeof(uint8_t), event);

	} else if (cmd_enc->pp_timeout_report_cnt) {

		SDE_DBG_DUMP("panic");

		SDE_DBG_DUMP("dsi_dbg_bus", "panic");

	}



	/* request a ctl reset before the next kickoff */

drivers/gpu/drm/msm/sde_dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -5157,8 +5157,8 @@ void sde_dbg_init_dbg_buses(u32 hwversion) 
		dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus_msm8998;

		dbg->dbgbus_vbif_rt.cmn.entries_size =

				ARRAY_SIZE(vbif_dbg_bus_msm8998);

		dbg->dbgbus_dsi.entries = NULL;

		dbg->dbgbus_dsi.size = 0;

		dbg->dbgbus_dsi.entries = dsi_dbg_bus_sdm845;

		dbg->dbgbus_dsi.size = ARRAY_SIZE(dsi_dbg_bus_sdm845);

	} else {

		pr_err("unsupported chipset id %X\n", hwversion);

	}