summarylogtreecommitdiffstats
path: root/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
diff options
context:
space:
mode:
authorarchdevlab2024-05-15 21:07:36 -0400
committerarchdevlab2024-05-15 21:07:36 -0400
commit5a43cf9ecd59c593f67dd6e933e81382aa9bc757 (patch)
tree5c71bf2e5e1a49d41488941fb4b6ec2897df3293 /0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
parent9f22953d66d9a826dc9aa44d4b1d13f1dff8f215 (diff)
downloadaur-linux-llvm.tar.gz
6.9.0
Diffstat (limited to '0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch')
-rw-r--r--0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
index 3226f7f42282..0e645535dd7d 100644
--- a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
+++ b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
@@ -1,7 +1,7 @@
-From 4d23b7ca9ef7806857a57a607a8bac22fd8e5b13 Mon Sep 17 00:00:00 2001
+From 7ad6dc7e357287e5116c3a66b58b6f53e3fd03d0 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Thu, 19 May 2022 14:40:07 +0200
-Subject: [PATCH 2/3] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1
+Subject: [PATCH 2/4] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1
is set
The Nvidia proprietary driver has some bugs that leads to issues if used
@@ -49,10 +49,10 @@ Cherry-picked-for: https://bugs.archlinux.org/task/73720
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
-index 3c197db42..16e4a2e90 100644
+index 880ffcb50..9da05ab3c 100644
--- a/drivers/firmware/sysfb.c
+++ b/drivers/firmware/sysfb.c
-@@ -34,6 +34,22 @@
+@@ -35,6 +35,22 @@
#include <linux/screen_info.h>
#include <linux/sysfb.h>
@@ -75,15 +75,15 @@ index 3c197db42..16e4a2e90 100644
static struct platform_device *pd;
static DEFINE_MUTEX(disable_lock);
static bool disabled;
-@@ -85,7 +101,7 @@ static __init int sysfb_init(void)
+@@ -134,7 +150,7 @@ static __init int sysfb_init(void)
/* try to create a simple-framebuffer device */
compatible = sysfb_parse_mode(si, &mode);
- if (compatible) {
+ if (compatible && !skip_simpledrm) {
- pd = sysfb_create_simplefb(si, &mode);
+ pd = sysfb_create_simplefb(si, &mode, parent);
if (!IS_ERR(pd))
goto unlock_mutex;
--
-2.44.0
+2.45.1