|
|
1
|
+From 3e380acf5366cf7e907aeedc9af9fa831178e31b Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
|
|
|
3
|
+Date: Sun, 14 Nov 2021 17:38:24 +0100
|
|
|
4
|
+Subject: [PATCH] Don't set SourceValidate pointer to NULL
|
|
|
5
|
+
|
|
|
6
|
+inspired from similar code in amdgpu, fixes a crash when xrandr(1)
|
|
|
7
|
+is invoqued with X server 21.1.1
|
|
|
8
|
+
|
|
|
9
|
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
|
|
|
10
|
+---
|
|
|
11
|
+ src/radeon_kms.c | 9 ++++++++-
|
|
|
12
|
+ 1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
13
|
+
|
|
|
14
|
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
|
|
|
15
|
+index 62962d61..51b00dd9 100644
|
|
|
16
|
+--- a/src/radeon_kms.c
|
|
|
17
|
++++ b/src/radeon_kms.c
|
|
|
18
|
+@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn)
|
|
|
19
|
+ }
|
|
|
20
|
+ }
|
|
|
21
|
+
|
|
|
22
|
++static void
|
|
|
23
|
++radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h,
|
|
|
24
|
++ unsigned int subWindowMode)
|
|
|
25
|
++{
|
|
|
26
|
++}
|
|
|
27
|
++
|
|
|
28
|
++
|
|
|
29
|
+
|
|
|
30
|
+ Bool
|
|
|
31
|
+ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
|
|
|
32
|
+@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
|
|
|
33
|
+ SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
|
|
|
34
|
+ xf86_crtc->nparams);
|
|
|
35
|
+
|
|
|
36
|
+- pScreen->SourceValidate = NULL;
|
|
|
37
|
++ pScreen->SourceValidate = radeonSourceValidate;
|
|
|
38
|
+ CompositePicture(PictOpSrc,
|
|
|
39
|
+ src, NULL, dst,
|
|
|
40
|
+ extents.x1, extents.y1, 0, 0, extents.x1,
|
|
|
41
|
+--
|
|
|
42
|
+GitLab
|
|
|
43
|
+ |