[Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Christian König]

Hi guys,

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
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.

This also happens on a fresh clean install of dim, so I'm pretty sure 
that this isn't a problem on my side.

What can we do?

Thanks,
Christian.

Ongoing failure for "dim rebuild-tip"

[Christian König]

Hi guys,

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
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.

This also happens on a fresh clean install of dim, so I'm pretty sure 
that this isn't a problem on my side.

What can we do?

Thanks,
Christian.

Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Thomas Zimmermann]

[-- Attachment #1.1.1: Type: text/plain, Size: 1171 bytes --]

Hi

Am 18.01.23 um 10:13 schrieb Christian König:
> Hi guys,
> 
> 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
> 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.
> 
> This also happens on a fresh clean install of dim, so I'm pretty sure 
> that this isn't a problem on my side.
> 
> What can we do?

Just blindly guessing:

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

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/).

Best regards
Thomas

> 
> 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

[-- Attachment #1.1.2: drm-intel-gt-next.patch --]
[-- Type: text/x-patch, Size: 1112 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: Ongoing failure for "dim rebuild-tip"

[Thomas Zimmermann]

[-- Attachment #1.1.1: Type: text/plain, Size: 1171 bytes --]

Hi

Am 18.01.23 um 10:13 schrieb Christian König:
> Hi guys,
> 
> 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
> 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.
> 
> This also happens on a fresh clean install of dim, so I'm pretty sure 
> that this isn't a problem on my side.
> 
> What can we do?

Just blindly guessing:

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

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/).

Best regards
Thomas

> 
> 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

[-- Attachment #1.1.2: drm-intel-gt-next.patch --]
[-- Type: text/x-patch, Size: 1112 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Christian König]

Am 18.01.23 um 10:29 schrieb Thomas Zimmermann:
> Hi
>
> Am 18.01.23 um 10:13 schrieb Christian König:
>> Hi guys,
>>
>> 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
>> 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.
>>
>> This also happens on a fresh clean install of dim, so I'm pretty sure 
>> that this isn't a problem on my side.
>>
>> What can we do?
>
> Just blindly guessing:
>
> Are you sure you don't have any old fix-up patches somewhere?

I don't think so.

>
> 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/).

Yeah, I have that one under drm-rerere/fixups/ as well and it's the only 
file there (except for .gitkeep).

I will try a fresh install once more.

Thanks,
Christian.

>
> Best regards
> Thomas
>
>>
>> Thanks,
>> Christian.
>

Re: Ongoing failure for "dim rebuild-tip"

[Christian König]

Am 18.01.23 um 10:29 schrieb Thomas Zimmermann:
> Hi
>
> Am 18.01.23 um 10:13 schrieb Christian König:
>> Hi guys,
>>
>> 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
>> 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.
>>
>> This also happens on a fresh clean install of dim, so I'm pretty sure 
>> that this isn't a problem on my side.
>>
>> What can we do?
>
> Just blindly guessing:
>
> Are you sure you don't have any old fix-up patches somewhere?

I don't think so.

>
> 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/).

Yeah, I have that one under drm-rerere/fixups/ as well and it's the only 
file there (except for .gitkeep).

I will try a fresh install once more.

Thanks,
Christian.

>
> Best regards
> Thomas
>
>>
>> Thanks,
>> Christian.
>

Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Christian König]

Hi guys,

after analyzing this a bit more I think what happened that the patch 
"drm/i915: improve the catch-all evict to handle lock contention" came 
into drm-tip through both the drm-intel-gt-next and drm-intel-next tree.

It looks like this somehow worked for some people while it broke for me 
(and a few other systems I have access to).

What I've did now is to fix this up as best as I could and then used 
"dim rebuild-tip" to push the conflict resolution for this case.

Fingers crossed that I didn't messed it up.

Regards,
Christian.

Am 18.01.23 um 10:32 schrieb Christian König:
> Am 18.01.23 um 10:29 schrieb Thomas Zimmermann:
>> Hi
>>
>> Am 18.01.23 um 10:13 schrieb Christian König:
>>> Hi guys,
>>>
>>> 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
>>> 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.
>>>
>>> This also happens on a fresh clean install of dim, so I'm pretty 
>>> sure that this isn't a problem on my side.
>>>
>>> What can we do?
>>
>> Just blindly guessing:
>>
>> Are you sure you don't have any old fix-up patches somewhere?
>
> I don't think so.
>
>>
>> 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/).
>
> Yeah, I have that one under drm-rerere/fixups/ as well and it's the 
> only file there (except for .gitkeep).
>
> I will try a fresh install once more.
>
> Thanks,
> Christian.
>
>>
>> Best regards
>> Thomas
>>
>>>
>>> Thanks,
>>> Christian.
>>
>

Re: Ongoing failure for "dim rebuild-tip"

[Christian König]

Hi guys,

after analyzing this a bit more I think what happened that the patch 
"drm/i915: improve the catch-all evict to handle lock contention" came 
into drm-tip through both the drm-intel-gt-next and drm-intel-next tree.

It looks like this somehow worked for some people while it broke for me 
(and a few other systems I have access to).

What I've did now is to fix this up as best as I could and then used 
"dim rebuild-tip" to push the conflict resolution for this case.

Fingers crossed that I didn't messed it up.

Regards,
Christian.

Am 18.01.23 um 10:32 schrieb Christian König:
> Am 18.01.23 um 10:29 schrieb Thomas Zimmermann:
>> Hi
>>
>> Am 18.01.23 um 10:13 schrieb Christian König:
>>> Hi guys,
>>>
>>> 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
>>> 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.
>>>
>>> This also happens on a fresh clean install of dim, so I'm pretty 
>>> sure that this isn't a problem on my side.
>>>
>>> What can we do?
>>
>> Just blindly guessing:
>>
>> Are you sure you don't have any old fix-up patches somewhere?
>
> I don't think so.
>
>>
>> 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/).
>
> Yeah, I have that one under drm-rerere/fixups/ as well and it's the 
> only file there (except for .gitkeep).
>
> I will try a fresh install once more.
>
> Thanks,
> Christian.
>
>>
>> Best regards
>> Thomas
>>
>>>
>>> Thanks,
>>> Christian.
>>
>

Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Jani Nikula]

On Wed, 18 Jan 2023, Christian König <christian.koenig@amd.com> wrote:
> Hi guys,
>
> 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
> 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.
>
> This also happens on a fresh clean install of dim, so I'm pretty sure 
> that this isn't a problem on my side.
>
> What can we do?

I think you should probably try to update your git. Looks like you're
using git version 2.25.1, and over the past year most people have been
using 2.34.1 or later.

There can be subtle differences either in the merge conflicts or in the
recorded conflict resolutions (git rerere) between git versions, and
sometimes a resolution from one can't be reused in another.

If we knew which exact versions we require, we could add a check in
dim. Maybe we should just randomly warn about older than
2.34.1. *shrug*.


BR,
Jani.


-- 
Jani Nikula, Intel Open Source Graphics Center

Re: Ongoing failure for "dim rebuild-tip"

[Jani Nikula]

On Wed, 18 Jan 2023, Christian König <christian.koenig@amd.com> wrote:
> Hi guys,
>
> 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
> 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.
>
> This also happens on a fresh clean install of dim, so I'm pretty sure 
> that this isn't a problem on my side.
>
> What can we do?

I think you should probably try to update your git. Looks like you're
using git version 2.25.1, and over the past year most people have been
using 2.34.1 or later.

There can be subtle differences either in the merge conflicts or in the
recorded conflict resolutions (git rerere) between git versions, and
sometimes a resolution from one can't be reused in another.

If we knew which exact versions we require, we could add a check in
dim. Maybe we should just randomly warn about older than
2.34.1. *shrug*.


BR,
Jani.


-- 
Jani Nikula, Intel Open Source Graphics Center

Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip"

[Christian König]

Am 18.01.23 um 12:16 schrieb Jani Nikula:
> On Wed, 18 Jan 2023, Christian König <christian.koenig@amd.com> wrote:
>> Hi guys,
>>
>> 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
>> 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.
>>
>> This also happens on a fresh clean install of dim, so I'm pretty sure
>> that this isn't a problem on my side.
>>
>> What can we do?
> I think you should probably try to update your git. Looks like you're
> using git version 2.25.1, and over the past year most people have been
> using 2.34.1 or later.
>
> There can be subtle differences either in the merge conflicts or in the
> recorded conflict resolutions (git rerere) between git versions, and
> sometimes a resolution from one can't be reused in another.
>
> If we knew which exact versions we require, we could add a check in
> dim. Maybe we should just randomly warn about older than
> 2.34.1. *shrug*.

Ah! Thanks a lot for that hint, yes that explains it.

All the systems where I had this phenomena where Ubuntu 20.04 based 
(which uses git 2.25.1), the ones with Ubuntu 22.04 where unaffected.

Good to know,
Christian.

>
>
> BR,
> Jani.
>
>

Re: Ongoing failure for "dim rebuild-tip"

[Christian König]

Am 18.01.23 um 12:16 schrieb Jani Nikula:
> On Wed, 18 Jan 2023, Christian König <christian.koenig@amd.com> wrote:
>> Hi guys,
>>
>> 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
>> 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.
>>
>> This also happens on a fresh clean install of dim, so I'm pretty sure
>> that this isn't a problem on my side.
>>
>> What can we do?
> I think you should probably try to update your git. Looks like you're
> using git version 2.25.1, and over the past year most people have been
> using 2.34.1 or later.
>
> There can be subtle differences either in the merge conflicts or in the
> recorded conflict resolutions (git rerere) between git versions, and
> sometimes a resolution from one can't be reused in another.
>
> If we knew which exact versions we require, we could add a check in
> dim. Maybe we should just randomly warn about older than
> 2.34.1. *shrug*.

Ah! Thanks a lot for that hint, yes that explains it.

All the systems where I had this phenomena where Ubuntu 20.04 based 
(which uses git 2.25.1), the ones with Ubuntu 22.04 where unaffected.

Good to know,
Christian.

>
>
> BR,
> Jani.
>
>

[Intel-gfx] ✗ Fi.CI.BUILD: failure for Ongoing failure for "dim rebuild-tip"

[Patchwork]

== Series Details ==

Series: Ongoing failure for "dim rebuild-tip"
URL   : https://patchwork.freedesktop.org/series/113007/
State : failure

== Summary ==

Error: make failed
  CALL    scripts/checksyscalls.sh
  DESCEND objtool
  CC [M]  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.o
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c: In function ‘intel_uc_fw_fetch’:
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:706:8: error: implicit declaration of function ‘try_firmware_load’ [-Werror=implicit-function-declaration]
  706 |  err = try_firmware_load(uc_fw, &fw);
      |        ^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[5]: *** [scripts/Makefile.build:252: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.o] Error 1
make[4]: *** [scripts/Makefile.build:504: drivers/gpu/drm/i915] Error 2
make[3]: *** [scripts/Makefile.build:504: drivers/gpu/drm] Error 2
make[2]: *** [scripts/Makefile.build:504: drivers/gpu] Error 2
make[1]: *** [scripts/Makefile.build:504: drivers] Error 2
make: *** [Makefile:2008: .] Error 2