From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Arnd Bergmann <arnd@arndb.de>, Dave Airlie <airlied@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-pci@vger.kernel.org, "Arnd Bergmann" <arnd@kernel.org>,
virtualization@lists.linux-foundation.org,
spice-devel@lists.freedesktop.org,
dri-devel@lists.freedesktop.org
Subject: [PATCH v3 07/38] drm: handle HAS_IOPORT dependencies
Date: Tue, 14 Mar 2023 13:11:45 +0100 [thread overview]
Message-ID: <20230314121216.413434-8-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20230314121216.413434-1-schnelle@linux.ibm.com>
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. We thus need to add HAS_IOPORT as dependency for
those drivers using them. In the bochs driver there is optional MMIO
support detected at runtime, warn if this isn't taken when
HAS_IOPORT is not defined.
There is also a direct and hard coded use in cirrus.c which according to
the comment is only necessary during resume. Let's just skip this as
for example s390 which doesn't have I/O port support also doesen't
support suspend/resume.
Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
drivers/gpu/drm/qxl/Kconfig | 1 +
drivers/gpu/drm/tiny/bochs.c | 19 +++++++++++++++++++
drivers/gpu/drm/tiny/cirrus.c | 2 ++
3 files changed, 22 insertions(+)
diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig
index ca3f51c2a8fe..d0e0d440c8d9 100644
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@ -2,6 +2,7 @@
config DRM_QXL
tristate "QXL virtual GPU"
depends on DRM && PCI && MMU
+ depends on HAS_IOPORT
select DRM_KMS_HELPER
select DRM_TTM
select DRM_TTM_HELPER
diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c
index 024346054c70..da4a5d53b003 100644
--- a/drivers/gpu/drm/tiny/bochs.c
+++ b/drivers/gpu/drm/tiny/bochs.c
@@ -2,6 +2,7 @@
#include <linux/module.h>
#include <linux/pci.h>
+#include <asm/bug.h>
#include <drm/drm_aperture.h>
#include <drm/drm_atomic_helper.h>
@@ -105,7 +106,11 @@ static void bochs_vga_writeb(struct bochs_device *bochs, u16 ioport, u8 val)
writeb(val, bochs->mmio + offset);
} else {
+#ifdef HAS_IOPORT
outb(val, ioport);
+#else
+ WARN_ONCE(1, "Non-MMIO bochs device needs HAS_IOPORT");
+#endif
}
}
@@ -119,7 +124,12 @@ static u8 bochs_vga_readb(struct bochs_device *bochs, u16 ioport)
return readb(bochs->mmio + offset);
} else {
+#ifdef HAS_IOPORT
return inb(ioport);
+#else
+ WARN_ONCE(1, "Non-MMIO bochs device needs HAS_IOPORT");
+ return 0xff;
+#endif
}
}
@@ -132,8 +142,13 @@ static u16 bochs_dispi_read(struct bochs_device *bochs, u16 reg)
ret = readw(bochs->mmio + offset);
} else {
+#ifdef HAS_IOPORT
outw(reg, VBE_DISPI_IOPORT_INDEX);
ret = inw(VBE_DISPI_IOPORT_DATA);
+#else
+ WARN_ONCE(1, "Non-MMIO bochs device needs HAS_IOPORT");
+ ret = 0xffff;
+#endif
}
return ret;
}
@@ -145,8 +160,12 @@ static void bochs_dispi_write(struct bochs_device *bochs, u16 reg, u16 val)
writew(val, bochs->mmio + offset);
} else {
+#ifdef HAS_IOPORT
outw(reg, VBE_DISPI_IOPORT_INDEX);
outw(val, VBE_DISPI_IOPORT_DATA);
+#else
+ WARN_ONCE(1, "Non-MMIO bochs device needs HAS_IOPORT");
+#endif
}
}
diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index accfa52e78c5..9da89732c5ac 100644
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -308,8 +308,10 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,
cirrus_set_start_address(cirrus, 0);
+#ifdef CONFIG_HAS_IOPORT
/* Unblank (needed on S3 resume, vgabios doesn't do it then) */
outb(0x20, 0x3c0);
+#endif
drm_dev_exit(idx);
return 0;
--
2.37.2
next prev parent reply other threads:[~2023-03-14 12:13 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 12:11 [PATCH v3 00/38] Kconfig: Introduce HAS_IOPORT config option Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 01/38] Kconfig: introduce HAS_IOPORT option and select it as necessary Niklas Schnelle
2023-03-14 12:37 ` Johannes Berg
2023-03-23 13:23 ` Niklas Schnelle
2023-03-14 12:48 ` Geert Uytterhoeven
2023-03-14 13:29 ` Arnd Bergmann
2023-03-14 16:11 ` Niklas Schnelle
2023-03-14 16:37 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 02/38] ata: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-15 1:23 ` Damien Le Moal
2023-03-15 6:46 ` Arnd Bergmann
2023-03-15 7:15 ` Damien Le Moal
2023-03-15 7:15 ` Damien Le Moal
2023-03-15 8:39 ` Geert Uytterhoeven
2023-03-15 9:12 ` Damien Le Moal
2023-03-15 11:36 ` Geert Uytterhoeven
2023-03-15 23:57 ` Damien Le Moal
2023-03-16 15:21 ` Arnd Bergmann
2023-04-28 13:32 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 03/38] char: impi, tpm: depend on HAS_IOPORT Niklas Schnelle
2023-03-14 12:20 ` Jarkko Sakkinen
2023-03-14 14:01 ` Arnd Bergmann
2023-03-14 13:52 ` Corey Minyard
2023-03-14 14:17 ` Geert Uytterhoeven
2023-03-14 15:08 ` Arnd Bergmann
2023-03-21 14:33 ` Jason Gunthorpe
2023-03-14 12:11 ` [PATCH v3 04/38] comedi: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 05/38] counter: " Niklas Schnelle
2023-03-14 12:41 ` William Breathitt Gray
2023-04-28 13:27 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 06/38] /dev/port: don't compile file operations without CONFIG_DEVPORT Niklas Schnelle
2023-03-14 12:11 ` Niklas Schnelle [this message]
2023-03-15 11:54 ` [PATCH v3 07/38] drm: handle HAS_IOPORT dependencies Jani Nikula
2023-03-23 15:05 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 08/38] firmware: dmi-sysfs: handle HAS_IOPORT=n Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 09/38] gpio: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-15 8:42 ` Linus Walleij
2023-04-28 14:41 ` Niklas Schnelle
2023-05-01 12:29 ` Linus Walleij
2023-03-14 12:11 ` [PATCH v3 10/38] hwmon: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 11/38] i2c: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 12/38] iio: ad7606: Kconfig: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 13/38] Input: " Niklas Schnelle
2023-03-15 8:22 ` Geert Uytterhoeven
2023-04-28 14:50 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 14/38] Input: gameport: add ISA and " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 15/38] leds: add " Niklas Schnelle
2023-03-16 16:14 ` Lee Jones
2023-03-23 12:42 ` Niklas Schnelle
2023-03-23 13:32 ` Arnd Bergmann
2023-03-23 14:02 ` Niklas Schnelle
2023-03-23 14:05 ` Arnd Bergmann
2023-03-23 16:11 ` Geert Uytterhoeven
2023-03-23 16:25 ` Arnd Bergmann
2023-03-23 14:53 ` Lee Jones
2023-03-23 15:33 ` Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 16/38] media: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 17/38] misc: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 18/38] mISDN: " Niklas Schnelle
2023-03-15 5:41 ` Jakub Kicinski
2023-03-14 12:11 ` [PATCH v3 19/38] mpt fusion: " Niklas Schnelle
2023-03-14 12:11 ` [PATCH v3 20/38] net: handle " Niklas Schnelle
2023-03-15 5:41 ` Jakub Kicinski
2023-03-15 9:47 ` Maciej W. Rozycki
2023-03-14 12:11 ` [PATCH v3 21/38] parport: PC style parport depends on HAS_IOPORT Niklas Schnelle
2023-03-14 14:12 ` Arnd Bergmann
2023-05-02 13:40 ` Niklas Schnelle
2023-05-02 15:30 ` Bjorn Helgaas
2023-03-14 12:12 ` [PATCH v3 22/38] PCI: Make quirk using inw() depend " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 23/38] PCI/sysfs: Make I/O resource " Niklas Schnelle
2023-03-14 16:05 ` Bjorn Helgaas
2023-03-14 12:12 ` [PATCH v3 24/38] pcmcia: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 25/38] platform: " Niklas Schnelle
2023-03-15 2:21 ` Tzung-Bi Shih
2023-03-14 12:12 ` [PATCH v3 26/38] pnp: " Niklas Schnelle
2023-03-20 17:37 ` Rafael J. Wysocki
2023-03-21 13:56 ` Rafael J. Wysocki
2023-03-23 12:55 ` Niklas Schnelle
2023-03-24 18:45 ` Wysocki, Rafael J
2023-03-14 12:12 ` [PATCH v3 27/38] power: " Niklas Schnelle
2023-03-29 23:01 ` Sebastian Reichel
2023-03-14 12:12 ` [PATCH v3 28/38] rtc: " Niklas Schnelle
2023-03-14 12:52 ` Alexandre Belloni
2023-05-08 15:36 ` Niklas Schnelle
2023-05-08 20:01 ` Arnd Bergmann
2023-05-09 6:38 ` Geert Uytterhoeven
2023-05-09 8:22 ` Arnd Bergmann
2023-05-09 8:51 ` Geert Uytterhoeven
2023-05-09 9:46 ` Arnd Bergmann
2023-03-14 12:12 ` [PATCH v3 29/38] scsi: " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 30/38] sound: " Niklas Schnelle
2023-03-14 12:33 ` Takashi Iwai
2023-05-08 16:41 ` Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 31/38] speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 32/38] staging: add HAS_IOPORT dependencies Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 33/38] tty: serial: handle " Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 34/38] usb: " Niklas Schnelle
2023-03-14 14:56 ` Arnd Bergmann
2023-03-14 12:12 ` [PATCH v3 35/38] video: " Niklas Schnelle
2023-03-15 8:16 ` Geert Uytterhoeven
2023-03-15 10:19 ` Ville Syrjälä
2023-03-23 14:17 ` Niklas Schnelle
2023-03-23 16:08 ` Ville Syrjälä
2023-05-08 17:09 ` Niklas Schnelle
2023-03-14 12:12 ` [PATCH v3 36/38] watchdog: add " Niklas Schnelle
2023-03-14 14:21 ` Guenter Roeck
2023-03-14 12:12 ` [PATCH v3 37/38] wireless: " Niklas Schnelle
2023-03-15 5:26 ` Kalle Valo
2023-03-14 12:12 ` [PATCH v3 38/38] asm-generic/io.h: drop inb() etc for HAS_IOPORT=n Niklas Schnelle
2023-03-14 14:05 ` [PATCH v3 00/38] Kconfig: Introduce HAS_IOPORT config option Arnd Bergmann
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=20230314121216.413434-8-schnelle@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=bhelgaas@google.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=kraxel@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael@kernel.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=stern@rowland.harvard.edu \
--cc=u.kleine-koenig@pengutronix.de \
--cc=virtualization@lists.linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).