[xsrc/trunk]: xsrc/external/mit/xf86-video-ati-kms/dist/src Backport upstream...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/fe3711cf92e6
branches:  trunk
changeset: 10479:fe3711cf92e6
user:      maya <maya%NetBSD.org@localhost>
date:      Sun Mar 08 18:27:51 2020 +0000

description:
Backport upstream commits (there is no newer release yet):

>From c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54 Mon Sep 17 00:00:00 2001
From: Alexey Sheplyakov <asheplyakov%altlinux.org@localhost>
Date: Wed, 27 Nov 2019 20:50:58 +0400
Subject: Don't crash X server if GPU acceleration is not available

>From 4d84cf438e7f1bebf0053035ef0292e9fed257d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer%redhat.com@localhost>
Date: Fri, 29 Nov 2019 16:37:32 +0100
Subject: Handle NULL fb_ptr in pixmap_get_fb

This can happen when HW acceleration is disabled.

>From Onno van der Linden in xsrc/55059.

diffstat:

 external/mit/xf86-video-ati-kms/dist/src/radeon.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 9bebc6b8e5c0 -r fe3711cf92e6 external/mit/xf86-video-ati-kms/dist/src/radeon.h
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon.h Mon Feb 24 09:32:31 2020 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon.h Sun Mar 08 18:27:51 2020 +0000
@@ -790,8 +790,8 @@
 
 static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
 {
+    RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
 #ifdef USE_GLAMOR
-    RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
 
     if (info->use_glamor) {
        struct radeon_pixmap *priv;
@@ -799,7 +799,7 @@
        return priv ? priv->bo : NULL;
     } else
 #endif
-    {
+    if (info->accelOn) {
        struct radeon_exa_pixmap_priv *driver_priv;
        driver_priv = exaGetPixmapDriverPrivate(pPix);
        return driver_priv ? driver_priv->bo : NULL;
@@ -896,7 +896,7 @@
                                   handle);
     }
 
-    return *fb_ptr;
+    return fb_ptr ? *fb_ptr : NULL;
 }