* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-11 11:13 ` Joonas Lahtinen
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Lahtinen @ 2021-06-11 11:13 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Maxime Ripard
Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > Pull request for drm-misc-next and drm-intel-gt-next.
> >
> > topic/i915-ttm-2021-06-11:
> > drm-misc and drm-intel pull request for topic/i915-ttm:
> > - Convert i915 lmem handling to ttm.
> > - Add a patch to temporarily add a driver_private member to vma_node.
> > - Use this to allow mixed object mmap handling for i915.
> > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> >
> > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>
> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> we would end up pulling 478 extra commits from drm-next as a result. And
> also causing all the warnings for those commits. I don't think we should
> do that?
>
> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> Should we re-do the topic branch based on that?
This problem seems to come from the fact that only the PR from yesterday
that got merged to drm-next had the dependency patches. The previous
backmerge of drm-next was requested too early.
I've solved this with least hassle by backmerging drm-next again and
then applying the PR to drm-intel-gt-next.
I think drm-misc-next should do the same (exact commit was
1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
Regards, Joonas
> However the DIM docs[1] indeed do say: "For topic branches shared within
> the gpu/drm subsystem, base it on the latest drm-next branch." I think
> the docs don't take into account the current period where drm-next is
> being actively updated as we speak.
>
> Should we update the docs to use 'git merge-base' or something else?
>
> Regards, Joonas
>
> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
>
> >
> > are available in the Git repository at:
> >
> > git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
> >
> > for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
> >
> > drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
> >
> > ----------------------------------------------------------------
> > drm-misc and drm-intel pull request for topic/i915-ttm:
> > - Convert i915 lmem handling to ttm.
> > - Add a patch to temporarily add a driver_private member to vma_node.
> > - Use this to allow mixed object mmap handling for i915.
> >
> > ----------------------------------------------------------------
> > Maarten Lankhorst (2):
> > drm/vma: Add a driver_private member to vma_node.
> > drm/i915: Use ttm mmap handling for ttm bo's.
> >
> > Thomas Hellström (2):
> > drm/i915/ttm: Introduce a TTM i915 gem object backend
> > drm/i915/lmem: Verify checks for lmem residency
> >
> > drivers/gpu/drm/drm_gem.c | 9 -
> > drivers/gpu/drm/i915/Makefile | 1 +
> > drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> > drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
> > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
> > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
> > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
> > drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
> > drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
> > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
> > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> > drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
> > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
> > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
> > drivers/gpu/drm/i915/i915_gem.c | 5 +-
> > drivers/gpu/drm/i915/intel_memory_region.c | 1 -
> > drivers/gpu/drm/i915/intel_memory_region.h | 1 -
> > drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
> > drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
> > drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
> > drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> > include/drm/drm_vma_manager.h | 2 +-
> > 24 files changed, 1039 insertions(+), 250 deletions(-)
> > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
2021-06-11 11:13 ` [Intel-gfx] " Joonas Lahtinen
(?)
@ 2021-06-11 12:50 ` Thomas Hellström (Intel)
-1 siblings, 0 replies; 17+ messages in thread
From: Thomas Hellström (Intel) @ 2021-06-11 12:50 UTC (permalink / raw)
To: intel-gfx
On 6/11/21 1:13 PM, Joonas Lahtinen wrote:
> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
>> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
>>> Pull request for drm-misc-next and drm-intel-gt-next.
>>>
>>> topic/i915-ttm-2021-06-11:
>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>> - Convert i915 lmem handling to ttm.
>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>> - Use this to allow mixed object mmap handling for i915.
>>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>>>
>>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
>> we would end up pulling 478 extra commits from drm-next as a result. And
>> also causing all the warnings for those commits. I don't think we should
>> do that?
>>
>> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
>> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
>> Should we re-do the topic branch based on that?
> This problem seems to come from the fact that only the PR from yesterday
> that got merged to drm-next had the dependency patches. The previous
> backmerge of drm-next was requested too early.
>
> I've solved this with least hassle by backmerging drm-next again and
> then applying the PR to drm-intel-gt-next.
Yeah, that was motivated by our first i915 ttm patches IIRC depending on
some recent changes in TTM, and then in addition we made changes to TTM
that we were asked to merge through drm-misc-next to avoid conflicts. In
hindsight it might have actually been better to merge the TTM changes
through drm-intel-gt-next and take responsibility of resolving i915/TTM
conflicts as they appear in drm-tip...
/Thomas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PULL] topic/i915-ttm
2021-06-11 11:13 ` [Intel-gfx] " Joonas Lahtinen
@ 2021-06-13 18:54 ` Thomas Zimmermann
-1 siblings, 0 replies; 17+ messages in thread
From: Thomas Zimmermann @ 2021-06-13 18:54 UTC (permalink / raw)
To: Joonas Lahtinen, Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Rodrigo Vivi,
Sean Paul
[-- Attachment #1.1: Type: text/plain, Size: 5428 bytes --]
Hi Joonas
Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
>> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
>>> Pull request for drm-misc-next and drm-intel-gt-next.
>>>
>>> topic/i915-ttm-2021-06-11:
>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>> - Convert i915 lmem handling to ttm.
>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>> - Use this to allow mixed object mmap handling for i915.
>>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>>>
>>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>>
>> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
>> we would end up pulling 478 extra commits from drm-next as a result. And
>> also causing all the warnings for those commits. I don't think we should
>> do that?
>>
>> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
>> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
>> Should we re-do the topic branch based on that?
>
> This problem seems to come from the fact that only the PR from yesterday
> that got merged to drm-next had the dependency patches. The previous
> backmerge of drm-next was requested too early.
>
> I've solved this with least hassle by backmerging drm-next again and
> then applying the PR to drm-intel-gt-next.
>
> I think drm-misc-next should do the same (exact commit was
> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
I did a backmerge from drm-next recently and drm-misc-next can merge the
patches in tags/topic/i915-ttm-2021-06-11 without additions.
I assume you to updated drm-intel-gt-next without redoing the PR?
Best regards
Thomas
>
> Regards, Joonas
>
>> However the DIM docs[1] indeed do say: "For topic branches shared within
>> the gpu/drm subsystem, base it on the latest drm-next branch." I think
>> the docs don't take into account the current period where drm-next is
>> being actively updated as we speak.
>>
>> Should we update the docs to use 'git merge-base' or something else?
>>
>> Regards, Joonas
>>
>> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
>>
>>>
>>> are available in the Git repository at:
>>>
>>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
>>>
>>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
>>>
>>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
>>>
>>> ----------------------------------------------------------------
>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>> - Convert i915 lmem handling to ttm.
>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>> - Use this to allow mixed object mmap handling for i915.
>>>
>>> ----------------------------------------------------------------
>>> Maarten Lankhorst (2):
>>> drm/vma: Add a driver_private member to vma_node.
>>> drm/i915: Use ttm mmap handling for ttm bo's.
>>>
>>> Thomas Hellström (2):
>>> drm/i915/ttm: Introduce a TTM i915 gem object backend
>>> drm/i915/lmem: Verify checks for lmem residency
>>>
>>> drivers/gpu/drm/drm_gem.c | 9 -
>>> drivers/gpu/drm/i915/Makefile | 1 +
>>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
>>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
>>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
>>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
>>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
>>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
>>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
>>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
>>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
>>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
>>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
>>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
>>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
>>> include/drm/drm_vma_manager.h | 2 +-
>>> 24 files changed, 1039 insertions(+), 250 deletions(-)
>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
--
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-13 18:54 ` Thomas Zimmermann
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Zimmermann @ 2021-06-13 18:54 UTC (permalink / raw)
To: Joonas Lahtinen, Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 5428 bytes --]
Hi Joonas
Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
>> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
>>> Pull request for drm-misc-next and drm-intel-gt-next.
>>>
>>> topic/i915-ttm-2021-06-11:
>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>> - Convert i915 lmem handling to ttm.
>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>> - Use this to allow mixed object mmap handling for i915.
>>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>>>
>>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>>
>> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
>> we would end up pulling 478 extra commits from drm-next as a result. And
>> also causing all the warnings for those commits. I don't think we should
>> do that?
>>
>> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
>> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
>> Should we re-do the topic branch based on that?
>
> This problem seems to come from the fact that only the PR from yesterday
> that got merged to drm-next had the dependency patches. The previous
> backmerge of drm-next was requested too early.
>
> I've solved this with least hassle by backmerging drm-next again and
> then applying the PR to drm-intel-gt-next.
>
> I think drm-misc-next should do the same (exact commit was
> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
I did a backmerge from drm-next recently and drm-misc-next can merge the
patches in tags/topic/i915-ttm-2021-06-11 without additions.
I assume you to updated drm-intel-gt-next without redoing the PR?
Best regards
Thomas
>
> Regards, Joonas
>
>> However the DIM docs[1] indeed do say: "For topic branches shared within
>> the gpu/drm subsystem, base it on the latest drm-next branch." I think
>> the docs don't take into account the current period where drm-next is
>> being actively updated as we speak.
>>
>> Should we update the docs to use 'git merge-base' or something else?
>>
>> Regards, Joonas
>>
>> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
>>
>>>
>>> are available in the Git repository at:
>>>
>>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
>>>
>>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
>>>
>>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
>>>
>>> ----------------------------------------------------------------
>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>> - Convert i915 lmem handling to ttm.
>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>> - Use this to allow mixed object mmap handling for i915.
>>>
>>> ----------------------------------------------------------------
>>> Maarten Lankhorst (2):
>>> drm/vma: Add a driver_private member to vma_node.
>>> drm/i915: Use ttm mmap handling for ttm bo's.
>>>
>>> Thomas Hellström (2):
>>> drm/i915/ttm: Introduce a TTM i915 gem object backend
>>> drm/i915/lmem: Verify checks for lmem residency
>>>
>>> drivers/gpu/drm/drm_gem.c | 9 -
>>> drivers/gpu/drm/i915/Makefile | 1 +
>>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
>>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
>>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
>>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
>>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
>>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
>>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
>>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
>>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
>>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
>>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
>>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
>>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
>>> include/drm/drm_vma_manager.h | 2 +-
>>> 24 files changed, 1039 insertions(+), 250 deletions(-)
>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
--
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 --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PULL] topic/i915-ttm
2021-06-13 18:54 ` [Intel-gfx] " Thomas Zimmermann
@ 2021-06-14 6:46 ` Joonas Lahtinen
-1 siblings, 0 replies; 17+ messages in thread
From: Joonas Lahtinen @ 2021-06-14 6:46 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Maarten Lankhorst, Thomas Zimmermann
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Rodrigo Vivi,
Sean Paul
Quoting Thomas Zimmermann (2021-06-13 21:54:03)
> Hi Joonas
>
> Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> >> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> >>> Pull request for drm-misc-next and drm-intel-gt-next.
> >>>
> >>> topic/i915-ttm-2021-06-11:
> >>> drm-misc and drm-intel pull request for topic/i915-ttm:
> >>> - Convert i915 lmem handling to ttm.
> >>> - Add a patch to temporarily add a driver_private member to vma_node.
> >>> - Use this to allow mixed object mmap handling for i915.
> >>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> >>>
> >>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> >>
> >> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> >> we would end up pulling 478 extra commits from drm-next as a result. And
> >> also causing all the warnings for those commits. I don't think we should
> >> do that?
> >>
> >> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> >> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> >> Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
> >
> > I think drm-misc-next should do the same (exact commit was
> > 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>
> I did a backmerge from drm-next recently and drm-misc-next can merge the
> patches in tags/topic/i915-ttm-2021-06-11 without additions.
>
> I assume you to updated drm-intel-gt-next without redoing the PR?
Correct.
Regards, Joonas
>
> Best regards
> Thomas
>
> >
> > Regards, Joonas
> >
> >> However the DIM docs[1] indeed do say: "For topic branches shared within
> >> the gpu/drm subsystem, base it on the latest drm-next branch." I think
> >> the docs don't take into account the current period where drm-next is
> >> being actively updated as we speak.
> >>
> >> Should we update the docs to use 'git merge-base' or something else?
> >>
> >> Regards, Joonas
> >>
> >> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
> >>
> >>>
> >>> are available in the Git repository at:
> >>>
> >>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
> >>>
> >>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
> >>>
> >>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> drm-misc and drm-intel pull request for topic/i915-ttm:
> >>> - Convert i915 lmem handling to ttm.
> >>> - Add a patch to temporarily add a driver_private member to vma_node.
> >>> - Use this to allow mixed object mmap handling for i915.
> >>>
> >>> ----------------------------------------------------------------
> >>> Maarten Lankhorst (2):
> >>> drm/vma: Add a driver_private member to vma_node.
> >>> drm/i915: Use ttm mmap handling for ttm bo's.
> >>>
> >>> Thomas Hellström (2):
> >>> drm/i915/ttm: Introduce a TTM i915 gem object backend
> >>> drm/i915/lmem: Verify checks for lmem residency
> >>>
> >>> drivers/gpu/drm/drm_gem.c | 9 -
> >>> drivers/gpu/drm/i915/Makefile | 1 +
> >>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
> >>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
> >>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
> >>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
> >>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
> >>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
> >>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
> >>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
> >>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
> >>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
> >>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
> >>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
> >>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
> >>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
> >>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> >>> include/drm/drm_vma_manager.h | 2 +-
> >>> 24 files changed, 1039 insertions(+), 250 deletions(-)
> >>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> >>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
>
> --
> 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
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-14 6:46 ` Joonas Lahtinen
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Lahtinen @ 2021-06-14 6:46 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Maarten Lankhorst, Thomas Zimmermann
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel
Quoting Thomas Zimmermann (2021-06-13 21:54:03)
> Hi Joonas
>
> Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> >> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> >>> Pull request for drm-misc-next and drm-intel-gt-next.
> >>>
> >>> topic/i915-ttm-2021-06-11:
> >>> drm-misc and drm-intel pull request for topic/i915-ttm:
> >>> - Convert i915 lmem handling to ttm.
> >>> - Add a patch to temporarily add a driver_private member to vma_node.
> >>> - Use this to allow mixed object mmap handling for i915.
> >>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> >>>
> >>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> >>
> >> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> >> we would end up pulling 478 extra commits from drm-next as a result. And
> >> also causing all the warnings for those commits. I don't think we should
> >> do that?
> >>
> >> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> >> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> >> Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
> >
> > I think drm-misc-next should do the same (exact commit was
> > 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>
> I did a backmerge from drm-next recently and drm-misc-next can merge the
> patches in tags/topic/i915-ttm-2021-06-11 without additions.
>
> I assume you to updated drm-intel-gt-next without redoing the PR?
Correct.
Regards, Joonas
>
> Best regards
> Thomas
>
> >
> > Regards, Joonas
> >
> >> However the DIM docs[1] indeed do say: "For topic branches shared within
> >> the gpu/drm subsystem, base it on the latest drm-next branch." I think
> >> the docs don't take into account the current period where drm-next is
> >> being actively updated as we speak.
> >>
> >> Should we update the docs to use 'git merge-base' or something else?
> >>
> >> Regards, Joonas
> >>
> >> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
> >>
> >>>
> >>> are available in the Git repository at:
> >>>
> >>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
> >>>
> >>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
> >>>
> >>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> drm-misc and drm-intel pull request for topic/i915-ttm:
> >>> - Convert i915 lmem handling to ttm.
> >>> - Add a patch to temporarily add a driver_private member to vma_node.
> >>> - Use this to allow mixed object mmap handling for i915.
> >>>
> >>> ----------------------------------------------------------------
> >>> Maarten Lankhorst (2):
> >>> drm/vma: Add a driver_private member to vma_node.
> >>> drm/i915: Use ttm mmap handling for ttm bo's.
> >>>
> >>> Thomas Hellström (2):
> >>> drm/i915/ttm: Introduce a TTM i915 gem object backend
> >>> drm/i915/lmem: Verify checks for lmem residency
> >>>
> >>> drivers/gpu/drm/drm_gem.c | 9 -
> >>> drivers/gpu/drm/i915/Makefile | 1 +
> >>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
> >>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
> >>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
> >>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
> >>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
> >>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
> >>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
> >>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
> >>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
> >>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
> >>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
> >>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
> >>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
> >>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
> >>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
> >>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> >>> include/drm/drm_vma_manager.h | 2 +-
> >>> 24 files changed, 1039 insertions(+), 250 deletions(-)
> >>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> >>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
>
> --
> 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
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PULL] topic/i915-ttm
2021-06-14 6:46 ` [Intel-gfx] " Joonas Lahtinen
@ 2021-06-14 7:21 ` Thomas Zimmermann
-1 siblings, 0 replies; 17+ messages in thread
From: Thomas Zimmermann @ 2021-06-14 7:21 UTC (permalink / raw)
To: Joonas Lahtinen, Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Rodrigo Vivi,
Sean Paul
[-- Attachment #1.1: Type: text/plain, Size: 6177 bytes --]
Hi
Am 14.06.21 um 08:46 schrieb Joonas Lahtinen:
> Quoting Thomas Zimmermann (2021-06-13 21:54:03)
>> Hi Joonas
>>
>> Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
>>> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
>>>> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
>>>>> Pull request for drm-misc-next and drm-intel-gt-next.
>>>>>
>>>>> topic/i915-ttm-2021-06-11:
>>>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>>>> - Convert i915 lmem handling to ttm.
>>>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>>>> - Use this to allow mixed object mmap handling for i915.
>>>>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>>>>>
>>>>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>>>>
>>>> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
>>>> we would end up pulling 478 extra commits from drm-next as a result. And
>>>> also causing all the warnings for those commits. I don't think we should
>>>> do that?
>>>>
>>>> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
>>>> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
>>>> Should we re-do the topic branch based on that?
>>>
>>> This problem seems to come from the fact that only the PR from yesterday
>>> that got merged to drm-next had the dependency patches. The previous
>>> backmerge of drm-next was requested too early.
>>>
>>> I've solved this with least hassle by backmerging drm-next again and
>>> then applying the PR to drm-intel-gt-next.
>>>
>>> I think drm-misc-next should do the same (exact commit was
>>> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>>
>> I did a backmerge from drm-next recently and drm-misc-next can merge the
>> patches in tags/topic/i915-ttm-2021-06-11 without additions.
>>
>> I assume you to updated drm-intel-gt-next without redoing the PR?
>
> Correct.
Some patches landed in drm-next. I now did another backmerge and then
merged the topic branch.
Best regards
Thomas
>
> Regards, Joonas
>
>>
>> Best regards
>> Thomas
>>
>>>
>>> Regards, Joonas
>>>
>>>> However the DIM docs[1] indeed do say: "For topic branches shared within
>>>> the gpu/drm subsystem, base it on the latest drm-next branch." I think
>>>> the docs don't take into account the current period where drm-next is
>>>> being actively updated as we speak.
>>>>
>>>> Should we update the docs to use 'git merge-base' or something else?
>>>>
>>>> Regards, Joonas
>>>>
>>>> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
>>>>
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
>>>>>
>>>>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
>>>>>
>>>>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>>>> - Convert i915 lmem handling to ttm.
>>>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>>>> - Use this to allow mixed object mmap handling for i915.
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Maarten Lankhorst (2):
>>>>> drm/vma: Add a driver_private member to vma_node.
>>>>> drm/i915: Use ttm mmap handling for ttm bo's.
>>>>>
>>>>> Thomas Hellström (2):
>>>>> drm/i915/ttm: Introduce a TTM i915 gem object backend
>>>>> drm/i915/lmem: Verify checks for lmem residency
>>>>>
>>>>> drivers/gpu/drm/drm_gem.c | 9 -
>>>>> drivers/gpu/drm/i915/Makefile | 1 +
>>>>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
>>>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
>>>>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
>>>>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
>>>>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
>>>>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
>>>>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
>>>>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
>>>>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
>>>>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
>>>>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
>>>>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
>>>>> include/drm/drm_vma_manager.h | 2 +-
>>>>> 24 files changed, 1039 insertions(+), 250 deletions(-)
>>>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
>>
>> --
>> 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
>>
--
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-14 7:21 ` Thomas Zimmermann
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Zimmermann @ 2021-06-14 7:21 UTC (permalink / raw)
To: Joonas Lahtinen, Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 6177 bytes --]
Hi
Am 14.06.21 um 08:46 schrieb Joonas Lahtinen:
> Quoting Thomas Zimmermann (2021-06-13 21:54:03)
>> Hi Joonas
>>
>> Am 11.06.21 um 13:13 schrieb Joonas Lahtinen:
>>> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
>>>> Quoting Maarten Lankhorst (2021-06-11 12:27:15)
>>>>> Pull request for drm-misc-next and drm-intel-gt-next.
>>>>>
>>>>> topic/i915-ttm-2021-06-11:
>>>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>>>> - Convert i915 lmem handling to ttm.
>>>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>>>> - Use this to allow mixed object mmap handling for i915.
>>>>> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>>>>>
>>>>> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>>>>
>>>> This base is not in drm-misc-next or drm-intel-gt-next, so effectively
>>>> we would end up pulling 478 extra commits from drm-next as a result. And
>>>> also causing all the warnings for those commits. I don't think we should
>>>> do that?
>>>>
>>>> The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
>>>> "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
>>>> Should we re-do the topic branch based on that?
>>>
>>> This problem seems to come from the fact that only the PR from yesterday
>>> that got merged to drm-next had the dependency patches. The previous
>>> backmerge of drm-next was requested too early.
>>>
>>> I've solved this with least hassle by backmerging drm-next again and
>>> then applying the PR to drm-intel-gt-next.
>>>
>>> I think drm-misc-next should do the same (exact commit was
>>> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>>
>> I did a backmerge from drm-next recently and drm-misc-next can merge the
>> patches in tags/topic/i915-ttm-2021-06-11 without additions.
>>
>> I assume you to updated drm-intel-gt-next without redoing the PR?
>
> Correct.
Some patches landed in drm-next. I now did another backmerge and then
merged the topic branch.
Best regards
Thomas
>
> Regards, Joonas
>
>>
>> Best regards
>> Thomas
>>
>>>
>>> Regards, Joonas
>>>
>>>> However the DIM docs[1] indeed do say: "For topic branches shared within
>>>> the gpu/drm subsystem, base it on the latest drm-next branch." I think
>>>> the docs don't take into account the current period where drm-next is
>>>> being actively updated as we speak.
>>>>
>>>> Should we update the docs to use 'git merge-base' or something else?
>>>>
>>>> Regards, Joonas
>>>>
>>>> [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
>>>>
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>> git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
>>>>>
>>>>> for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
>>>>>
>>>>> drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> drm-misc and drm-intel pull request for topic/i915-ttm:
>>>>> - Convert i915 lmem handling to ttm.
>>>>> - Add a patch to temporarily add a driver_private member to vma_node.
>>>>> - Use this to allow mixed object mmap handling for i915.
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Maarten Lankhorst (2):
>>>>> drm/vma: Add a driver_private member to vma_node.
>>>>> drm/i915: Use ttm mmap handling for ttm bo's.
>>>>>
>>>>> Thomas Hellström (2):
>>>>> drm/i915/ttm: Introduce a TTM i915 gem object backend
>>>>> drm/i915/lmem: Verify checks for lmem residency
>>>>>
>>>>> drivers/gpu/drm/drm_gem.c | 9 -
>>>>> drivers/gpu/drm/i915/Makefile | 1 +
>>>>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
>>>>> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
>>>>> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
>>>>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
>>>>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
>>>>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
>>>>> drivers/gpu/drm/i915/intel_memory_region.c | 1 -
>>>>> drivers/gpu/drm/i915/intel_memory_region.h | 1 -
>>>>> drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
>>>>> drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
>>>>> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
>>>>> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
>>>>> include/drm/drm_vma_manager.h | 2 +-
>>>>> 24 files changed, 1039 insertions(+), 250 deletions(-)
>>>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
>>
>> --
>> 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
>>
--
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 --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PULL] topic/i915-ttm
2021-06-11 11:13 ` [Intel-gfx] " Joonas Lahtinen
@ 2021-06-14 9:36 ` Joonas Lahtinen
-1 siblings, 0 replies; 17+ messages in thread
From: Joonas Lahtinen @ 2021-06-14 9:36 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Rodrigo Vivi,
Sean Paul
Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > Pull request for drm-misc-next and drm-intel-gt-next.
> > >
> > > topic/i915-ttm-2021-06-11:
> > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > - Convert i915 lmem handling to ttm.
> > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > - Use this to allow mixed object mmap handling for i915.
> > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > >
> > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> >
> > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > we would end up pulling 478 extra commits from drm-next as a result. And
> > also causing all the warnings for those commits. I don't think we should
> > do that?
> >
> > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > Should we re-do the topic branch based on that?
>
> This problem seems to come from the fact that only the PR from yesterday
> that got merged to drm-next had the dependency patches. The previous
> backmerge of drm-next was requested too early.
>
> I've solved this with least hassle by backmerging drm-next again and
> then applying the PR to drm-intel-gt-next.
And now I have actually pushed the merge too.. Thanks to Tvrtko
for pointing out broken drm-tip.
Regards, Joonas
>
> I think drm-misc-next should do the same (exact commit was
> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>
> Regards, Joonas
>
> > However the DIM docs[1] indeed do say: "For topic branches shared within
> > the gpu/drm subsystem, base it on the latest drm-next branch." I think
> > the docs don't take into account the current period where drm-next is
> > being actively updated as we speak.
> >
> > Should we update the docs to use 'git merge-base' or something else?
> >
> > Regards, Joonas
> >
> > [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
> >
> > >
> > > are available in the Git repository at:
> > >
> > > git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
> > >
> > > for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
> > >
> > > drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
> > >
> > > ----------------------------------------------------------------
> > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > - Convert i915 lmem handling to ttm.
> > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > - Use this to allow mixed object mmap handling for i915.
> > >
> > > ----------------------------------------------------------------
> > > Maarten Lankhorst (2):
> > > drm/vma: Add a driver_private member to vma_node.
> > > drm/i915: Use ttm mmap handling for ttm bo's.
> > >
> > > Thomas Hellström (2):
> > > drm/i915/ttm: Introduce a TTM i915 gem object backend
> > > drm/i915/lmem: Verify checks for lmem residency
> > >
> > > drivers/gpu/drm/drm_gem.c | 9 -
> > > drivers/gpu/drm/i915/Makefile | 1 +
> > > drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
> > > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
> > > drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
> > > drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
> > > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
> > > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
> > > drivers/gpu/drm/i915/i915_gem.c | 5 +-
> > > drivers/gpu/drm/i915/intel_memory_region.c | 1 -
> > > drivers/gpu/drm/i915/intel_memory_region.h | 1 -
> > > drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
> > > drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
> > > drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
> > > drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> > > include/drm/drm_vma_manager.h | 2 +-
> > > 24 files changed, 1039 insertions(+), 250 deletions(-)
> > > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-14 9:36 ` Joonas Lahtinen
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Lahtinen @ 2021-06-14 9:36 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Maarten Lankhorst
Cc: Thomas Hellstrom, dim-tools, intel-gfx, dri-devel, Maxime Ripard
Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > Pull request for drm-misc-next and drm-intel-gt-next.
> > >
> > > topic/i915-ttm-2021-06-11:
> > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > - Convert i915 lmem handling to ttm.
> > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > - Use this to allow mixed object mmap handling for i915.
> > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > >
> > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> >
> > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > we would end up pulling 478 extra commits from drm-next as a result. And
> > also causing all the warnings for those commits. I don't think we should
> > do that?
> >
> > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > Should we re-do the topic branch based on that?
>
> This problem seems to come from the fact that only the PR from yesterday
> that got merged to drm-next had the dependency patches. The previous
> backmerge of drm-next was requested too early.
>
> I've solved this with least hassle by backmerging drm-next again and
> then applying the PR to drm-intel-gt-next.
And now I have actually pushed the merge too.. Thanks to Tvrtko
for pointing out broken drm-tip.
Regards, Joonas
>
> I think drm-misc-next should do the same (exact commit was
> 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2).
>
> Regards, Joonas
>
> > However the DIM docs[1] indeed do say: "For topic branches shared within
> > the gpu/drm subsystem, base it on the latest drm-next branch." I think
> > the docs don't take into account the current period where drm-next is
> > being actively updated as we speak.
> >
> > Should we update the docs to use 'git merge-base' or something else?
> >
> > Regards, Joonas
> >
> > [1]: https://drm.pages.freedesktop.org/maintainer-tools/dim.html#cross-subsystem-topic-branches
> >
> > >
> > > are available in the Git repository at:
> > >
> > > git://anongit.freedesktop.org/drm/drm-misc tags/topic/i915-ttm-2021-06-11
> > >
> > > for you to fetch changes up to cf3e3e86d77970211e0983130e896ae242601003:
> > >
> > > drm/i915: Use ttm mmap handling for ttm bo's. (2021-06-11 10:53:25 +0200)
> > >
> > > ----------------------------------------------------------------
> > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > - Convert i915 lmem handling to ttm.
> > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > - Use this to allow mixed object mmap handling for i915.
> > >
> > > ----------------------------------------------------------------
> > > Maarten Lankhorst (2):
> > > drm/vma: Add a driver_private member to vma_node.
> > > drm/i915: Use ttm mmap handling for ttm bo's.
> > >
> > > Thomas Hellström (2):
> > > drm/i915/ttm: Introduce a TTM i915 gem object backend
> > > drm/i915/lmem: Verify checks for lmem residency
> > >
> > > drivers/gpu/drm/drm_gem.c | 9 -
> > > drivers/gpu/drm/i915/Makefile | 1 +
> > > drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 ++--
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 -
> > > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 ++-
> > > drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +++--
> > > drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +-
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 +++++++++++++++++++++
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 ++
> > > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +--
> > > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +-
> > > drivers/gpu/drm/i915/i915_gem.c | 5 +-
> > > drivers/gpu/drm/i915/intel_memory_region.c | 1 -
> > > drivers/gpu/drm/i915/intel_memory_region.h | 1 -
> > > drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
> > > drivers/gpu/drm/i915/intel_region_ttm.h | 11 +-
> > > drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +-
> > > drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> > > include/drm/drm_vma_manager.h | 2 +-
> > > 24 files changed, 1039 insertions(+), 250 deletions(-)
> > > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PULL] topic/i915-ttm
2021-06-14 9:36 ` [Intel-gfx] " Joonas Lahtinen
@ 2021-06-18 20:02 ` Dave Airlie
-1 siblings, 0 replies; 17+ messages in thread
From: Dave Airlie @ 2021-06-18 20:02 UTC (permalink / raw)
To: Joonas Lahtinen
Cc: Thomas Hellstrom, DRM maintainer tools announcements, discussion,
and development, Daniel Vetter, dri-devel, Rodrigo Vivi,
Sean Paul, Intel Graphics Development
On Mon, 14 Jun 2021 at 19:37, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > > Pull request for drm-misc-next and drm-intel-gt-next.
> > > >
> > > > topic/i915-ttm-2021-06-11:
> > > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > > - Convert i915 lmem handling to ttm.
> > > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > > - Use this to allow mixed object mmap handling for i915.
> > > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > > >
> > > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> > >
> > > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > > we would end up pulling 478 extra commits from drm-next as a result. And
> > > also causing all the warnings for those commits. I don't think we should
> > > do that?
> > >
> > > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > > Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
>
> And now I have actually pushed the merge too.. Thanks to Tvrtko
> for pointing out broken drm-tip.
>
Sorry I messed up, I missed the tip fail in my terminal before I clocked off.
Dave.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] [PULL] topic/i915-ttm
@ 2021-06-18 20:02 ` Dave Airlie
0 siblings, 0 replies; 17+ messages in thread
From: Dave Airlie @ 2021-06-18 20:02 UTC (permalink / raw)
To: Joonas Lahtinen
Cc: Thomas Hellstrom, DRM maintainer tools announcements, discussion,
and development, Daniel Vetter, dri-devel, Maxime Ripard,
Intel Graphics Development
On Mon, 14 Jun 2021 at 19:37, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > > Pull request for drm-misc-next and drm-intel-gt-next.
> > > >
> > > > topic/i915-ttm-2021-06-11:
> > > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > > - Convert i915 lmem handling to ttm.
> > > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > > - Use this to allow mixed object mmap handling for i915.
> > > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > > >
> > > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> > >
> > > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > > we would end up pulling 478 extra commits from drm-next as a result. And
> > > also causing all the warnings for those commits. I don't think we should
> > > do that?
> > >
> > > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > > Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
>
> And now I have actually pushed the merge too.. Thanks to Tvrtko
> for pointing out broken drm-tip.
>
Sorry I messed up, I missed the tip fail in my terminal before I clocked off.
Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread