From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Lucas De Marchi" <lucas.demarchi@intel•com>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>,
"Daniel Vetter" <daniel.vetter@ffwll•ch>
Cc: "Intel Graphics" <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
"DRM XE List" <intel-xe@lists•freedesktop.org>,
"Christian König" <christian.koenig@amd•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Umesh Nerlige Ramappa" <umesh.nerlige.ramappa@intel•com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-misc tree
Date: Thu, 1 Aug 2024 11:26:50 +1000 [thread overview]
Message-ID: <20240801112650.30b8d53d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]
Hi all,
Today's linux-next merge of the drm-xe tree got a conflict in:
drivers/gpu/drm/xe/xe_vm.c
between commit:
4c44f89c5dae ("drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves")
from the drm-misc tree and commit:
a2387e69493d ("drm/xe: Take a ref to xe file when user creates a VM")
from the drm-xe tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/xe/xe_vm.c
index c3bdb6362fe9,f225107bdd65..000000000000
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@@ -1604,7 -1670,10 +1673,11 @@@ static void vm_destroy_work_func(struc
XE_WARN_ON(vm->pt_root[id]);
trace_xe_vm_free(vm);
+ ttm_lru_bulk_move_fini(&xe->ttm, &vm->lru_bulk_move);
+
+ if (vm->xef)
+ xe_file_put(vm->xef);
+
kfree(vm);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-01 1:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 1:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-02-23 13:35 linux-next: manual merge of the drm-xe tree with the drm-misc tree Mark Brown
2026-02-23 13:40 ` Joel Fernandes
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=20240801112650.30b8d53d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian.koenig@amd$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
--cc=umesh.nerlige.ramappa@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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