From: Karol Herbst on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2152
Those I'll need for the DRM backport https://gitlab.com/redhat/centos- stream/src/kernel/centos-stream-9/-/merge_requests/1395
Depends on https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2145
/cc @ddutile
Also disabled the option for `CONFIG_HSA_AMD_P2P` as with discussed we'll postpone enabling it until later. I might be wrong though.
--- redhat/configs/ark/generic/CONFIG_DRM_IMX8QM_LDB | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_LDB | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_COMBINER | 1 + redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI | 1 + redhat/configs/ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI | 1 + redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P | 2 +- redhat/configs/ark/generic/CONFIG_INTEL_MEI_GSC | 1 - redhat/configs/fedora/generic/x86/CONFIG_INTEL_MEI_GSC => redhat/configs/common/generic/x86/CONFIG_INTEL_MEI_GSC | 0 redhat/configs/pending-ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI | 13 ---------- 9 files changed, 6 insertions(+), 15 deletions(-)
From: Fedora Kernel Team kernel-team@fedoraproject.org
[redhat] New configs in drivers/gpu
Hi,
As part of the ongoing rebase effort, the following configuration options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply with a better option.
Symbol: DRM_RCAR_USE_MIPI_DSI [=n] Type : bool Defined at drivers/gpu/drm/rcar-du/Kconfig:47 Prompt: R-Car DU MIPI DSI Encoder Support Depends on: HAS_IOMEM [=y] && DRM_BRIDGE [=y] && OF [=y] Location: -> Device Drivers -> Graphics support -> R-Car DU MIPI DSI Encoder Support (DRM_RCAR_USE_MIPI_DSI [=n])
---
Cc: David Airlie airlied@redhat.com Cc: Adam Jackson ajax@redhat.com Cc: Lyude Paul lyude@redhat.com Cc: "Michel Dänzer" mdaenzer@redhat.com Cc: Karol Herbst kherbst@redhat.com Cc: Ben Skeggs bskeggs@redhat.com Cc: Jocelyn Falempe jfalempe@redhat.com Cc: "Mika Penttilä" mpenttil@redhat.com Signed-off-by: Fedora Kernel Team kernel-team@fedoraproject.org
diff --git a/redhat/configs/ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI b/redhat/configs/ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI @@ -0,0 +1 @@ +# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set diff --git a/redhat/configs/pending-ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI b/redhat/configs/pending-ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_DRM_RCAR_USE_MIPI_DSI +++ /dev/null @@ -1,13 +0,0 @@ -# Symbol: DRM_RCAR_USE_MIPI_DSI [=n] -# Type : bool -# Defined at drivers/gpu/drm/rcar-du/Kconfig:47 -# Prompt: R-Car DU MIPI DSI Encoder Support -# Depends on: HAS_IOMEM [=y] && DRM_BRIDGE [=y] && OF [=y] -# Location: -# -> Device Drivers -# -> Graphics support -# -> R-Car DU MIPI DSI Encoder Support (DRM_RCAR_USE_MIPI_DSI [=n]) -# -# -# -# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2152
From: Karol Herbst kherbst@redhat.com
[redhat] Update configs for the 9.2 DRM backport
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115876
Signed-off-by: Karol Herbst kherbst@redhat.com
diff --git a/redhat/configs/ark/generic/CONFIG_DRM_IMX8QM_LDB b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QM_LDB new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QM_LDB @@ -0,0 +1 @@ +# CONFIG_DRM_IMX8QM_LDB is not set diff --git a/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_LDB b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_LDB new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_LDB @@ -0,0 +1 @@ +# CONFIG_DRM_IMX8QXP_LDB is not set diff --git a/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_COMBINER b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_COMBINER new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_COMBINER @@ -0,0 +1 @@ +# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set diff --git a/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI @@ -0,0 +1 @@ +# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set diff --git a/redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P b/redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P +++ b/redhat/configs/ark/generic/CONFIG_HSA_AMD_P2P @@ -1 +1 @@ -CONFIG_HSA_AMD_P2P=y +# CONFIG_HSA_AMD_P2P is not set diff --git a/redhat/configs/ark/generic/CONFIG_INTEL_MEI_GSC b/redhat/configs/ark/generic/CONFIG_INTEL_MEI_GSC deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_INTEL_MEI_GSC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_INTEL_MEI_GSC is not set diff --git a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_MEI_GSC b/redhat/configs/common/generic/x86/CONFIG_INTEL_MEI_GSC rename from redhat/configs/fedora/generic/x86/CONFIG_INTEL_MEI_GSC rename to redhat/configs/common/generic/x86/CONFIG_INTEL_MEI_GSC index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_MEI_GSC +++ b/redhat/configs/common/generic/x86/CONFIG_INTEL_MEI_GSC
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2152
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2152#note_1174146...
The DRM_RCAR_USE_MIPI_DSI option probably doesn't need to be there, we don't enable ARCH_RENESAS anywhere.
kernel@lists.fedoraproject.org
-
Karol Herbst (via Email Bridge) -
pbrobinson (via Email Bridge)