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

Commit 328284e6 authored by Mohit Sharma's avatar Mohit Sharma
Browse files

Diff patch between mainline and release branch. 



Change-Id: I2382cf884b3d15767a8441bd5b537197f3aeb9a0
Signed-off-by: default avatarMohit Sharma <smohit@codeaurora.org>
parent ca1447b8

drivers/gpu/msm/adreno_a6xx_preempt.c

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ void a6xx_preemption_context_destroy(struct kgsl_context *context) 
	gpumem_free_entry(context->user_ctxt_record);



	/* Put the extra ref from gpumem_alloc_entry() */

	kgsl_mem_entry_put(context->user_ctxt_record);

	kgsl_mem_entry_put_deferred(context->user_ctxt_record);

}



int a6xx_preemption_context_init(struct kgsl_context *context)

drivers/platform/msm/ipa/ipa_v3/ipa.c

+18 −0
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ static void ipa_dec_clients_disable_clks_on_wq(struct work_struct *work); 
static DECLARE_DELAYED_WORK(ipa_dec_clients_disable_clks_on_wq_work,

	ipa_dec_clients_disable_clks_on_wq);



static void ipa_inc_clients_enable_clks_on_wq(struct work_struct *work);

static DECLARE_WORK(ipa_inc_clients_enable_clks_on_wq_work,

	ipa_inc_clients_enable_clks_on_wq);



static int ipa3_ioctl_add_rt_rule_v2(unsigned long arg);

static int ipa3_ioctl_add_rt_rule_ext_v2(unsigned long arg);

static int ipa3_ioctl_add_rt_rule_after_v2(unsigned long arg);
@@ -5031,6 +5035,12 @@ void ipa3_inc_client_enable_clks(struct ipa_active_client_logging_info *id) 
	mutex_unlock(&ipa3_ctx->ipa3_active_clients.mutex);

}



void ipa3_handle_gsi_differ_irq(void)

{

	queue_work(ipa3_ctx->power_mgmt_wq,

		&ipa_inc_clients_enable_clks_on_wq_work);

}



/**

 * ipa3_active_clks_status() - update the current msm bus clock vote

 * status
@@ -5147,6 +5157,13 @@ static void ipa_dec_clients_disable_clks_on_wq(struct work_struct *work) 
	__ipa3_dec_client_disable_clks();

}



static void ipa_inc_clients_enable_clks_on_wq(struct work_struct *work)

{

	ipa3_enable_clks();

	IPAERR("unexpected clk access, clock on IPA to save reg");

	ipa_assert();

}



/**

 * ipa3_dec_client_disable_clks_no_block() - Decrease active clients counter

 * if possible without blocking. If this is the last client then the desrease
@@ -5942,6 +5959,7 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p, 
	gsi_props.req_clk_cb = NULL;

	gsi_props.rel_clk_cb = NULL;

	gsi_props.clk_status_cb = ipa3_active_clks_status;

	gsi_props.enable_clk_bug_on = ipa3_handle_gsi_differ_irq;



	if (ipa3_ctx->ipa_config_is_mhi) {

		gsi_props.mhi_er_id_limits_valid = true;