From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Intel Graphics" <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Alex Deucher" <alexander.deucher@amd.com>,
"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>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Wed, 16 Nov 2022 11:09:23 +1100 [thread overview]
Message-ID: <20221116110923.0b6b04da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
2cf9886e2816 ("drm/scheduler: remove drm_sched_dependency_optimized")
from the drm-misc tree and commit:
06a2d7cc3f04 ("drm/amdgpu: revert "implement tdr advanced mode"")
from the amdgpu 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 include/drm/gpu_scheduler.h
index cec147f7c50b,0168ff469ae0..000000000000
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@@ -532,10 -528,9 +532,7 @@@ void drm_sched_wakeup(struct drm_gpu_sc
void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);
void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery);
void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);
- void drm_sched_resubmit_jobs_ext(struct drm_gpu_scheduler *sched, int max);
void drm_sched_increase_karma(struct drm_sched_job *bad);
- void drm_sched_reset_karma(struct drm_sched_job *bad);
- void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type);
-bool drm_sched_dependency_optimized(struct dma_fence* fence,
- struct drm_sched_entity *entity);
void drm_sched_fault(struct drm_gpu_scheduler *sched);
void drm_sched_job_kickout(struct drm_sched_job *s_job);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Intel Graphics" <intel-gfx@lists.freedesktop.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Subject: [Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Wed, 16 Nov 2022 11:09:23 +1100 [thread overview]
Message-ID: <20221116110923.0b6b04da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
2cf9886e2816 ("drm/scheduler: remove drm_sched_dependency_optimized")
from the drm-misc tree and commit:
06a2d7cc3f04 ("drm/amdgpu: revert "implement tdr advanced mode"")
from the amdgpu 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 include/drm/gpu_scheduler.h
index cec147f7c50b,0168ff469ae0..000000000000
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@@ -532,10 -528,9 +532,7 @@@ void drm_sched_wakeup(struct drm_gpu_sc
void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);
void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery);
void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);
- void drm_sched_resubmit_jobs_ext(struct drm_gpu_scheduler *sched, int max);
void drm_sched_increase_karma(struct drm_sched_job *bad);
- void drm_sched_reset_karma(struct drm_sched_job *bad);
- void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type);
-bool drm_sched_dependency_optimized(struct dma_fence* fence,
- struct drm_sched_entity *entity);
void drm_sched_fault(struct drm_gpu_scheduler *sched);
void drm_sched_job_kickout(struct drm_sched_job *s_job);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Intel Graphics" <intel-gfx@lists.freedesktop.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Wed, 16 Nov 2022 11:09:23 +1100 [thread overview]
Message-ID: <20221116110923.0b6b04da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
2cf9886e2816 ("drm/scheduler: remove drm_sched_dependency_optimized")
from the drm-misc tree and commit:
06a2d7cc3f04 ("drm/amdgpu: revert "implement tdr advanced mode"")
from the amdgpu 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 include/drm/gpu_scheduler.h
index cec147f7c50b,0168ff469ae0..000000000000
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@@ -532,10 -528,9 +532,7 @@@ void drm_sched_wakeup(struct drm_gpu_sc
void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);
void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery);
void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);
- void drm_sched_resubmit_jobs_ext(struct drm_gpu_scheduler *sched, int max);
void drm_sched_increase_karma(struct drm_sched_job *bad);
- void drm_sched_reset_karma(struct drm_sched_job *bad);
- void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type);
-bool drm_sched_dependency_optimized(struct dma_fence* fence,
- struct drm_sched_entity *entity);
void drm_sched_fault(struct drm_gpu_scheduler *sched);
void drm_sched_job_kickout(struct drm_sched_job *s_job);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-16 0:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 0:09 Stephen Rothwell [this message]
2022-11-16 0:09 ` linux-next: manual merge of the amdgpu tree with the drm-misc tree Stephen Rothwell
2022-11-16 0:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-05-15 1:18 Stephen Rothwell
2023-05-15 1:18 ` Stephen Rothwell
2023-01-16 0:48 Stephen Rothwell
2023-01-16 0:48 ` Stephen Rothwell
2022-04-06 0:34 Stephen Rothwell
2022-04-06 0:34 ` Stephen Rothwell
2022-04-13 0:10 ` Stephen Rothwell
2022-04-13 0:10 ` Stephen Rothwell
2022-04-29 1:13 ` Stephen Rothwell
2022-04-29 1:13 ` Stephen Rothwell
2022-04-29 10:38 ` Christian König
2022-04-29 10:38 ` Christian König
2021-12-13 15:08 broonie
2021-06-03 2:48 Stephen Rothwell
2021-06-03 2:48 ` Stephen Rothwell
2021-06-03 2:55 ` Stephen Rothwell
2021-06-03 2:55 ` Stephen Rothwell
2021-06-04 2:33 ` Stephen Rothwell
2021-06-04 2:33 ` Stephen Rothwell
2021-05-21 1:42 Stephen Rothwell
2021-05-21 1:42 ` Stephen Rothwell
2021-05-21 1:38 Stephen Rothwell
2021-05-21 1:38 ` Stephen Rothwell
2021-05-21 1:20 Stephen Rothwell
2021-05-21 1:20 ` Stephen Rothwell
2021-05-21 1:16 Stephen Rothwell
2021-05-21 1:16 ` Stephen Rothwell
2021-05-12 0:20 Stephen Rothwell
2021-05-12 0:20 ` Stephen Rothwell
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=20221116110923.0b6b04da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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.