From: Daniel Vetter <daniel@ffwll.ch>
To: "Christian König" <christian.koenig@amd.com>,
"Nikula, Jani" <jani.nikula@linux.intel.com>
Cc: Sasha Levin <sashal@kernel.org>,
Thomas Hellstrom <thellstrom@vmware.com>,
Dave Airlie <airlied@linux.ie>, "Ho, Kenny" <kenny.ho@amd.com>,
Brian Welty <brian.welty@intel.com>,
dri-devel <dri-devel@lists.freedesktop.org>,
Ben Skeggs <bskeggs@redhat.com>, Nirmoy Das <nirmoy.das@amd.com>,
VMware Graphics <linux-graphics-maintainer@vmware.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sean Paul <sean@poorly.run>, Nirmoy Das <nirmoy.aiemd@gmail.com>
Subject: Re: [RESEND] [PATCH v6 0/8] do not store GPU address in TTM
Date: Thu, 25 Jun 2020 17:44:09 +0200 [thread overview]
Message-ID: <CAKMK7uGQCttt-X3eoftdO6aHRtS0RQE6P=yRQK97Hp9N2jLLYQ@mail.gmail.com> (raw)
In-Reply-To: <b5629fcc-ba5e-4882-bafb-d88ef0ef144e@amd.com>
On Thu, Jun 25, 2020 at 11:50 AM Christian König
<christian.koenig@amd.com> wrote:
>
> I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#resolving-conflicts-when-rebuilding-drm-tip
The script should have told you that already, so maybe reinvent that
in whatever thing you're using :-) Jani has reported this on
#dri-devel, this also holds up CI testing since we're running on top
of drm-tip.
-Daniel
> Only VMGFX and Nouveau are missing and I'm pretty close to just push
> them with my Acked-by since they should not contain any functional change.
>
> Any objections?
>
> Thanks,
> Christian.
>
> Am 24.06.20 um 20:26 schrieb Nirmoy Das:
> > With this patch series I am trying to remove GPU address dependency in
> > TTM and moving GPU address calculation to individual drm drivers. This
> > cleanup will simplify introduction of drm_mem_region/domain work started
> > by Brian Welty[1].
> >
> >
> > It would be nice if someone test this for nouveau. Rest of the drivers
> > are already tested.
> >
> > v2:
> > * set bo->offset = 0 for drm/nouveau if bo->mem.mm_node == NULL
> >
> > v3:
> > * catch return value of drm_gem_vram_offset() in drm/bochs
> > * introduce drm_gem_vram_pg_offset() in vram helper
> > * improve nbo->offset calculation for nouveau
> >
> > v4:
> > * minor coding style fixes in amdgpu and radeon
> > * remove unnecessary kerneldoc for internal function
> >
> > v5:
> > * rebase on top of drm-misc-next
> > * fix return value of drm_gem_vram_pg_offset()
> > * add a comment in drm_gem_vram_pg_offset() to clearify why we return 0.
> >
> > v6:
> > * rebase to drm-misc-next
> > * removed acked for vmwgfx as there was a small conflict
> >
> > Nirmoy Das (8):
> > drm/amdgpu: move ttm bo->offset to amdgpu_bo
> > drm/radeon: don't use ttm bo->offset
> > drm/vmwgfx: don't use ttm bo->offset
> > drm/nouveau: don't use ttm bo->offset v3
> > drm/qxl: don't use ttm bo->offset
> > drm/vram-helper: don't use ttm bo->offset v4
> > drm/bochs: use drm_gem_vram_offset to get bo offset v2
> > drm/ttm: do not keep GPU dependent addresses
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++--
> > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 +
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++-----
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +--
> > drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++-
> > drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++-
> > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++---
> > drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++-
> > drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++---
> > drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++---
> > drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++
> > drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++
> > drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++----
> > drivers/gpu/drm/qxl/qxl_drv.h | 6 ++---
> > drivers/gpu/drm/qxl/qxl_kms.c | 5 ++--
> > drivers/gpu/drm/qxl/qxl_object.h | 5 ----
> > drivers/gpu/drm/qxl/qxl_ttm.c | 9 -------
> > drivers/gpu/drm/radeon/radeon.h | 1 +
> > drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++-
> > drivers/gpu/drm/radeon/radeon_ttm.c | 4 +--
> > drivers/gpu/drm/ttm/ttm_bo.c | 7 -----
> > drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +--
> > drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
> > drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +-
> > drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 --
> > include/drm/ttm/ttm_bo_api.h | 2 --
> > include/drm/ttm/ttm_bo_driver.h | 1 -
> > 36 files changed, 125 insertions(+), 78 deletions(-)
> >
> > --
> > 2.27.0
> >
>
--
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
next prev parent reply other threads:[~2020-06-25 15:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 18:26 [RESEND] [PATCH v6 0/8] do not store GPU address in TTM Nirmoy Das
2020-06-24 18:26 ` [PATCH 1/8] drm/amdgpu: move ttm bo->offset to amdgpu_bo Nirmoy Das
2020-06-24 18:26 ` [PATCH 2/8] drm/radeon: don't use ttm bo->offset Nirmoy Das
2020-06-24 18:26 ` [PATCH 3/8] drm/vmwgfx: " Nirmoy Das
2020-06-24 18:26 ` [PATCH 4/8] drm/nouveau: don't use ttm bo->offset v3 Nirmoy Das
2020-06-24 18:26 ` [PATCH 5/8] drm/qxl: don't use ttm bo->offset Nirmoy Das
2020-06-24 18:26 ` [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4 Nirmoy Das
2020-09-17 10:51 ` Thomas Zimmermann
2020-09-17 11:12 ` Christian König
2020-09-17 12:29 ` Thomas Zimmermann
2020-09-17 12:32 ` Christian König
2020-09-17 14:57 ` Thomas Zimmermann
2020-09-21 14:26 ` Thomas Zimmermann
2020-09-17 12:58 ` Nirmoy
2020-09-17 13:18 ` Thomas Zimmermann
2020-06-24 18:26 ` [PATCH 7/8] drm/bochs: use drm_gem_vram_offset to get bo offset v2 Nirmoy Das
2020-06-24 18:26 ` [PATCH 8/8] drm/ttm: do not keep GPU dependent addresses Nirmoy Das
2020-06-25 9:50 ` [RESEND] [PATCH v6 0/8] do not store GPU address in TTM Christian König
2020-06-25 9:57 ` Daniel Vetter
2020-06-25 15:44 ` Daniel Vetter [this message]
2020-06-25 15:52 ` Christian König
2020-06-25 16:02 ` Christian König
2020-06-26 13:04 ` Christian König
2020-06-26 13:12 ` Daniel Vetter
2020-06-26 13:12 ` Daniel Vetter
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='CAKMK7uGQCttt-X3eoftdO6aHRtS0RQE6P=yRQK97Hp9N2jLLYQ@mail.gmail.com' \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=brian.welty@intel.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=kenny.ho@amd.com \
--cc=kraxel@redhat.com \
--cc=linux-graphics-maintainer@vmware.com \
--cc=nirmoy.aiemd@gmail.com \
--cc=nirmoy.das@amd.com \
--cc=sashal@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).