← Back to branch summary

~ubuntu-branches/ubuntu/raring/xserver-xorg-video-intel/raring

« back to all changes in this revision

Viewing changes to src/intel_dri.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-29 16:45:35 UTC
  • mfrom: (1.4.24)
  • Revision ID: package-import@ubuntu.com-20120929164535-g15mwstkty0de7ki
Tags: 2:2.20.9-0ubuntu1
https://launchpad.net/bugs/966744
* Merge from unrelease debian git.
  - fixes racy UXA pageflip code (LP: #966744)
* Drop dont-run-intel-mode-fini-before-preinit.diff, upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/intel_dri.c
455
455
                BoxPtr box;
456
456
                BoxRec crtcbox;
457
457
                int y1, y2;
458
 
                int pipe = -1, event, load_scan_lines_pipe;
 
458
                int event, load_scan_lines_pipe;
459
459
                xf86CrtcPtr crtc;
460
460
                Bool full_height = FALSE;
461
461
 
467
467
                 * buffer
468
468
                 */
469
469
                if (crtc != NULL && !crtc->rotatedData) {
470
 
                        pipe = intel_crtc_to_pipe(crtc);
 
470
                        int pipe = intel_crtc_to_pipe(crtc);
471
471
 
472
472
                        /*
473
473
                         * Make sure we don't wait for a scanline that will
924
924
static Bool
925
925
can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
926
926
{
927
 
        struct intel_screen_private *intel = intel_get_screen_private(xf86ScreenToScrn(drawable->pScreen));
 
927
        ScrnInfoPtr pScrn = xf86ScreenToScrn(drawable->pScreen);
 
928
        struct intel_screen_private *intel = intel_get_screen_private(pScrn);
928
929
        I830DRI2BufferPrivatePtr front_priv = front->driverPrivate;
929
930
        I830DRI2BufferPrivatePtr back_priv = back->driverPrivate;
930
931
        PixmapPtr front_pixmap = front_priv->pixmap;
932
933
        struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap);
933
934
        struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap);
934
935
 
 
936
        if (!pScrn->vtSema)
 
937
                return FALSE;
 
938
 
 
939
        if (I830DRI2DrawablePipe(drawable) < 0)
 
940
                return FALSE;
 
941
 
935
942
        if (!DRI2CanFlip(drawable))
936
943
                return FALSE;
937
944