patch-src_tseng__driver.c 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. $NetBSD: patch-src_tseng__driver.c,v 1.2 2018/05/20 07:27:31 wiz Exp $
  2. From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
  3. From: Adam Jackson <ajax@redhat.com>
  4. Date: Tue, 25 Sep 2012 08:55:02 -0400
  5. Subject: Remove mibstore.h
  6. Signed-off-by: Adam Jackson <ajax@redhat.com>
  7. Other chunks: avoid using removed max.Value fields
  8. diff --git a/src/tseng_driver.c b/src/tseng_driver.c
  9. index ffafb19..0db62e5 100644
  10. --- src/tseng_driver.c.orig 2012-07-17 05:21:17.000000000 +0000
  11. +++ src/tseng_driver.c
  12. @@ -39,9 +39,6 @@
  13. /* All drivers initialising the SW cursor need this */
  14. #include "mipointer.h"
  15. -/* All drivers implementing backing store need this */
  16. -#include "mibstore.h"
  17. -
  18. #include "fb.h"
  19. #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
  20. @@ -1040,10 +1037,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
  21. else
  22. pTseng->Bytesperpixel = 1; /* this is fake for < 8bpp, but simplifies other code */
  23. - /* hardware limits */
  24. - pScrn->maxHValue = Tseng_HMAX;
  25. - pScrn->maxVValue = Tseng_VMAX;
  26. -
  27. /*
  28. * This must happen after pScrn->display has been set because
  29. * xf86SetWeight references it.
  30. @@ -1128,16 +1121,15 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
  31. /*
  32. * xf86ValidateModes will check that the mode HTotal and VTotal values
  33. - * don't exceed the chipset's limit if pScrn->maxHValue and
  34. - * pScrn->maxVValue are set. Since our TsengValidMode() already takes
  35. + * don't exceed the chipset's limit. Since our TsengValidMode() already takes
  36. * care of this, we don't worry about setting them here.
  37. */
  38. /* Select valid modes from those available */
  39. i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
  40. pScrn->display->modes, &pTseng->clockRange,
  41. - NULL, 32, pScrn->maxHValue, 8*pTseng->Bytesperpixel, /* H limits */
  42. - 0, pScrn->maxVValue, /* V limits */
  43. + NULL, 32, Tseng_HMAX, 8*pTseng->Bytesperpixel, /* H limits */
  44. + 0, Tseng_VMAX, /* V limits */
  45. pScrn->display->virtualX,
  46. pScrn->display->virtualY,
  47. pTseng->FbMapSize,
  48. @@ -1453,7 +1445,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
  49. }
  50. }
  51. - miInitializeBackingStore(pScreen);
  52. xf86SetSilkenMouse(pScreen);
  53. /* Initialise cursor functions */
  54. miDCInitialize(pScreen, xf86GetPointerScreenFuncs());