SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xorg-xf86-video-intel/stuff/patch-src_legacy_i810_i810__video.c	Sun Jan 14 08:12:37 2024 +0000
     1.3 @@ -0,0 +1,86 @@
     1.4 +$NetBSD$
     1.5 +
     1.6 +--- a/src/legacy/i810/i810_video.c	2014-08-29 09:33:11.000000000 +0000
     1.7 ++++ b/src/legacy/i810/i810_video.c
     1.8 +@@ -77,7 +77,11 @@ static int I810PutImage( ScrnInfoPtr,
     1.9 + static int I810QueryImageAttributes(ScrnInfoPtr, 
    1.10 + 	int, unsigned short *, unsigned short *,  int *, int *);
    1.11 + 
    1.12 ++#if !HAVE_NOTIFY_FD
    1.13 + static void I810BlockHandler(BLOCKHANDLER_ARGS_DECL);
    1.14 ++#else
    1.15 ++static void I810BlockHandler(void *data, void *_timeout);
    1.16 ++#endif
    1.17 + 
    1.18 + #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
    1.19 + 
    1.20 +@@ -418,8 +422,14 @@ I810SetupImageVideo(ScreenPtr screen)
    1.21 + 
    1.22 +     pI810->adaptor = adapt;
    1.23 + 
    1.24 ++#if !HAVE_NOTIFY_FD
    1.25 +     pI810->BlockHandler = screen->BlockHandler;
    1.26 +     screen->BlockHandler = I810BlockHandler;
    1.27 ++#else
    1.28 ++    RegisterBlockAndWakeupHandlers(I810BlockHandler,
    1.29 ++				   (ServerWakeupHandlerProcPtr)NoopDDA,
    1.30 ++				   pScrn);
    1.31 ++#endif
    1.32 + 
    1.33 +     xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
    1.34 +     xvContrast   = MAKE_ATOM("XV_CONTRAST");
    1.35 +@@ -1135,6 +1145,7 @@ I810QueryImageAttributes(
    1.36 +     return size;
    1.37 + }
    1.38 + 
    1.39 ++#if !HAVE_NOTIFY_FD
    1.40 + static void
    1.41 + I810BlockHandler (BLOCKHANDLER_ARGS_DECL)
    1.42 + {
    1.43 +@@ -1172,7 +1183,38 @@ I810BlockHandler (BLOCKHANDLER_ARGS_DECL
    1.44 +         }
    1.45 +     }
    1.46 + }
    1.47 ++#else
    1.48 ++static void
    1.49 ++I810BlockHandler(void *data, void *_timeout)
    1.50 ++{
    1.51 ++    ScrnInfoPtr pScrn = data;
    1.52 ++    I810Ptr      pI810 = I810PTR(pScrn);
    1.53 ++    I810PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
    1.54 ++    I810OverlayRegPtr overlay = (I810OverlayRegPtr) (pI810->FbBase + pI810->OverlayStart);
    1.55 + 
    1.56 ++    if(pPriv->videoStatus & TIMER_MASK) {
    1.57 ++	UpdateCurrentTime();
    1.58 ++	if(pPriv->videoStatus & OFF_TIMER) {
    1.59 ++	    if(pPriv->offTime < currentTime.milliseconds) {
    1.60 ++		/* Turn off the overlay */
    1.61 ++		overlay->OV0CMD &= 0xFFFFFFFE;
    1.62 ++		OVERLAY_UPDATE(pI810->OverlayPhysical);
    1.63 ++
    1.64 ++		pPriv->videoStatus = FREE_TIMER;
    1.65 ++		pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
    1.66 ++	    }
    1.67 ++	} else {  /* FREE_TIMER */
    1.68 ++	    if(pPriv->freeTime < currentTime.milliseconds) {
    1.69 ++		if(pPriv->linear) {
    1.70 ++		   xf86FreeOffscreenLinear(pPriv->linear);
    1.71 ++		   pPriv->linear = NULL;
    1.72 ++		}
    1.73 ++		pPriv->videoStatus = 0;
    1.74 ++	    }
    1.75 ++        }
    1.76 ++    }
    1.77 ++}
    1.78 ++#endif
    1.79 + 
    1.80 + /***************************************************************************
    1.81 +  * Offscreen Images
    1.82 +@@ -1373,7 +1415,6 @@ I810DisplaySurface(
    1.83 +       UpdateCurrentTime();
    1.84 +       pI810Priv->videoStatus = FREE_TIMER;
    1.85 +       pI810Priv->freeTime = currentTime.milliseconds + FREE_DELAY;
    1.86 +-      pScrn->pScreen->BlockHandler = I810BlockHandler;
    1.87 +     }
    1.88 + 
    1.89 +     return Success;