diff options
author | Adam Jackson <ajax@redhat.com> | 2019-10-09 11:27:12 -0400 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2019-10-30 16:26:01 +0000 |
commit | ff310903f34ac34c916ad74e919d1ac12aea4715 (patch) | |
tree | ebf341ad2e56854c931b8218176d09c688882dc8 /hw/xfree86 | |
parent | 89a9927b1e5ac416441a33b44abddf8372edfe6a (diff) |
mi: Add a default no-op miSourceValidate
Slightly simplifies the callers since they don't need to check for
non-NULL anymore.
I do extremely hate the workarounds here to suppress misprite taking the
cursor down though. Surely there's a better way.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to 'hw/xfree86')
-rw-r--r-- | hw/xfree86/common/xf86VGAarbiter.c | 5 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c index 40f241aee..9db8d044f 100644 --- a/hw/xfree86/common/xf86VGAarbiter.c +++ b/hw/xfree86/common/xf86VGAarbiter.c @@ -321,9 +321,8 @@ VGAarbiterSourceValidate(DrawablePtr pDrawable, SCREEN_PROLOG(SourceValidate); VGAGet(pScreen); - if (pScreen->SourceValidate) - (*pScreen->SourceValidate) (pDrawable, x, y, width, height, - subWindowMode); + (*pScreen->SourceValidate) (pDrawable, x, y, width, height, + subWindowMode); VGAPut(); SCREEN_EPILOG(SourceValidate, VGAarbiterSourceValidate); } diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 85ab9b8c7..a8f1e615c 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -28,7 +28,7 @@ #include <stddef.h> #include <string.h> #include <stdio.h> - +#include "mi.h" #include "xf86.h" #include "xf86DDC.h" #include "windowstr.h" @@ -191,7 +191,7 @@ xf86RotateRedisplay(ScreenPtr pScreen) * leaves the software cursor in place */ SourceValidate = pScreen->SourceValidate; - pScreen->SourceValidate = NULL; + pScreen->SourceValidate = miSourceValidate; for (c = 0; c < xf86_config->num_crtc; c++) { xf86CrtcPtr crtc = xf86_config->crtc[c]; |