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

Commit 24d891d8 authored by Piotr Piorkowski's avatar Piotr Piorkowski Committed by Chris Wilson
Browse files

drm/i915/guc: Refactoring preparation of the GUC_CTL_DEBUG parameter 



At the moment, the preparation of GUC_CTL_DEBUG is disordered.
Lets move all GUC_CTL_DEBUG related operations to one place.

v2:
- move 'ads' declaration to USES_GUC_SUBMISSION case (Michał Wajdeczko)

Signed-off-by: default avatarPiotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180604141947.8299-2-piotr.piorkowski@intel.com
parent 50935ac7

drivers/gpu/drm/i915/intel_guc.c

+7 −5
Original line number Diff line number Diff line
@@ -217,6 +217,13 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc) 
		flags |= GUC_LOG_LEVEL_TO_VERBOSITY(level) <<

			 GUC_LOG_VERBOSITY_SHIFT;



	if (USES_GUC_SUBMISSION(guc_to_i915(guc))) {

		u32 ads = intel_guc_ggtt_offset(guc, guc->ads_vma)

			>> PAGE_SHIFT;



		flags |= ads << GUC_ADS_ADDR_SHIFT | GUC_ADS_ENABLED;

	}



	return flags;

}
@@ -252,14 +259,9 @@ void intel_guc_init_params(struct intel_guc *guc) 


	/* If GuC submission is enabled, set up additional parameters here */

	if (USES_GUC_SUBMISSION(dev_priv)) {

		u32 ads = intel_guc_ggtt_offset(guc,

						guc->ads_vma) >> PAGE_SHIFT;

		u32 pgs = intel_guc_ggtt_offset(guc, guc->stage_desc_pool);

		u32 ctx_in_16 = GUC_MAX_STAGE_DESCRIPTORS / 16;



		params[GUC_CTL_DEBUG] |= ads << GUC_ADS_ADDR_SHIFT;

		params[GUC_CTL_DEBUG] |= GUC_ADS_ENABLED;



		pgs >>= PAGE_SHIFT;

		params[GUC_CTL_CTXINFO] = (pgs << GUC_CTL_BASE_ADDR_SHIFT) |

			(ctx_in_16 << GUC_CTL_CTXNUM_IN16_SHIFT);