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

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

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



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

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-3-piotr.piorkowski@intel.com
parent 24d891d8

drivers/gpu/drm/i915/intel_guc.c

+14 −8
Original line number Diff line number Diff line
@@ -227,6 +227,19 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc) 
	return flags;

}



static u32 guc_ctl_feature_flags(struct intel_guc *guc)

{

	u32 flags = 0;



	flags |=  GUC_CTL_VCS2_ENABLED;



	if (USES_GUC_SUBMISSION(guc_to_i915(guc)))

		flags |= GUC_CTL_KERNEL_SUBMISSIONS;

	else

		flags |= GUC_CTL_DISABLE_SCHEDULER;



	return flags;

}

/*

 * Initialise the GuC parameter block before starting the firmware

 * transfer. These parameters are read by the firmware on startup
@@ -250,9 +263,7 @@ void intel_guc_init_params(struct intel_guc *guc) 


	params[GUC_CTL_WA] |= GUC_CTL_WA_UK_BY_DRIVER;



	params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER |

			GUC_CTL_VCS2_ENABLED;



	params[GUC_CTL_FEATURE] = guc_ctl_feature_flags(guc);

	params[GUC_CTL_LOG_PARAMS] = guc->log.flags;



	params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc);
@@ -265,11 +276,6 @@ void intel_guc_init_params(struct intel_guc *guc) 
		pgs >>= PAGE_SHIFT;

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

			(ctx_in_16 << GUC_CTL_CTXNUM_IN16_SHIFT);



		params[GUC_CTL_FEATURE] |= GUC_CTL_KERNEL_SUBMISSIONS;



		/* Unmask this bit to enable the GuC's internal scheduler */

		params[GUC_CTL_FEATURE] &= ~GUC_CTL_DISABLE_SCHEDULER;

	}



	/*