From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: kherbst@redhat.com, michel.daenzer@mailbox.org,
"Christian König" <ckoenig.leichtzumerken@gmail.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
nouveau@lists.freedesktop.org, zackr@vmware.com
Subject: Re: Re: Re: [PATCH 3/5] drm/ttm: replace busy placement with flags v6
Date: Mon, 29 Jan 2024 12:00:35 +0100 [thread overview]
Message-ID: <9e9a3e9788914da0b93b0bda3fb00fc6dd3f4c4e.camel@linux.intel.com> (raw)
In-Reply-To: <gvhkoky553gdmbtllaiyesejzg3xrgmxkoptnk23pev53uacsp@vvm3uh2v5kds>
On Fri, 2024-01-26 at 16:22 -0600, Lucas De Marchi wrote:
> On Fri, Jan 26, 2024 at 04:16:58PM -0600, Lucas De Marchi wrote:
> > On Thu, Jan 18, 2024 at 05:38:16PM +0100, Thomas Hellström wrote:
> > >
> > > On 1/17/24 13:27, Thomas Hellström wrote:
> > > >
> > > > On 1/17/24 11:47, Thomas Hellström wrote:
> > > > > Hi, Christian
> > > > >
> > > > > Xe changes look good. Will send the series to xe ci to check
> > > > > for
> > > > > regressions.
> > > >
> > > > Hmm, there are some checkpatch warnings about author / SOB
> > > > email
> > > > mismatch,
> > >
> > > With those fixed, this patch is
> > >
> > > Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> >
> >
> > it actually broke drm-tip now that this is merged:
> >
> > ../drivers/gpu/drm/xe/xe_bo.c:41:10: error: ‘struct ttm_placement’
> > has no member named ‘num_busy_placement’; did you mean
> > ‘num_placement’
> > 41 | .num_busy_placement = 1,
> > | ^~~~~~~~~~~~~~~~~~
> > | num_placement
> > ../drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in
> > struct initializer [-Werror]
> > 41 | .num_busy_placement = 1,
> > | ^
> >
> >
> > Apparently a conflict with another patch that got applied a few
> > days
> > ago: a201c6ee37d6 ("drm/xe/bo: Evict VRAM to TT rather than to
> > system")
>
> oh, no... apparently that commit is from a long time ago. The
> problem
> was that drm-misc-next was not yet in sync with drm-next. Thomas, do
> you
> have a fixup for this to put in rerere?
>
> Lucas De Marchi
I added this as a manual fixup and ran some quick igt tests.
Seems to work.
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: michel.daenzer@mailbox.org,
"Christian König" <ckoenig.leichtzumerken@gmail.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
nouveau@lists.freedesktop.org, zackr@vmware.com
Subject: Re: Re: Re: [PATCH 3/5] drm/ttm: replace busy placement with flags v6
Date: Mon, 29 Jan 2024 12:00:35 +0100 [thread overview]
Message-ID: <9e9a3e9788914da0b93b0bda3fb00fc6dd3f4c4e.camel@linux.intel.com> (raw)
In-Reply-To: <gvhkoky553gdmbtllaiyesejzg3xrgmxkoptnk23pev53uacsp@vvm3uh2v5kds>
On Fri, 2024-01-26 at 16:22 -0600, Lucas De Marchi wrote:
> On Fri, Jan 26, 2024 at 04:16:58PM -0600, Lucas De Marchi wrote:
> > On Thu, Jan 18, 2024 at 05:38:16PM +0100, Thomas Hellström wrote:
> > >
> > > On 1/17/24 13:27, Thomas Hellström wrote:
> > > >
> > > > On 1/17/24 11:47, Thomas Hellström wrote:
> > > > > Hi, Christian
> > > > >
> > > > > Xe changes look good. Will send the series to xe ci to check
> > > > > for
> > > > > regressions.
> > > >
> > > > Hmm, there are some checkpatch warnings about author / SOB
> > > > email
> > > > mismatch,
> > >
> > > With those fixed, this patch is
> > >
> > > Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> >
> >
> > it actually broke drm-tip now that this is merged:
> >
> > ../drivers/gpu/drm/xe/xe_bo.c:41:10: error: ‘struct ttm_placement’
> > has no member named ‘num_busy_placement’; did you mean
> > ‘num_placement’
> > 41 | .num_busy_placement = 1,
> > | ^~~~~~~~~~~~~~~~~~
> > | num_placement
> > ../drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in
> > struct initializer [-Werror]
> > 41 | .num_busy_placement = 1,
> > | ^
> >
> >
> > Apparently a conflict with another patch that got applied a few
> > days
> > ago: a201c6ee37d6 ("drm/xe/bo: Evict VRAM to TT rather than to
> > system")
>
> oh, no... apparently that commit is from a long time ago. The
> problem
> was that drm-misc-next was not yet in sync with drm-next. Thomas, do
> you
> have a fixup for this to put in rerere?
>
> Lucas De Marchi
I added this as a manual fixup and ran some quick igt tests.
Seems to work.
next prev parent reply other threads:[~2024-01-29 11:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 12:51 Rework TTMs busy handling Christian König
2024-01-12 12:51 ` [PATCH 1/5] drm/vmwgfx: remove vmw_vram_gmr_placement Christian König
2024-01-12 12:51 ` [PATCH 2/5] drm/ttm: return ENOSPC from ttm_bo_mem_space Christian König
2024-01-17 10:18 ` Thomas Hellström
2024-01-12 12:51 ` [PATCH 3/5] drm/ttm: replace busy placement with flags v6 Christian König
2024-01-17 8:01 ` Thomas Zimmermann
2024-01-17 10:47 ` Thomas Hellström
2024-01-17 12:27 ` Thomas Hellström
2024-01-18 16:38 ` Thomas Hellström
2024-01-26 22:16 ` Lucas De Marchi
2024-01-26 22:16 ` Lucas De Marchi
2024-01-26 22:22 ` Lucas De Marchi
2024-01-26 22:22 ` Lucas De Marchi
2024-01-27 15:43 ` Zeng, Oak
2024-01-27 15:43 ` Zeng, Oak
2024-01-29 11:00 ` Thomas Hellström [this message]
2024-01-29 11:00 ` Thomas Hellström
2024-01-12 12:51 ` [PATCH 4/5] drm/ttm: improve idle/busy handling v3 Christian König
2024-01-18 14:24 ` Thomas Hellström
2024-01-18 16:48 ` Thomas Hellström
2024-01-12 12:51 ` [PATCH 5/5] drm/amdgpu: use GTT only as fallback for VRAM|GTT Christian König
2024-01-12 14:04 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] drm/vmwgfx: remove vmw_vram_gmr_placement Patchwork
2024-01-12 14:04 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-01-12 14:22 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-01-16 9:57 ` Rework TTMs busy handling Christian König
2024-01-17 3:13 ` Zack Rusin
2024-01-17 3:13 ` Zack Rusin
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=9e9a3e9788914da0b93b0bda3fb00fc6dd3f4c4e.camel@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kherbst@redhat.com \
--cc=lucas.demarchi@intel.com \
--cc=michel.daenzer@mailbox.org \
--cc=nouveau@lists.freedesktop.org \
--cc=zackr@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 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.