patches/xf86-video-tseng/patch-src_tseng__driver.c

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