[Git][xorg-team/driver/xserver-xorg-video-vesa][debian-unstable] 15 commits: Newline-terminate a few error messages

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-vesa

Commits:

36662233

by Adam Jackson at 2018-08-28T15:26:46-04:00

Newline-terminate a few error messages

Signed-off-by: Adam Jackson <ajax@redhat.com>

2645e0aa

by Adam Jackson at 2018-08-29T14:45:35-04:00

Refuse to run on UEFI machines

No possible good can come of this.

v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer")
instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by
Peter Jones.

Reviewed-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>

50366592

by Alan Coopersmith at 2018-11-18T16:43:51-08:00

Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

637c968d

by Alan Coopersmith at 2018-12-07T19:19:22-08:00

Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

634dae74

by Adam Jackson at 2019-03-06T12:45:11-05:00

Try harder to avoid 24bpp

We're preferring depth 24 even if that means 24bpp. Newer servers don't
support 24bpp anymore, and even for old servers it's suboptimal. Change
the heuristic to only try 24bpp if the alternative is pseudocolor.

Fixes: xorg/driver/xf86-video-vesa#3

53c7796e

by Benjamin Tissoires at 2019-05-10T10:43:53+02:00

Refuse to run on UEFI machines running older kernels

Prior to kernel v3.12, the efi framebuffer driver was named "efifb".
This cause problem on RHEL 7 as the base kernel is 3.10.

"efi-framebuffer.0" was added by commit 2645e0aa for that reason
(don't run on UEFI machine).
The change from "efifb" to "efi-framebuffer" was done with commit
e6816a8 in the kernel

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
[ofourdan: updated commit message with commit references]
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

51a73f2f

by Adam Jackson at 2019-07-10T14:53:51+00:00

Disable shadow by default on known-virtual GPUs

Device memory is the same domain as host memory, in this case, so the
shadow just introduces more memcpy.

Signed-off-by: Adam Jackson <ajax@redhat.com>

68f2589c
by Adam Jackson at 2020-09-10T18:01:44-04:00
```
vesa 2.5.0
```

c29f75fa

by Timo Aaltonen at 2020-09-24T10:58:01+03:00

Merge branch 'upstream-unstable' into debian-unstable

2ec29a23
by Timo Aaltonen at 2020-09-24T10:58:21+03:00
```
bump the version
```
d718aca3
by Timo Aaltonen at 2020-09-24T11:03:25+03:00
```
Bump debhelper to 12.
```
8d3c10df
by Timo Aaltonen at 2020-09-24T11:06:28+03:00
```
upstream: Add ajax's gpg key to signing-key.asc.
```
8846d9b7
by Timo Aaltonen at 2020-09-24T11:07:04+03:00
```
control: Migrate to x11proto-dev.
```
5dcda4f6
by Timo Aaltonen at 2020-09-24T11:07:20+03:00
```
control: Bump policy to 4.5.0.
```
8818439e
by Timo Aaltonen at 2020-09-24T11:07:46+03:00
```
release to sid
```

Changes:

Makefile.am

@@ -29,3 +29,5 @@ ChangeLog:
  	$(CHANGELOG_CMD)
  dist-hook: ChangeLog INSTALL
++
 +EXTRA_DIST = README.md

README → README.md

  xf86-video-vesa - Generic VESA video driver for the Xorg X server
+-
 -Please submit bugs & patches to the Xorg bugzilla:
+-
 -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 +-----------------------------------------------------------------
  All questions regarding this software should be directed at the
  Xorg mailing list:
 -        http://lists.freedesktop.org/mailman/listinfo/xorg
 +  https://lists.x.org/mailman/listinfo/xorg
  The master development code repository can be found at:
 -        git://anongit.freedesktop.org/git/xorg/driver/xf86-video-vesa
 +  https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
 -        http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa
 +Please submit bug reports and requests to merge patches there.
 -For more information on the git code manager, see:
 +For patch submission instructions, see:
 -        http://wiki.x.org/wiki/GitPage
 +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches

configure.ac

@@ -23,8 +23,8 @@
  # Initialize Autoconf
  AC_PREREQ([2.60])
  AC_INIT([xf86-video-vesa],
 -        [2.4.0],
 -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 +        [2.5.0],
 +        [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa/issues],
          [xf86-video-vesa])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([config.h])

debian/changelog

 +xserver-xorg-video-vesa (1:2.5.0-1) unstable; urgency=medium
++
 +  * New upstream release.
 +  * Bump debhelper to 12.
 +  * upstream: Add ajax's gpg key to signing-key.asc.
 +  * control: Migrate to x11proto-dev.
 +  * control: Bump policy to 4.5.0.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 24 Sep 2020 11:07:22 +0300
++
  xserver-xorg-video-vesa (1:2.4.0-2) unstable; urgency=medium
    * Cherry-pick a commit to fix default bpp selection. (LP: #1818879)

debian/compat deleted

-9

debian/control

@@ -3,19 +3,14 @@ Section: x11
  Priority: optional
  Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
  Build-Depends:
 - debhelper (>= 9),
 - dh-autoreconf,
 + debhelper-compat (= 12),
   pkg-config,
   xserver-xorg-dev (>= 2:1.11),
 - x11proto-xext-dev,
 - x11proto-core-dev,
 - x11proto-fonts-dev,
 - x11proto-randr-dev,
 - x11proto-render-dev,
 + x11proto-dev,
   xutils-dev (>= 1:7.5+4),
   quilt,
   libpciaccess-dev (>= 0.12.901),
 -Standards-Version: 4.2.0
 +Standards-Version: 4.5.0
  Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-vesa.git
  Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-vesa

debian/rules

@@ -12,11 +12,14 @@ override_dh_auto_install:
  # Kill *.la files, and forget no-one:
  override_dh_install:
  	find debian/tmp -name '*.la' -delete
 -	dh_install --fail-missing
 +	dh_install
++
 +override_dh_missing:
 +	dh_missing --fail-missing
  # That's a plugin, use appropriate warning level:
  override_dh_shlibdeps:
  	dh_shlibdeps -- --warnings=6
  %:
 -	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
 +	dh $@ --with quilt,xsf --builddirectory=build/

debian/upstream/signing-key.asc

@@ -39,3 +39,44 @@ UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC
  GBF1
  =bYOv
  -----END PGP PUBLIC KEY BLOCK-----
 +-----BEGIN PGP PUBLIC KEY BLOCK-----
++
 +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
 +gPSRdLLYOLo=
 +=+H4u
 +-----END PGP PUBLIC KEY BLOCK-----

src/vesa.c

@@ -43,7 +43,7 @@
  #endif
  #include <string.h>
+-
 +#include <unistd.h>
  #include "vesa.h"
  /* All drivers initialising the SW cursor need this */
@@ -450,7 +450,15 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
  	     intptr_t match_data)
+ {
      ScrnInfoPtr pScrn;
+-
++
 +#ifdef __linux__
 +    if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0 ||
 +        access("/sys/devices/platform/efifb.0", F_OK) == 0) {
 +        ErrorF("vesa: Refusing to run on UEFI\n");
 +        return FALSE;
 +    }
 +#endif
++
      pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
  				NULL, NULL, NULL, NULL, NULL);
      if (pScrn != NULL) {
@@ -846,9 +854,38 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(pVesa->Options, VESAOptions, sizeof(VESAOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pVesa->Options);
 -    /* Use shadow by default */
 -    pVesa->shadowFB = xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB,
 -                                           TRUE);
 +    /* Use shadow by default, for non-virt hardware */
 +    if (!xf86GetOptValBool(pVesa->Options, OPTION_SHADOW_FB, &pVesa->shadowFB))
 +    {
 +	switch (pVesa->pciInfo->vendor_id) {
 +	    case 0x1234: /* bochs vga (not in pci.ids) */
 +	    case 0x15ad: /* vmware */
 +	    case 0x1b36: /* qemu qxl */
 +	    case 0x80ee: /* virtualbox */
 +	    case 0xaaaa: /* parallels (not in pci.ids) */
 +		pVesa->shadowFB = FALSE;
 +		break;
++
 +	    case 0x1013: /* qemu's cirrus emulation */
 +		if (pVesa->pciInfo->subvendor_id == 0x1af4)
 +		    pVesa->shadowFB = FALSE;
 +		else
 +		    pVesa->shadowFB = TRUE;
 +		break;
++
 +	    case 0x1414: /* microsoft hyper-v */
 +		if (pVesa->pciInfo->device_id == 0x5353)
 +		    pVesa->shadowFB = FALSE;
 +		else
 +		    pVesa->shadowFB = TRUE;
 +		break;
++
 +	    default:
 +		pVesa->shadowFB = TRUE;
 +		break;
 +	}
 +    }
++
      /*  Use default refresh by default. Too many VBE 3.0
       *   BIOSes are incorrectly implemented.
       */
@@ -876,14 +913,14 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
  		    break;
  		default:
  		    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 -			       "Unsupported bpp: %d", pScrn->bitsPerPixel);
 +			       "Unsupported bpp: %d\n", pScrn->bitsPerPixel);
  		    vbeFree(pVesa->pVbe);
  		    return FALSE;
+ 	    }
  	    break;
  	default:
  	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 -		       "Unsupported Memory Model: %d", mode->MemoryModel);
 +		       "Unsupported Memory Model: %d\n", mode->MemoryModel);
  	    return FALSE;
+     }