Attachment 34500 Details for Bug 26878 – New patch, with shouty configure warning

[patch] New patch, with shouty configure warning

0001-Refuse-to-bind-to-a-device-which-has-kernel-modesett.patch (text/plain), 3.82 KB, created by Christopher James Halse Rogers on 2010-03-26 16:01:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher James Halse Rogers

Created: 2010-03-26 16:01:35 UTC

Size: 3.82 KB

patch

obsolete

>From 1500ed9d9f336d8b57d2c6c9b6435c89e8fc99f0 Mon Sep 17 00:00:00 2001
>From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
>Date: Sat, 27 Mar 2010 09:34:27 +1100
>Subject: [PATCH] Refuse to bind to a device which has kernel modesetting active.
>
>Trying to program a VESA mode while kernel modesetting is active can
>result in an improperly driven screen.
>
>Fixes http://bugs.freedesktop.org/show_bug.cgi?id=26878
>
>Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
>---
> configure.ac    |   11 +++++++++++
> src/Makefile.am |    2 +-
> src/vesa.c      |   35 +++++++++++++++++++++++++++++++++++
> 3 files changed, 47 insertions(+), 1 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 51d9d33..f59e88c 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -98,6 +98,17 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
> # Checks for header files.
> AC_HEADER_STDC
> 
>+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
>+    PKG_CHECK_MODULES(LIBDRM, [libdrm > 2.4.3 xf86driproto], HAVE_KMS="yes", HAVE_KMS="no")
>+    if test "x$HAVE_KMS" = xyes; then
>+        AC_DEFINE(HAVE_KMS, 1, [Have kernel modesetting])
>+    else
>+        AC_MSG_WARN(Support for detecting kernel modesetting drivers is not available.)
>+        AC_MSG_WARN(This driver can cause display problems in the presence of kernel modesetting.)
>+        AC_MSG_WARN(Please install libdrm > 2.4.3 and xf86driproto to enable kms detection.)
>+    fi
>+fi
>+
> DRIVER_NAME=vesa
> AC_SUBST([DRIVER_NAME])
> 
>diff --git a/src/Makefile.am b/src/Makefile.am
>index dc702f0..aae7e4c 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -25,7 +25,7 @@
> # _ladir passes a dummy rpath to libtool so the thing will actually link
> # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
> 
>-AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) $(LIBDRM_CFLAGS)
> 
> vesa_drv_la_LTLIBRARIES = vesa_drv.la
> vesa_drv_la_LDFLAGS = -module -avoid-version
>diff --git a/src/vesa.c b/src/vesa.c
>index 034a019..8c46f7b 100644
>--- a/src/vesa.c
>+++ b/src/vesa.c
>@@ -65,6 +65,10 @@
> #include <X11/extensions/dpms.h>
> #endif
> 
>+#ifdef HAVE_KMS
>+#include <xf86drmMode.h>
>+#include <dri.h>
>+#endif
> 
> /* Mandatory functions */
> static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
>@@ -106,6 +110,9 @@ static void SaveFonts(ScrnInfoPtr pScrn);
> static void RestoreFonts(ScrnInfoPtr pScrn);
> static Bool 
> VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function);
>+#ifdef HAVE_KMS
>+static Bool VESAKernelModesettingEnabled (struct pci_device *device);
>+#endif
> 
> static void *
> VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
>@@ -317,6 +324,24 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
> 				(double)(ddcmode->HTotal * ddcmode->VTotal));
> }
> 
>+#ifdef HAVE_KMS
>+static Bool VESAKernelModesettingEnabled (struct pci_device *device)
>+{
>+    char *busIdString;
>+    int ret;
>+
>+    if (!xf86LoaderCheckSymbol("DRICreatePCIBusID"))
>+	return FALSE;
>+
>+    busIdString = DRICreatePCIBusID(device);
>+
>+    ret = drmCheckModesettingSupported(busIdString);
>+    xfree(busIdString);
>+
>+    return (ret == 0);    
>+}
>+#endif //HAVE_KMS
>+
> static ModeStatus
> VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
> {
>@@ -428,6 +453,16 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
> {
>     ScrnInfoPtr pScrn;
>     
>+#ifdef HAVE_KMS    
>+    /* Trying to bring up a VESA mode while kernel modesetting is enabled
>+       results in badness */
>+    if (VESAKernelModesettingEnabled (dev)) {
>+	xf86Msg (X_ERROR, 
>+	         "VESA: Kernel modesetting driver in use, refusing to load\n");
>+	return FALSE;
>+    }
>+#endif
>+
>     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
> 				NULL, NULL, NULL, NULL, NULL);
>     if (pScrn != NULL) {
>-- 
>1.7.0
>

Actions: View | Splinter Review

Attachments on bug 26878: 33749 | 34393 | 34500 | 35807

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.