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.
