Unverified Commit 6f369928 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7557 [sync] PR-7520: drm/i915/gt: Reset queue_priority_hint on parking 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7520 
 
PR sync from: Wenyu Huang <huangwenyu5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/23ZAKL3LSXGFEPWJ4QCUH6YA7L3VH6Z2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L5FX 
 
Link:https://gitee.com/openeuler/kernel/pulls/7557

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 10c16b53 7bd658ec

drivers/gpu/drm/i915/gt/intel_engine_pm.c

+0 −3
Original line number Diff line number Diff line
@@ -250,9 +250,6 @@ static int __engine_park(struct intel_wakeref *wf) 
	intel_engine_park_heartbeat(engine);

	intel_breadcrumbs_park(engine->breadcrumbs);



	/* Must be reset upon idling, or we may miss the busy wakeup. */

	GEM_BUG_ON(engine->execlists.queue_priority_hint != INT_MIN);



	if (engine->park)

		engine->park(engine);

drivers/gpu/drm/i915/gt/intel_lrc.c

+3 −0
Original line number Diff line number Diff line
@@ -5032,6 +5032,9 @@ static void execlists_park(struct intel_engine_cs *engine) 
{

	cancel_timer(&engine->execlists.timer);

	cancel_timer(&engine->execlists.preempt);



	/* Reset upon idling, or we may delay the busy wakeup. */

	WRITE_ONCE(engine->execlists.queue_priority_hint, INT_MIN);

}



void intel_execlists_set_default_submission(struct intel_engine_cs *engine)