* Not 100% sure if I correctly fixed drm-tip @ 2021-02-11 10:01 Christian König 2021-02-11 14:37 ` Thomas Zimmermann 2021-02-11 15:02 ` Jani Nikula 0 siblings, 2 replies; 8+ messages in thread From: Christian König @ 2021-02-11 10:01 UTC (permalink / raw) To: Daniel Vetter, dri-devel Hi guys, I had a conflict this morning in the ttm pool while pushing an important fix to drm-misc-fixes. I'm not 100% sure if I correctly fixed up drm-tip. How can this be double checked? And how can it be fixed if the merge has gone bad? Thanks, Christian. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-11 10:01 Not 100% sure if I correctly fixed drm-tip Christian König @ 2021-02-11 14:37 ` Thomas Zimmermann 2021-02-11 15:02 ` Jani Nikula 1 sibling, 0 replies; 8+ messages in thread From: Thomas Zimmermann @ 2021-02-11 14:37 UTC (permalink / raw) To: Christian König, Daniel Vetter, dri-devel [-- Attachment #1.1.1: Type: text/plain, Size: 730 bytes --] (cc'ing Jani) Am 11.02.21 um 11:01 schrieb Christian König: > Hi guys, > > I had a conflict this morning in the ttm pool while pushing an important > fix to drm-misc-fixes. > > I'm not 100% sure if I correctly fixed up drm-tip. How can this be > double checked? And how can it be fixed if the merge has gone bad? > > Thanks, > Christian. > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 840 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-11 10:01 Not 100% sure if I correctly fixed drm-tip Christian König 2021-02-11 14:37 ` Thomas Zimmermann @ 2021-02-11 15:02 ` Jani Nikula 2021-02-11 15:27 ` Christian König 1 sibling, 1 reply; 8+ messages in thread From: Jani Nikula @ 2021-02-11 15:02 UTC (permalink / raw) To: Christian König, Daniel Vetter, dri-devel On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: > Hi guys, > > I had a conflict this morning in the ttm pool while pushing an important > fix to drm-misc-fixes. > > I'm not 100% sure if I correctly fixed up drm-tip. How can this be > double checked? And how can it be fixed if the merge has gone bad? I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools") in drm-misc-next, causing the latter to use spin_lock/unlock on a mutex. But while you hit a conflict, it does look like the conflict breaking the build is silent, AFAICT the spinlock part does not conflict. So a fixup patch in drm-rerere is probably needed until there are some backmerges. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-11 15:02 ` Jani Nikula @ 2021-02-11 15:27 ` Christian König 2021-02-11 17:22 ` Daniel Vetter 0 siblings, 1 reply; 8+ messages in thread From: Christian König @ 2021-02-11 15:27 UTC (permalink / raw) To: Jani Nikula, Daniel Vetter, dri-devel Am 11.02.21 um 16:02 schrieb Jani Nikula: > On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: >> Hi guys, >> >> I had a conflict this morning in the ttm pool while pushing an important >> fix to drm-misc-fixes. >> >> I'm not 100% sure if I correctly fixed up drm-tip. How can this be >> double checked? And how can it be fixed if the merge has gone bad? > I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool > shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent > conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global > page pools") in drm-misc-next, causing the latter to use > spin_lock/unlock on a mutex. > > But while you hit a conflict, it does look like the conflict breaking > the build is silent, AFAICT the spinlock part does not conflict. So a > fixup patch in drm-rerere is probably needed until there are some > backmerges. Well exactly that's the issue. I've already had a fixup in drm-rerere for this. But today I've pushed another fix to drm-misc-fixes which also conflicts with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools"). I've fixed this up as well and committed the solution. But dim then complained that the original fixup is now not applicable any more (which is true as far as I know). This somehow went away when I said that dim should assume patch reversal, but I'm not sure if that's the right thing to do. Thanks, Christian. > > > BR, > Jani. > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-11 15:27 ` Christian König @ 2021-02-11 17:22 ` Daniel Vetter 2021-02-12 7:51 ` Christian König 0 siblings, 1 reply; 8+ messages in thread From: Daniel Vetter @ 2021-02-11 17:22 UTC (permalink / raw) To: Christian König; +Cc: dri-devel On Thu, Feb 11, 2021 at 4:27 PM Christian König <christian.koenig@amd.com> wrote: > > > > Am 11.02.21 um 16:02 schrieb Jani Nikula: > > On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: > >> Hi guys, > >> > >> I had a conflict this morning in the ttm pool while pushing an important > >> fix to drm-misc-fixes. > >> > >> I'm not 100% sure if I correctly fixed up drm-tip. How can this be > >> double checked? And how can it be fixed if the merge has gone bad? > > I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool > > shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent > > conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global > > page pools") in drm-misc-next, causing the latter to use > > spin_lock/unlock on a mutex. > > > > But while you hit a conflict, it does look like the conflict breaking > > the build is silent, AFAICT the spinlock part does not conflict. So a > > fixup patch in drm-rerere is probably needed until there are some > > backmerges. > > Well exactly that's the issue. I've already had a fixup in drm-rerere > for this. > > But today I've pushed another fix to drm-misc-fixes which also conflicts > with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools"). > > I've fixed this up as well and committed the solution. But dim then > complained that the original fixup is now not applicable any more (which > is true as far as I know). > > This somehow went away when I said that dim should assume patch > reversal, but I'm not sure if that's the right thing to do. Nothing, it's all still broken. You need to delete the now unecessary fixup. As a rule, when rebuilding drm-tip failed always try again to confirm that what you've done actually fixed things (since sometimes git can also not remember where to apply the resolution for some odd reasons). I'm fixing this now. -Daniel > > Thanks, > Christian. > > > > > > > BR, > > Jani. > > > > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-11 17:22 ` Daniel Vetter @ 2021-02-12 7:51 ` Christian König 2021-02-12 8:27 ` Daniel Vetter 0 siblings, 1 reply; 8+ messages in thread From: Christian König @ 2021-02-12 7:51 UTC (permalink / raw) To: Daniel Vetter; +Cc: dri-devel Am 11.02.21 um 18:22 schrieb Daniel Vetter: > On Thu, Feb 11, 2021 at 4:27 PM Christian König > <christian.koenig@amd.com> wrote: >> >> >> Am 11.02.21 um 16:02 schrieb Jani Nikula: >>> On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: >>>> Hi guys, >>>> >>>> I had a conflict this morning in the ttm pool while pushing an important >>>> fix to drm-misc-fixes. >>>> >>>> I'm not 100% sure if I correctly fixed up drm-tip. How can this be >>>> double checked? And how can it be fixed if the merge has gone bad? >>> I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool >>> shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent >>> conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global >>> page pools") in drm-misc-next, causing the latter to use >>> spin_lock/unlock on a mutex. >>> >>> But while you hit a conflict, it does look like the conflict breaking >>> the build is silent, AFAICT the spinlock part does not conflict. So a >>> fixup patch in drm-rerere is probably needed until there are some >>> backmerges. >> Well exactly that's the issue. I've already had a fixup in drm-rerere >> for this. >> >> But today I've pushed another fix to drm-misc-fixes which also conflicts >> with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools"). >> >> I've fixed this up as well and committed the solution. But dim then >> complained that the original fixup is now not applicable any more (which >> is true as far as I know). >> >> This somehow went away when I said that dim should assume patch >> reversal, but I'm not sure if that's the right thing to do. > Nothing, it's all still broken. You need to delete the now unecessary > fixup. As a rule, when rebuilding drm-tip failed always try again to > confirm that what you've done actually fixed things (since sometimes > git can also not remember where to apply the resolution for some odd > reasons). My question is how to I remove the fixup now? E.g. where can I find it? Thanks, Christian. > > I'm fixing this now. > -Daniel > >> Thanks, >> Christian. >> >>> >>> BR, >>> Jani. >>> >>> > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-12 7:51 ` Christian König @ 2021-02-12 8:27 ` Daniel Vetter 2021-02-12 8:32 ` Christian König 0 siblings, 1 reply; 8+ messages in thread From: Daniel Vetter @ 2021-02-12 8:27 UTC (permalink / raw) To: Christian König; +Cc: dri-devel On Fri, Feb 12, 2021 at 08:51:19AM +0100, Christian König wrote: > > > Am 11.02.21 um 18:22 schrieb Daniel Vetter: > > On Thu, Feb 11, 2021 at 4:27 PM Christian König > > <christian.koenig@amd.com> wrote: > > > > > > > > > Am 11.02.21 um 16:02 schrieb Jani Nikula: > > > > On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: > > > > > Hi guys, > > > > > > > > > > I had a conflict this morning in the ttm pool while pushing an important > > > > > fix to drm-misc-fixes. > > > > > > > > > > I'm not 100% sure if I correctly fixed up drm-tip. How can this be > > > > > double checked? And how can it be fixed if the merge has gone bad? > > > > I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool > > > > shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent > > > > conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global > > > > page pools") in drm-misc-next, causing the latter to use > > > > spin_lock/unlock on a mutex. > > > > > > > > But while you hit a conflict, it does look like the conflict breaking > > > > the build is silent, AFAICT the spinlock part does not conflict. So a > > > > fixup patch in drm-rerere is probably needed until there are some > > > > backmerges. > > > Well exactly that's the issue. I've already had a fixup in drm-rerere > > > for this. > > > > > > But today I've pushed another fix to drm-misc-fixes which also conflicts > > > with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools"). > > > > > > I've fixed this up as well and committed the solution. But dim then > > > complained that the original fixup is now not applicable any more (which > > > is true as far as I know). > > > > > > This somehow went away when I said that dim should assume patch > > > reversal, but I'm not sure if that's the right thing to do. > > Nothing, it's all still broken. You need to delete the now unecessary > > fixup. As a rule, when rebuilding drm-tip failed always try again to > > confirm that what you've done actually fixed things (since sometimes > > git can also not remember where to apply the resolution for some odd > > reasons). > > My question is how to I remove the fixup now? > > E.g. where can I find it? In the rerere branch under the fixup/ directory. That's also the place where rerere solutions are carried around. I guess docs don't explain this well how drm-tip is rebuilt :-/ -Daniel > > Thanks, > Christian. > > > > > I'm fixing this now. > > -Daniel > > > > > Thanks, > > > Christian. > > > > > > > > > > > BR, > > > > Jani. > > > > > > > > > > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Not 100% sure if I correctly fixed drm-tip 2021-02-12 8:27 ` Daniel Vetter @ 2021-02-12 8:32 ` Christian König 0 siblings, 0 replies; 8+ messages in thread From: Christian König @ 2021-02-12 8:32 UTC (permalink / raw) To: Daniel Vetter; +Cc: dri-devel Am 12.02.21 um 09:27 schrieb Daniel Vetter: > On Fri, Feb 12, 2021 at 08:51:19AM +0100, Christian König wrote: >> >> Am 11.02.21 um 18:22 schrieb Daniel Vetter: >>> On Thu, Feb 11, 2021 at 4:27 PM Christian König >>> <christian.koenig@amd.com> wrote: >>>> >>>> Am 11.02.21 um 16:02 schrieb Jani Nikula: >>>>> On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote: >>>>>> Hi guys, >>>>>> >>>>>> I had a conflict this morning in the ttm pool while pushing an important >>>>>> fix to drm-misc-fixes. >>>>>> >>>>>> I'm not 100% sure if I correctly fixed up drm-tip. How can this be >>>>>> double checked? And how can it be fixed if the merge has gone bad? >>>>> I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool >>>>> shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent >>>>> conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global >>>>> page pools") in drm-misc-next, causing the latter to use >>>>> spin_lock/unlock on a mutex. >>>>> >>>>> But while you hit a conflict, it does look like the conflict breaking >>>>> the build is silent, AFAICT the spinlock part does not conflict. So a >>>>> fixup patch in drm-rerere is probably needed until there are some >>>>> backmerges. >>>> Well exactly that's the issue. I've already had a fixup in drm-rerere >>>> for this. >>>> >>>> But today I've pushed another fix to drm-misc-fixes which also conflicts >>>> with ba051901d10f ("drm/ttm: add a debugfs file for the global page pools"). >>>> >>>> I've fixed this up as well and committed the solution. But dim then >>>> complained that the original fixup is now not applicable any more (which >>>> is true as far as I know). >>>> >>>> This somehow went away when I said that dim should assume patch >>>> reversal, but I'm not sure if that's the right thing to do. >>> Nothing, it's all still broken. You need to delete the now unecessary >>> fixup. As a rule, when rebuilding drm-tip failed always try again to >>> confirm that what you've done actually fixed things (since sometimes >>> git can also not remember where to apply the resolution for some odd >>> reasons). >> My question is how to I remove the fixup now? >> >> E.g. where can I find it? > In the rerere branch under the fixup/ directory. That's also the place > where rerere solutions are carried around. I guess docs don't explain this > well how drm-tip is rebuilt :-/ Ok found it. drm-tip looks clean now again. Thanks, Christian. > -Daniel >> Thanks, >> Christian. >> >>> I'm fixing this now. >>> -Daniel >>> >>>> Thanks, >>>> Christian. >>>> >>>>> BR, >>>>> Jani. >>>>> >>>>> _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-02-12 8:33 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-02-11 10:01 Not 100% sure if I correctly fixed drm-tip Christian König 2021-02-11 14:37 ` Thomas Zimmermann 2021-02-11 15:02 ` Jani Nikula 2021-02-11 15:27 ` Christian König 2021-02-11 17:22 ` Daniel Vetter 2021-02-12 7:51 ` Christian König 2021-02-12 8:27 ` Daniel Vetter 2021-02-12 8:32 ` Christian König
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.