After the latest CI_DRM has been build, re-test should be enough. Tomi > From: De Marchi, Lucas <lucas.demarchi@xxxxxxxxx> > On Thu, Mar 31, 2022 at 08:28:09AM +0000, Tomi Sarvela wrote: > >The latest CI_DRM built is 11416; after that, there is build error: > >drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c: In function > 'amdgpu_gtt_mgr_recover': > >drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c:200:31: error: 'struct > ttm_range_mgr_node' has no member named 'tbo' > > amdgpu_ttm_recover_gart(node->tbo); > > ^~ > > CC [M] drivers/net/ethernet/intel/igb/e1000_mbx.o > >scripts/Makefile.build:288: recipe for target > 'drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.o' failed > > just fixed that > > > > >The patch is applied against latest working build commit. Can you try your > patch against > > CI_DRM_11416 1dc2c6953e2689a0e5b7cca8450da14059d35f03 > >and see if you get the same error? > > so maybe just a re-trigger should work? > > Lucas De Marchi > > > > >Tomi > > > >> From: Nikula, Jani <jani.nikula@xxxxxxxxx> > >> > >> On Wed, 30 Mar 2022, Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> > >> wrote: > >> > == Series Details == > >> > > >> > Series: series starting with [RESEND,1/3] drm/i915/dmc: abstract GPU > error > >> state dump > >> > URL : https://patchwork.freedesktop.org/series/101957/ > >> > State : failure > >> > >> I don't get why this doesn't apply. > >> > >> It applies for me. > >> > >> > >> BR, > >> Jani. > >> > >> > >> > > >> > == Summary == > >> > > >> > Applying: drm/i915/dmc: abstract GPU error state dump > >> > Using index info to reconstruct a base tree... > >> > M drivers/gpu/drm/i915/display/intel_dmc.c > >> > M drivers/gpu/drm/i915/display/intel_dmc.h > >> > M drivers/gpu/drm/i915/i915_gpu_error.c > >> > Falling back to patching base and 3-way merge... > >> > Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c > >> > Auto-merging drivers/gpu/drm/i915/display/intel_dmc.h > >> > CONFLICT (content): Merge conflict in > >> drivers/gpu/drm/i915/display/intel_dmc.h > >> > Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c > >> > CONFLICT (content): Merge conflict in > >> drivers/gpu/drm/i915/display/intel_dmc.c > >> > error: Failed to merge in the changes. > >> > hint: Use 'git am --show-current-patch=diff' to see the failed patch > >> > Patch failed at 0001 drm/i915/dmc: abstract GPU error state dump > >> > When you have resolved this problem, run "git am --continue". > >> > If you prefer to skip this patch, run "git am --skip" instead. > >> > To restore the original branch and stop patching, run "git am --abort". > >> > > >> > > >> > >> -- > >> Jani Nikula, Intel Open Source Graphics Center
