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

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

Merge "drm: msm: update vsync source for sde rsc"

parents fb44a5a8 fa21e00e

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

+1 −1
Original line number Diff line number Diff line
@@ -5315,7 +5315,7 @@ struct drm_encoder *sde_encoder_init( 
	snprintf(name, SDE_NAME_SIZE, "rsc_enc%u", drm_enc->base.id);

	sde_enc->rsc_client = sde_rsc_client_create(SDE_RSC_INDEX, name,

		disp_info->is_primary ? SDE_RSC_PRIMARY_DISP_CLIENT :

		SDE_RSC_EXTERNAL_DISP_CLIENT, intf_index);

		SDE_RSC_EXTERNAL_DISP_CLIENT, intf_index + 1);

	if (IS_ERR_OR_NULL(sde_enc->rsc_client)) {

		SDE_DEBUG("sde rsc client create failed :%ld\n",

						PTR_ERR(sde_enc->rsc_client));

drivers/gpu/drm/msm/sde_rsc.c

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

/*

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

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

 */



#define pr_fmt(fmt)	"[sde_rsc:%s:%d]: " fmt, __func__, __LINE__
@@ -1024,7 +1024,9 @@ int sde_rsc_client_trigger_vote(struct sde_rsc_client *caller_client, 
		rpmh_flush(rsc->rpmh_dev);

	}



	if (rsc->hw_ops.bwi_status && rsc->current_state == SDE_RSC_CMD_STATE)

	if (rsc->hw_ops.bwi_status &&

	    (rsc->current_state == SDE_RSC_CMD_STATE ||

	     rsc->current_state == SDE_RSC_VID_STATE))

		rsc->hw_ops.bwi_status(rsc, bw_increase);

	else if (rsc->hw_ops.tcs_use_ok)

		rsc->hw_ops.tcs_use_ok(rsc);