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

Commit e958cc90 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Always ask GuC to update power domain states 



With newer GuC firmware it is always ok to ask GuC to update power
domain states. Make it an unconditional initialization step.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarJohn Spotswood <john.a.spotswood@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-6-michal.wajdeczko@intel.com
parent 386e300f

drivers/gpu/drm/i915/intel_guc_submission.c

+0 −4
Original line number Diff line number Diff line
@@ -1426,10 +1426,6 @@ int intel_guc_submission_enable(struct intel_guc *guc) 


	GEM_BUG_ON(!guc->execbuf_client);



	err = intel_guc_sample_forcewake(guc);

	if (err)

		return err;



	err = guc_clients_enable(guc);

	if (err)

		return err;

drivers/gpu/drm/i915/intel_uc.c

+4 −4
Original line number Diff line number Diff line
@@ -439,12 +439,12 @@ int intel_uc_init_hw(struct drm_i915_private *i915) 
			goto err_communication;

	}



	if (USES_GUC_SUBMISSION(i915)) {

		ret = intel_guc_submission_enable(guc);

	ret = intel_guc_sample_forcewake(guc);

	if (ret)

		goto err_communication;

	} else if (INTEL_GEN(i915) < 11) {

		ret = intel_guc_sample_forcewake(guc);



	if (USES_GUC_SUBMISSION(i915)) {

		ret = intel_guc_submission_enable(guc);

		if (ret)

			goto err_communication;

	}