Re: Ongoing failure for "dim rebuild-tip"

[Thomas Zimmermann]

Hi

Am 18.01.23 um 10:13 schrieb Christian König:

Hi guys,




dim:
dim: FAILURE: Could not merge drm-intel/drm-intel-gt-next
dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
dim: in the drm-tip.rst documentation for how to handle this situation.



What can we do?

for a couple of weeks now the command "dim rebuild-tip" fails for me. The error message is: Merging drm-intel/drm-intel-gt-next... Applying manual fixup patch for drm-tip merge... patching file drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c This also happens on a fresh clean install of dim, so I'm pretty sure that this isn't a problem on my side.

Just blindly guessing:

Are you sure you don't have any old fix-up patches somewhere?



Best regards
Thomas

I've not seen this problem. But I've found a fix-up patch in my tree. Maybe the attachment fixes the problem for you? (goes into drm-rerere/fixups/).

Thanks,
Christian.

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 3853f9f1b9c5..65672ff82605 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -701,32 +701,6 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **
 	return 0;
 }
 
-static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware **fw)
-{
-	struct intel_gt *gt = __uc_fw_to_gt(uc_fw);
-	struct device *dev = gt->i915->drm.dev;
-	int err;
-
-	err = firmware_request_nowarn(fw, uc_fw->file_selected.path, dev);
-
-	if (err)
-		return err;
-
-	if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {
-		drm_err(&gt->i915->drm,
-			"%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",
-			intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,
-			(*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
-
-		/* try to find another blob to load */
-		release_firmware(*fw);
-		*fw = NULL;
-		return -ENOENT;
-	}
-
-	return 0;
-}
-
 /**
  * intel_uc_fw_fetch - fetch uC firmware
  * @uc_fw: uC firmware

OpenPGP_signature
Description: OpenPGP digital signature