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

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

drm/i915/uc: Sanitize uC options early 



We are sanitizing uC related modparams together with other driver
modparams in intel_sanitize_options called from i915_driver_init_hw,
but this is too late for us as we will want to use USES_GUC/USES_HUC
macros at earlier stage. Since our sanitizing does not require any
MMIO access, we can do it in intel_uc_init_early right after we resolve
firmware names.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180312130308.22952-2-michal.wajdeczko@intel.com
parent 6f9ec414

drivers/gpu/drm/i915/i915_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,6 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) 
					    i915_modparams.enable_ppgtt);

	DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915_modparams.enable_ppgtt);



	intel_uc_sanitize_options(dev_priv);



	intel_gvt_sanitize_options(dev_priv);

}

drivers/gpu/drm/i915/intel_uc.c

+4 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int __get_default_guc_log_level(struct drm_i915_private *dev_priv) 
}



/**

 * intel_uc_sanitize_options - sanitize uC related modparam options

 * sanitize_options_early - sanitize uC related modparam options

 * @dev_priv: device private

 *

 * In case of "enable_guc" option this function will attempt to modify
@@ -99,7 +99,7 @@ static int __get_default_guc_log_level(struct drm_i915_private *dev_priv) 
 * unless GuC is enabled on given platform and the driver is compiled with

 * debug config when this modparam will default to "enable(1..4)".

 */

void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)

static void sanitize_options_early(struct drm_i915_private *dev_priv)

{

	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;

	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
@@ -163,6 +163,8 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) 
{

	intel_guc_init_early(&dev_priv->guc);

	intel_huc_init_early(&dev_priv->huc);



	sanitize_options_early(dev_priv);

}



void intel_uc_init_fw(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_uc.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "intel_huc.h"

#include "i915_params.h"



void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);

void intel_uc_init_early(struct drm_i915_private *dev_priv);

void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

int intel_uc_register(struct drm_i915_private *dev_priv);