56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
|
From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexandr Shadchin <alexandr.shadchin@gmail.com>
|
||
|
|
Date: Sat, 18 Aug 2012 14:53:34 +0000
|
||
|
|
Subject: Fix check function in VESASaveRestore
|
||
|
|
|
||
|
|
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
|
||
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
---
|
||
|
|
diff --git a/src/vesa.c b/src/vesa.c
|
||
|
|
index 8ac77da..11cd26c 100644
|
||
|
|
--- src/vesa.c
|
||
|
|
+++ src/vesa.c
|
||
|
|
@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
|
||
|
|
{
|
||
|
|
VESAPtr pVesa;
|
||
|
|
|
||
|
|
- if (MODE_QUERY < 0 || function > MODE_RESTORE)
|
||
|
|
+ if (function < MODE_QUERY || function > MODE_RESTORE)
|
||
|
|
return (FALSE);
|
||
|
|
|
||
|
|
pVesa = VESAGetRec(pScrn);
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2-2-gbebe
|
||
|
|
From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Tue, 25 Sep 2012 12:55:03 +0000
|
||
|
|
Subject: Remove mibstore.h
|
||
|
|
|
||
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||
|
|
---
|
||
|
|
diff --git a/src/vesa.c b/src/vesa.c
|
||
|
|
index 11cd26c..b73d104 100644
|
||
|
|
--- src/vesa.c
|
||
|
|
+++ src/vesa.c
|
||
|
|
@@ -49,9 +49,6 @@
|
||
|
|
/* All drivers initialising the SW cursor need this */
|
||
|
|
#include "mipointer.h"
|
||
|
|
|
||
|
|
-/* All drivers implementing backing store need this */
|
||
|
|
-#include "mibstore.h"
|
||
|
|
-
|
||
|
|
/* Colormap handling */
|
||
|
|
#include "micmap.h"
|
||
|
|
#include "xf86cmap.h"
|
||
|
|
@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
|
||
|
|
VESADGAInit(pScrn, pScreen);
|
||
|
|
|
||
|
|
xf86SetBlackWhitePixels(pScreen);
|
||
|
|
- miInitializeBackingStore(pScreen);
|
||
|
|
xf86SetBackingStore(pScreen);
|
||
|
|
|
||
|
|
/* software cursor */
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2-2-gbebe
|