Merge remote-tracking branch 'origin/master' into obsd

3 files changed, 67 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7891323..52f9d491 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+
 # FDO_DISTRIBUTION_TAG is the tag of the docker image used for the build
 # jobs. If the image doesn't exist yet, the docker-image stage generates it
 # or copies it from upstream (this is all handled by the templates).
@@ -12,21 +14,73 @@ variables:
   FDO_DISTRIBUTION_TAG: "2021-05-10"
   FDO_UPSTREAM_REPO: xorg/driver/xf86-video-ati
 
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
 include:
   - project: 'freedesktop/ci-templates'
-    ref: 290b79e0e78eab67a83766f4e9691be554fc4afd
+    ref: *template_sha
     file: '/templates/debian.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
 
 stages:
   - docker-image
   - build
+  - test
 
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: test
+  script:
+    - ci-fairy check-commits --junit-xml=results.xml
+  except:
+    - master@$FDO_UPSTREAM_REPO
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+  allow_failure: true
 
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: test
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if/when the tag changes, otherwise the existing image is
+# re-used.
+#
 container-build:
   extends:
     - .fdo.container-build@debian
   stage: docker-image
   variables:
+    GIT_STRATEGY: none
 
 
 # The default build instructions
diff --git a/src/radeon_glamor_wrappers.c b/src/radeon_glamor_wrappers.c
index edffd9ad..bc47cc89 100644
--- a/src/radeon_glamor_wrappers.c
+++ b/src/radeon_glamor_wrappers.c
@@ -1,12 +1,12 @@
 /*
- * Copyright © 2001 Keith Packard
+ * Copyright © 2001 Keith Packard
  *             2010 Intel Corporation
  *             2012,2015 Advanced Micro Devices, Inc.
  *
- * Partly based on code Copyright © 2008 Red Hat, Inc.
- * Partly based on code Copyright © 2000 SuSE, Inc.
+ * Partly based on code Copyright © 2008 Red Hat, Inc.
+ * Partly based on code Copyright © 2000 SuSE, Inc.
  *
- * Partly based on code that is Copyright © The XFree86 Project Inc.
+ * Partly based on code that is Copyright © The XFree86 Project Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 62962d61..51b00dd9 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn)
 	}
 }
 
+static void
+radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h,
+		     unsigned int subWindowMode)
+{
+}
+
+
 
 Bool
 radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
 	    SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
 				 xf86_crtc->nparams);
 
-	pScreen->SourceValidate = NULL;
+	pScreen->SourceValidate = radeonSourceValidate;
 	CompositePicture(PictOpSrc,
 			 src, NULL, dst,
 			 extents.x1, extents.y1, 0, 0, extents.x1,