From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Dave Airlie <airlied@gmail.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Thomas Hellstrom <thellstrom@vmware.com>, dim-tools@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi <rodrigo.vivi@intel.com>, Sean Paul <sean@poorly.run> Subject: Re: [PULL] topic/i915-ttm Date: Fri, 11 Jun 2021 13:40:56 +0300 [thread overview] Message-ID: <162340805657.68262.6607541005525077753@jlahtine-mobl.ger.corp.intel.com> (raw) In-Reply-To: <eb71ee2d-3413-6ca8-0b7c-a58695f00b77@linux.intel.com> 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? 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
WARNING: multiple messages have this Message-ID (diff)
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Dave Airlie <airlied@gmail.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Thomas Hellstrom <thellstrom@vmware.com>, dim-tools@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Maxime Ripard <mripard@kernel.org> Subject: Re: [Intel-gfx] [PULL] topic/i915-ttm Date: Fri, 11 Jun 2021 13:40:56 +0300 [thread overview] Message-ID: <162340805657.68262.6607541005525077753@jlahtine-mobl.ger.corp.intel.com> (raw) In-Reply-To: <eb71ee2d-3413-6ca8-0b7c-a58695f00b77@linux.intel.com> 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? 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
next prev parent reply other threads:[~2021-06-11 10:41 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-11 9:27 [PULL] topic/i915-ttm Maarten Lankhorst 2021-06-11 9:27 ` [Intel-gfx] " Maarten Lankhorst 2021-06-11 10:40 ` Joonas Lahtinen [this message] 2021-06-11 10:40 ` Joonas Lahtinen 2021-06-11 11:13 ` Joonas Lahtinen 2021-06-11 11:13 ` [Intel-gfx] " Joonas Lahtinen 2021-06-11 12:50 ` Thomas Hellström (Intel) 2021-06-13 18:54 ` Thomas Zimmermann 2021-06-13 18:54 ` [Intel-gfx] " Thomas Zimmermann 2021-06-14 6:46 ` Joonas Lahtinen 2021-06-14 6:46 ` [Intel-gfx] " Joonas Lahtinen 2021-06-14 7:21 ` Thomas Zimmermann 2021-06-14 7:21 ` [Intel-gfx] " Thomas Zimmermann 2021-06-14 9:36 ` Joonas Lahtinen 2021-06-14 9:36 ` [Intel-gfx] " Joonas Lahtinen 2021-06-18 20:02 ` Dave Airlie 2021-06-18 20:02 ` [Intel-gfx] " Dave Airlie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=162340805657.68262.6607541005525077753@jlahtine-mobl.ger.corp.intel.com \ --to=joonas.lahtinen@linux.intel.com \ --cc=airlied@gmail.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dim-tools@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=sean@poorly.run \ --cc=thellstrom@vmware.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.