nightly.conf: Add the xe repo to drm-tip
PATCH 1/1 nightly.conf: Add the xe repo to drm-tip
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.
--- nightly.conf | 7 +++++++ 1 file changed, 7 insertions(+)
nightly.conf +7 -0
@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip.git " +drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +" drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
@@ -65,14 +69,17 @@ drm_tip_config=( "drm drm-fixes" "drm-misc drm-misc-fixes" "drm-intel drm-intel-fixes" + "drm-xe drm-xe-fixes" "drm drm-next" "drm-misc drm-misc-next-fixes" "drm-intel drm-intel-next-fixes" + "drm-xe drm-xe-next-fixes" "drm-misc drm-misc-next" "drm-intel drm-intel-next" "drm-intel drm-intel-gt-next" + "drm-xe drm-xe-next b6e1b7081768" "drm-intel topic/core-for-CI" "drm-misc topic/i915-ttm"
Signature · 1 line
2.42.0
Quoted 3 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.
I guess we'll need xe CI to switch to drm-tip based testing, and then force push drm-xe-next to drop that core-for-CI thing. But I think it's fine.
However, please first push v6.7-rc6 to drm-xe-fixes and current drm-next to drm-xe-next-fixes as a starting point. AFAICT the branches don't exist yet.
Other than that, LGTM.
BR,
Jani.
Quoted 47 lines
Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>--- nightly.conf | 7 +++++++ 1 file changed, 7 insertions(+)nightly.conf +7
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip.git " +drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +" drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel@@ -65,14 +69,17 @@ drm_tip_config=( "drm drm-fixes" "drm-misc drm-misc-fixes" "drm-intel drm-intel-fixes" + "drm-xe drm-xe-fixes" "drm drm-next" "drm-misc drm-misc-next-fixes" "drm-intel drm-intel-next-fixes" + "drm-xe drm-xe-next-fixes" "drm-misc drm-misc-next" "drm-intel drm-intel-next" "drm-intel drm-intel-gt-next" + "drm-xe drm-xe-next b6e1b7081768" "drm-intel topic/core-for-CI" "drm-misc topic/i915-ttm"
Signature · 1 line
Jani Nikula, Intel
Hi,
Quoted 7 lines · Jani Nikula
Quoted 3 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.I guess we'll need xe CI to switch to drm-tip based testing, and then force push drm-xe-next to drop that core-for-CI thing. But I think it's fine.
Yes, that's in the plan.
Quoted 4 lines
However, please first push v6.7-rc6 to drm-xe-fixes and current drm-next to drm-xe-next-fixes as a starting point. AFAICT the branches don't exist yet.
Yes, I have that queued-up. Still waiting for the right people to wake up, though, since I'm ATM lacking the right to create those branches in the xe repo. I did a dry-run building drm-tip with these patches present in a clone of the xe repo for testing purposes...
Quoted 2 lines
Other than that, LGTM.
Thanks,
Thomas
Quoted 50 lines
BR,
Jani.Quoted 46 lines
Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>--- nightly.conf | 7 +++++++ 1 file changed, 7 insertions(+)nightly.conf +7
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip.git " +drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +" drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel@@ -65,14 +69,17 @@ drm_tip_config=( "drm drm-fixes" "drm-misc drm-misc-fixes" "drm-intel drm-intel-fixes" + "drm-xe drm-xe-fixes" "drm drm-next" "drm-misc drm-misc-next-fixes" "drm-intel drm-intel-next-fixes" + "drm-xe drm-xe-next-fixes" "drm-misc drm-misc-next" "drm-intel drm-intel-next" "drm-intel drm-intel-gt-next" + "drm-xe drm-xe-next b6e1b7081768" "drm-intel topic/core-for-CI" "drm-misc topic/i915-ttm"
Quoted 11 lines · Thomas Hellström
Hi,
Quoted 7 lines · Jani Nikula
Quoted 3 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.I guess we'll need xe CI to switch to drm-tip based testing, and then force push drm-xe-next to drop that core-for-CI thing. But I think it's fine.
Quoted 8 lines
Yes, that's in the plan.
Quoted 4 lines
However, please first push v6.7-rc6 to drm-xe-fixes and current drm-next to drm-xe-next-fixes as a starting point. AFAICT the branches don't exist yet.
Yes, I have that queued-up. Still waiting for the right people to wake up, though, since I'm ATM lacking the right to create those branches in the xe repo. I did a dry-run building drm-tip with these patches
s/patches/branches/ ...
Quoted 57 lines
present in a clone of the xe repo for testing purposes...
Quoted 2 lines
Other than that, LGTM.
Thanks,
Thomas
Quoted 47 lines
BR,
Jani.Quoted 43 lines
Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]="
ssh://git.freedesktop.org/git/drm/drm-intel
ssh://git.freedesktop.org/git/drm-intelnightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"
+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"
+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"
+ "drm-xe drm-xe-nextb6e1b7081768"
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"
Quoted 4 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.
Quoted 9 lines
Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>
Lucas De Marchi
Quoted 40 lines
---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]="
ssh://git.freedesktop.org/git/drm/drm-intel
ssh://git.freedesktop.org/git/drm-intelnightly.conf +3
-0@@ -65,14 +69,17 @@ drm_tip_config=( "drm drm-fixes" "drm-misc drm-misc-fixes" "drm-intel drm-intel-fixes" + "drm-xe drm-xe-fixes" "drm drm-next" "drm-misc drm-misc-next-fixes" "drm-intel drm-intel-next-fixes" + "drm-xe drm-xe-next-fixes" "drm-misc drm-misc-next" "drm-intel drm-intel-next" "drm-intel drm-intel-gt-next" + "drm-xe drm-xe-next b6e1b7081768" "drm-intel topic/core-for-CI" "drm-misc topic/i915-ttm"Signature · 1 line
2.42.0
Quoted 37 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-tip, since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>--- nightly.conf | 7 +++++++ 1 file changed, 7 insertions(+)nightly.conf +5
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip https://anongit.freedesktop.org/git/drm/drm-tip.git " +drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +" drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel@@ -65,14 +69,17 @@ drm_tip_config=( "drm drm-fixes" "drm-misc drm-misc-fixes" "drm-intel drm-intel-fixes" + "drm-xe drm-xe-fixes"
nightly.conf drm_tip_config=( · line 82
Quoted 10 lines
nightly.conf +2
-0"drm drm-next" "drm-misc drm-misc-next-fixes" "drm-intel drm-intel-next-fixes" + "drm-xe drm-xe-next-fixes" "drm-misc drm-misc-next" "drm-intel drm-intel-next" "drm-intel drm-intel-gt-next" + "drm-xe drm-xe-next b6e1b7081768"
yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:880277f31cc69 drm/xe/guc: define LNL FW2cfc5ae1b8267 drm/xe/guc: define PVC FW52383b58eb8cf mei/hdcp: Also enable for XEbea27d7369855 mei: gsc: add support for auxiliary device created by Xe driver fcb3410197f05 fault-inject: Include linux/types.h by default. 8ebd9cd71f8ac drm/xe: Add PVC's PCI device IDs
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?
Anyway, for the inclusion like this, after our CI is ready:
Quoted 6 lines
nightly.conf +0
-0"drm-intel topic/core-for-CI" "drm-misc topic/i915-ttm"Signature · 1 line
2.42.0
Quoted 63 lines · Rodrigo Vivi
Quoted 47 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm- tip,
since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf drm_tip_config=( · line 82
Quoted 1 line
nightly.conf +1
-0+ "drm-xe drm-xe-next b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDs
Quoted 3 lines
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?
This sounds to me like topic/core-for-CI? Or is there any drawback with that?
Quoted 2 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will, at least for now, only update drm-tip with our fixes?
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"Signature · 1 line
2.42.0
Quoted 64 lines · Thomas Hellström
Quoted 63 lines · Rodrigo Vivi
Quoted 47 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm- tip,
since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf drm_tip_config=( · line 82
Quoted 1 line
nightly.conf +1
-0+ "drm-xe drm-xe-next b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDs
Quoted 6 lines
Quoted 3 lines
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?This sounds to me like topic/core-for-CI? Or is there any drawback with that?
I think some of them are not really a "for CI". It's more like the workflow we are adopting e.g. with guc/huc, not sending it to linux-firmware until we are confident on what version we will start officially supporting.
This one can't go to topic/core-for-CI neither:
fcb3410197f05 fault-inject: Include linux/types.h by default.
what it would do would be that we would not see the build error anymore, but everyone else would (and it's not a CI-only configuration). Unless it's merged to another branch, we shouldn't merge it.
"52383b58eb8cf mei/hdcp: Also enable for XE" could be material for topic/core-for-CI and "8ebd9cd71f8ac drm/xe: Add PVC's PCI device IDs" could either be on that branch or another xe-specific one.
Quoted 6 lines
Quoted 3 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will, at least for now, only update drm-tip with our fixes?
ack
Lucas De Marchi
Quoted 16 lines
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"
--
2.42.0
Quoted 69 lines · Lucas De Marchi
Quoted 68 lines · Thomas Hellström
Quoted 66 lines · Rodrigo Vivi
Quoted 47 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm- tip,
since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf drm_tip_config=( · line 82
Quoted 1 line
nightly.conf +1
-0+ "drm-xe drm-xe-next b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDsWill it be the topic/core-for-CI?
or topic/xe-extras?
or what?
Quoted 7 lines
Quoted 2 lines
This sounds to me like topic/core-for-CI? Or is there any drawback with that?
I think some of them are not really a "for CI". It's more like the workflow we are adopting e.g. with guc/huc, not sending it to linux-firmware until we are confident on what version we will start officially supporting.
yeap, I kind of agree here, but at the same time it is our way to run our CI with the firmware blobs that we need while not final, and also this was already used for i915's MTL firmware.
Quoted 7 lines
This one can't go to topic/core-for-CI neither:
fcb3410197f05fault-inject: Includelinux/types.hby default.what it would do would be that we would not see the build error anymore, but everyone else would (and it's not a CI-only configuration). Unless it's merged to another branch, we shouldn't merge it.
yeap. it is sad that we were ignored there. let's just drop this then. our driver is workarounding this bug anyway already.
Quoted 4 lines
"
52383b58eb8cfmei/hdcp: Also enable for XE" could be material for topic/core-for-CI and "8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDs" could either be on that branch or another xe-specific one.
yeap. For the MEI we probably need to ping Greg on the original submission and ask his ack so we can put that in the final drm-xe-next for good and not even include in a topic branch.
for the PVC IDs, the topic branch could be okay as well. But if we end up with an exclusive branch for xe, then it is better there.
Quoted 28 lines
Quoted 7 lines
Quoted 4 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will, at least for now, only update drm-tip with our fixes?
ack
Lucas De Marchi
Quoted 16 lines
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"
--
2.42.0
Rodrigo Vivi
Acked-byQuoted 68 lines · Thomas Hellström
Quoted 63 lines · Rodrigo Vivi
Quoted 47 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm- tip,
since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf drm_tip_config=( · line 82
Quoted 1 line
nightly.conf +1
-0+ "drm-xe drm-xe-next b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDsQuoted 3 lines
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?
Quoted 8 lines
This sounds to me like topic/core-for-CI? Or is there any drawback with that?
Quoted 2 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will, at least for now, only update drm-tip with our fixes?
yeap, likely a good idea.
But we just move the final drm-xe-next after figuring out the topic branches and the final rebases fixing the tags and the commiter's s-o-b and the fixes tags.
Quoted 16 lines
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"Signature · 1 line
2.42.0
Quoted 73 lines · Rodrigo Vivi
Quoted 72 lines · Lucas De Marchi
Quoted 70 lines · Thomas Hellström
Quoted 63 lines · Rodrigo Vivi
Quoted 47 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm- tip,
since that branch tip is currently adapted for our CI testing.Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Oded Gabbay <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Thomas Hellström <[email protected]>---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf drm_tip_config=( · line 82
Quoted 1 line
nightly.conf +1
-0+ "drm-xe drm-xe-next b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDsQuoted 3 lines
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?This sounds to me like topic/core-for-CI? Or is there any drawback with that?
Quoted 8 lines
Quoted 4 lines
I think some of them are not really a "for CI". It's more like the workflow we are adopting e.g. with guc/huc, not sending it to linux-firmware until we are confident on what version we will start officially supporting.
yeap, I kind of agree here, but at the same time it is our way to run our CI with the firmware blobs that we need while not final, and also this was already used for i915's MTL firmware.
ok
Quoted 11 lines
Quoted 8 lines
This one can't go to topic/core-for-CI neither:
fcb3410197f05fault-inject: Includelinux/types.hby default.what it would do would be that we would not see the build error anymore, but everyone else would (and it's not a CI-only configuration). Unless it's merged to another branch, we shouldn't merge it.
yeap. it is sad that we were ignored there. let's just drop this then. our driver is workarounding this bug anyway already.
agreed, let's drop it.
Quoted 7 lines
Quoted 6 lines
"
52383b58eb8cfmei/hdcp: Also enable for XE" could be material for topic/core-for-CI and "8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDs" could either be on that branch or another xe-specific one.
Quoted 6 lines
yeap. For the MEI we probably need to ping Greg on the original submission and ask his ack so we can put that in the final drm-xe-next for good and not even include in a topic branch.
for the PVC IDs, the topic branch could be okay as well. But if we end up with an exclusive branch for xe, then it is better there.
fair enough... I'm ok starting with topic/core-for-CI and if it ever becomes a problem, to create a xe-specific topic branch.
thanks
Lucas De Marchi
Quoted 29 lines
Quoted 29 lines
Quoted 8 lines
Quoted 5 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will, at least for now, only update drm-tip with our fixes?
ack
Lucas De Marchi
Quoted 16 lines
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"
--
2.42.0
Quoted 129 lines · Lucas De Marchi
Quoted 89 lines · Rodrigo Vivi
Quoted 81 lines · Lucas De Marchi
Quoted 72 lines · Thomas Hellström
Quoted 71 lines · Rodrigo Vivi
Quoted 51 lines · Thomas Hellström
Add the xe repo to drm-tip and the dim tools.
For now use the sha1 of the first drm-xe-next pull request for drm-
tip,
since that branch tip is currently adapted for our CI testing.Cc: Rodrigo Vivi <[email protected]>
Cc: Lucas De Marchi <[email protected]>
Cc: Oded Gabbay <[email protected]>
Cc: [email protected]
Cc: Maarten Lankhorst <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Thomas Hellström <[email protected]>
---
nightly.conf | 7 +++++++1 file changed, 7 insertions(+)nightly.conf +0
-0@@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tiphttps://anongit.freedesktop.org/git/drm/drm-tip
https://anongit.freedesktop.org/git/drm/drm-tip.git
"nightly.conf +4
-0+drm_tip_repos[drm-xe]=" +ssh://[email protected]/drm/xe/kernel.git +https://gitlab.freedesktop.org/drm/xe/kernel.git +"drm_tip_repos[drm-intel]=" ssh://git.freedesktop.org/git/drm/drm-intel ssh://git.freedesktop.org/git/drm-intel
nightly.conf +0
-0@@ -65,14 +69,17 @@ drm_tip_config=("drm drm-fixes"
"drm-misc drm-misc-fixes"
"drm-intel drm-intel-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-fixes"
"drm drm-next"
"drm-misc drm-misc-next-fixes"
"drm-intel drm-intel-next-fixes"nightly.conf +1
-0+ "drm-xe drm-xe-next-fixes"
"drm-misc drm-misc-next"
"drm-intel drm-intel-next"
"drm-intel drm-intel-gt-next"nightly.conf +1
-0+ "drm-xe drm-xe-nextQuoted 1 line
b6e1b7081768"yeap, up to this commit nothing else should change, but then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69drm/xe/guc: define LNL FW2cfc5ae1b8267drm/xe/guc: define PVC FW52383b58eb8cfmei/hdcp: Also enable for XEbea27d7369855mei: gsc: add support for auxiliary device created by
Xe driverfcb3410197f05fault-inject: Includelinux/types.hby default.8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDsQuoted 7 lines
Quoted 3 lines
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?This sounds to me like topic/core-for-CI? Or is there any drawback with
that?Quoted 6 lines
I think some of them are not really a "for CI". It's more like the
workflow we are adopting e.g. with guc/huc, not sending it to linux-firmware
until we are confident on what version we will start officially supporting.Quoted 5 lines
yeap, I kind of agree here, but at the same time it is our way to run
our CI with the firmware blobs that we need while not final, and also
this was already used for i915's MTL firmware.ok
Quoted 6 lines
Quoted 6 lines
This one can't go to topic/core-for-CI neither:
fcb3410197f05fault-inject: Includelinux/types.hby
default.Quoted 8 lines
Quoted 4 lines
what it would do would be that we would not see the build error anymore,
but everyone else would (and it's not a CI-only configuration). Unless it's merged to another branch, we shouldn't merge it.yeap. it is sad that we were ignored there. let's just drop this then.
our driver is workarounding this bug anyway already.agreed, let's drop it.
Quoted 14 lines
Quoted 8 lines
"
52383b58eb8cfmei/hdcp: Also enable for XE" could be material for
topic/core-for-CI and "8ebd9cd71f8acdrm/xe: Add PVC's PCI device IDs"
could either be on that branch or another xe-specific one.yeap. For the MEI we probably need to ping Greg on the original submission and ask his ack so we can put that in the final drm-xe- next
for good and not even include in a topic branch.
Quoted 5 lines
Quoted 2 lines
for the PVC IDs, the topic branch could be okay as well. But if we end up with an exclusive branch for xe, then it is better there.
fair enough... I'm ok starting with topic/core-for-CI and if it ever becomes a problem, to create a xe-specific topic branch.
Actually looking at the documented rules for core-for-CI, I think we should create a topic branch drm-xe/xe-for-CI or something similar that hold the patches that touch the xe driver. core-for-CI is meant for changes outside of drm and when rebased should be rooted in a linux upstream release or -rc. I figure we'd want xe-for-CI to be rooted in drm-xe-next assuming we may want to change the code these patches touch and quickly rebase xe-for-CI accordingly?
/Thomas
Quoted 34 lines
thanks
Lucas De MarchiQuoted 30 lines
Quoted 30 lines
Quoted 9 lines
Quoted 5 lines
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will,
at least for now, only update drm-tip with our fixes?ack
Lucas De Marchi
Quoted 16 lines
Thanks,
/Thomas
Quoted 9 lines
Acked-by Rodrigo Vivi <[email protected]>Quoted 6 lines
"drm-intel topic/core-for-CI"
"drm-misc topic/i915-ttm"
--
2.42.0