Commit dd6e38df authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Chris Wilson
Browse files

drm/i915: Fix i915_inject_load_error() name to read *_probe_* 



Commit 50d84418 ("drm/i915: Add i915 to i915_inject_probe_failure")
introduced new functions unfortunately named incompatibly with rules
established by commit f2db53f1 ("drm/i915: Replace "_load" with
"_probe" consequently").  Fix it for consistency.

Suggested-by: default avatarMichał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Michał Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Piotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
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/20191029102036.6326-2-janusz.krzysztofik@linux.intel.com
parent 7f9d4c08

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ int intel_guc_submission_enable(struct intel_guc *guc) 
	enum intel_engine_id id;

	int err;



	err = i915_inject_load_error(gt->i915, -ENXIO);

	err = i915_inject_probe_error(gt->i915, -ENXIO);

	if (err)

		return err;

drivers/gpu/drm/i915/gt/uc/intel_huc.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int intel_huc_rsa_data_create(struct intel_huc *huc) 
	void *vaddr;

	int err;



	err = i915_inject_load_error(gt->i915, -ENXIO);

	err = i915_inject_probe_error(gt->i915, -ENXIO);

	if (err)

		return err;
@@ -161,7 +161,7 @@ int intel_huc_auth(struct intel_huc *huc) 
	if (!intel_uc_fw_is_loaded(&huc->fw))

		return -ENOEXEC;



	ret = i915_inject_load_error(gt->i915, -ENXIO);

	ret = i915_inject_probe_error(gt->i915, -ENXIO);

	if (ret)

		goto fail;

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static int __intel_uc_reset_hw(struct intel_uc *uc) 
	int ret;

	u32 guc_status;



	ret = i915_inject_load_error(gt->i915, -ENXIO);

	ret = i915_inject_probe_error(gt->i915, -ENXIO);

	if (ret)

		return ret;
@@ -197,7 +197,7 @@ static int guc_enable_communication(struct intel_guc *guc) 


	GEM_BUG_ON(guc_communication_enabled(guc));



	ret = i915_inject_load_error(i915, -ENXIO);

	ret = i915_inject_probe_error(i915, -ENXIO);

	if (ret)

		return ret;
@@ -372,7 +372,7 @@ static int uc_init_wopcm(struct intel_uc *uc) 
	GEM_BUG_ON(!(size & GUC_WOPCM_SIZE_MASK));

	GEM_BUG_ON(size & ~GUC_WOPCM_SIZE_MASK);



	err = i915_inject_load_error(gt->i915, -ENXIO);

	err = i915_inject_probe_error(gt->i915, -ENXIO);

	if (err)

		return err;

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

+11 −9
Original line number Diff line number Diff line
@@ -220,29 +220,31 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw, 
{

	bool user = e == -EINVAL;



	if (i915_inject_load_error(i915, e)) {

	if (i915_inject_probe_error(i915, e)) {

		/* non-existing blob */

		uc_fw->path = "<invalid>";

		uc_fw->user_overridden = user;

	} else if (i915_inject_load_error(i915, e)) {

	} else if (i915_inject_probe_error(i915, e)) {

		/* require next major version */

		uc_fw->major_ver_wanted += 1;

		uc_fw->minor_ver_wanted = 0;

		uc_fw->user_overridden = user;

	} else if (i915_inject_load_error(i915, e)) {

	} else if (i915_inject_probe_error(i915, e)) {

		/* require next minor version */

		uc_fw->minor_ver_wanted += 1;

		uc_fw->user_overridden = user;

	} else if (uc_fw->major_ver_wanted && i915_inject_load_error(i915, e)) {

	} else if (uc_fw->major_ver_wanted &&

		   i915_inject_probe_error(i915, e)) {

		/* require prev major version */

		uc_fw->major_ver_wanted -= 1;

		uc_fw->minor_ver_wanted = 0;

		uc_fw->user_overridden = user;

	} else if (uc_fw->minor_ver_wanted && i915_inject_load_error(i915, e)) {

	} else if (uc_fw->minor_ver_wanted &&

		   i915_inject_probe_error(i915, e)) {

		/* require prev minor version - hey, this should work! */

		uc_fw->minor_ver_wanted -= 1;

		uc_fw->user_overridden = user;

	} else if (user && i915_inject_load_error(i915, e)) {

	} else if (user && i915_inject_probe_error(i915, e)) {

		/* officially unsupported platform */

		uc_fw->major_ver_wanted = 0;

		uc_fw->minor_ver_wanted = 0;
@@ -271,7 +273,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw, struct drm_i915_private *i915) 
	GEM_BUG_ON(!i915->wopcm.size);

	GEM_BUG_ON(!intel_uc_fw_is_enabled(uc_fw));



	err = i915_inject_load_error(i915, -ENXIO);

	err = i915_inject_probe_error(i915, -ENXIO);

	if (err)

		return err;
@@ -432,7 +434,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, struct intel_gt *gt, 
	u64 offset;

	int ret;



	ret = i915_inject_load_error(gt->i915, -ETIMEDOUT);

	ret = i915_inject_probe_error(gt->i915, -ETIMEDOUT);

	if (ret)

		return ret;
@@ -493,7 +495,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, struct intel_gt *gt, 
	/* make sure the status was cleared the last time we reset the uc */

	GEM_BUG_ON(intel_uc_fw_is_loaded(uc_fw));



	err = i915_inject_load_error(gt->i915, -ENOEXEC);

	err = i915_inject_probe_error(gt->i915, -ENOEXEC);

	if (err)

		return err;

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -1300,11 +1300,11 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
	if (ret)

		goto err_gt;



	ret = i915_inject_load_error(dev_priv, -ENODEV);

	ret = i915_inject_probe_error(dev_priv, -ENODEV);

	if (ret)

		goto err_gt;



	ret = i915_inject_load_error(dev_priv, -EIO);

	ret = i915_inject_probe_error(dev_priv, -EIO);

	if (ret)

		goto err_gt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE