From 09fa4b3099421225f6ad294a532c28633042464e Mon Sep 17 00:00:00 2001 From: Oscar Salvador Date: Apr 12 2023 10:10:04 +0000 Subject: Merge remote-tracking branch 'origin/users/tiwai/SLE15-SP5-GA/for-next' into SLE15-SP5-GA Pull drm build fix from Takashi Iwai --- diff --git a/patches.suse/drm-nouveau-blacklist-Turing-and-Ampere-models-as-default.patch b/patches.suse/drm-nouveau-blacklist-Turing-and-Ampere-models-as-default.patch index 425b88f..828403e 100644 --- a/patches.suse/drm-nouveau-blacklist-Turing-and-Ampere-models-as-default.patch +++ b/patches.suse/drm-nouveau-blacklist-Turing-and-Ampere-models-as-default.patch @@ -14,8 +14,8 @@ Signed-off-by: Takashi Iwai --- drivers/gpu/drm/nouveau/nouveau_blacklist.c | 186 ++++++++++++++++++++++++++++ - drivers/gpu/drm/nouveau/nouveau_drm.c | 35 +++++ - 2 files changed, 221 insertions(+) + drivers/gpu/drm/nouveau/nouveau_drm.c | 34 +++++ + 2 files changed, 220 insertions(+) --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_blacklist.c @@ -220,7 +220,7 @@ Signed-off-by: Takashi Iwai static struct drm_driver driver_stub; static struct drm_driver driver_pci; static struct drm_driver driver_platform; -@@ -741,6 +746,33 @@ static void quirk_broken_nv_runpm(struct +@@ -741,6 +746,32 @@ static void quirk_broken_nv_runpm(struct } } @@ -229,7 +229,6 @@ Signed-off-by: Takashi Iwai +static bool nouveau_probe_is_blacklisted(struct pci_dev *pdev) +{ + const u16 *p; -+ u16 val; + + if (pdev->vendor != PCI_VENDOR_ID_NVIDIA) + return false; @@ -254,7 +253,7 @@ Signed-off-by: Takashi Iwai static int nouveau_drm_probe(struct pci_dev *pdev, const struct pci_device_id *pent) { -@@ -748,6 +780,9 @@ static int nouveau_drm_probe(struct pci_ +@@ -748,6 +779,9 @@ static int nouveau_drm_probe(struct pci_ struct drm_device *drm_dev; int ret;