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

Commit 79ad3ade authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9025759e on remote branch 

Change-Id: Ie4d7be59f4401d64ebe46aa5bd2858e2e7373c3b
parents 2fc201b7 9025759e

msm/msm_drv.c

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

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -886,13 +886,13 @@ static int msm_drm_component_init(struct device *dev) 
		}

	}



	drm_mode_config_reset(ddev);



	ret = drm_dev_register(ddev, 0);

	if (ret)

		goto fail;

	priv->registered = true;



	drm_mode_config_reset(ddev);



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

		ret = kms->funcs->cont_splash_config(kms, NULL);

		if (ret) {

msm/sde/sde_encoder_phys_wb.c

+4 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__
@@ -1328,6 +1328,9 @@ static int _sde_encoder_phys_wb_wait_for_commit_done( 
		_sde_encoder_phys_wb_frame_done_helper(wb_enc, false);

	}



	if (atomic_read(&phys_enc->pending_retire_fence_cnt) > 1)

		wait_info.count_check = 1;



	wait_info.wq = &phys_enc->pending_kickoff_wq;

	wait_info.atomic_cnt = &phys_enc->pending_retire_fence_cnt;

	wait_info.timeout_ms = max_t(u32, wb_enc->wbdone_timeout,

msm/sde/sde_hw_util.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ void sde_reg_write(struct sde_hw_blk_reg_map *c, 
	if (c->log_mask & sde_hw_util_log_mask)

		SDE_DEBUG_DRIVER("[%s:0x%X] <= 0x%X\n",

				name, c->blk_off + reg_off, val);

	SDE_EVT32_REGWRITE(c->blk_off, reg_off, val);

	writel_relaxed(val, c->base_off + c->blk_off + reg_off);

	SDE_REG_LOG(c->log_mask ? ilog2(c->log_mask)+1 : 0,

			val, c->blk_off + reg_off);

msm/sde_dbg.c

+145 −4027

File changed.

Preview size limit exceeded, changes collapsed.

msm/sde_dbg.h

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ enum sde_dbg_evtlog_flag { 
	SDE_EVTLOG_IRQ = BIT(1),

	SDE_EVTLOG_VERBOSE = BIT(2),

	SDE_EVTLOG_EXTERNAL = BIT(3),

	SDE_EVTLOG_REGWRITE = BIT(4),

	SDE_EVTLOG_ALWAYS = -1

};
@@ -200,6 +201,13 @@ extern struct sde_dbg_reglog *sde_dbg_base_reglog; 
#define SDE_EVT32_EXTERNAL(...) sde_evtlog_log(sde_dbg_base_evtlog, __func__, \

		__LINE__, SDE_EVTLOG_EXTERNAL, ##__VA_ARGS__, \

		SDE_EVTLOG_DATA_LIMITER)

/**

 * SDE_EVT32_REGWRITE - Write a list of 32bit values for register writes logging

 * ... - variable arguments

 */

#define SDE_EVT32_REGWRITE(...) sde_evtlog_log(sde_dbg_base_evtlog, __func__, \

		__LINE__, SDE_EVTLOG_REGWRITE, ##__VA_ARGS__, \

		SDE_EVTLOG_DATA_LIMITER)



/**

 * SDE_DBG_DUMP - trigger dumping of all sde_dbg facilities