09230a2d43
modesetting hooked up vblank support for DRI2, but was missing support
for vblanks in Present.
This is mostly copy and pasted from Keith's code in the intel driver.
v2: Use ms_crtc_msc_to_kernel_msc in ms_present_queue_vblank to hook
up the vblank_offset workaround for bogus MSC values (which the
DRI2 code already did).
Also simplify the ms_present_get_crtc function. vblank.c already
implements the functionality; we just need to convert types.
v3: Fix ms_flush_drm_events return code. I'd copied code where 0 meant
success into a function that returned a boolean, so the return code
was always backwards.
Also add DebugPresent calls in ms_present_vblank_{handler,abort}.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
138 lines
3.9 KiB
C
138 lines
3.9 KiB
C
/*
|
|
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
|
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
|
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*
|
|
* Author: Alan Hourihane <alanh@tungstengraphics.com>
|
|
*
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <drm.h>
|
|
#include <xf86drm.h>
|
|
#include <xf86Crtc.h>
|
|
#include <damage.h>
|
|
|
|
#ifdef GLAMOR
|
|
#define GLAMOR_FOR_XORG 1
|
|
#include "glamor.h"
|
|
#ifdef GLAMOR_HAS_GBM
|
|
#include <gbm.h>
|
|
#endif
|
|
#endif
|
|
|
|
#include "drmmode_display.h"
|
|
#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
|
|
|
|
typedef struct {
|
|
int lastInstance;
|
|
int refCount;
|
|
ScrnInfoPtr pScrn_1;
|
|
ScrnInfoPtr pScrn_2;
|
|
} EntRec, *EntPtr;
|
|
|
|
typedef void (*ms_drm_handler_proc)(uint64_t frame,
|
|
uint64_t usec,
|
|
void *data);
|
|
|
|
typedef void (*ms_drm_abort_proc)(void *data);
|
|
|
|
/**
|
|
* A tracked handler for an event that will hopefully be generated by
|
|
* the kernel, and what to do when it is encountered.
|
|
*/
|
|
struct ms_drm_queue {
|
|
struct xorg_list list;
|
|
xf86CrtcPtr crtc;
|
|
uint32_t seq;
|
|
void *data;
|
|
ScrnInfoPtr scrn;
|
|
ms_drm_handler_proc handler;
|
|
ms_drm_abort_proc abort;
|
|
};
|
|
|
|
typedef struct _modesettingRec {
|
|
int fd;
|
|
|
|
EntPtr entityPrivate;
|
|
|
|
int Chipset;
|
|
EntityInfoPtr pEnt;
|
|
#if XSERVER_LIBPCIACCESS
|
|
struct pci_device *PciInfo;
|
|
#else
|
|
pciVideoPtr PciInfo;
|
|
PCITAG PciTag;
|
|
#endif
|
|
|
|
Bool noAccel;
|
|
CloseScreenProcPtr CloseScreen;
|
|
|
|
/* Broken-out options. */
|
|
OptionInfoPtr Options;
|
|
|
|
unsigned int SaveGeneration;
|
|
|
|
CreateScreenResourcesProcPtr createScreenResources;
|
|
ScreenBlockHandlerProcPtr BlockHandler;
|
|
void *driver;
|
|
|
|
drmmode_rec drmmode;
|
|
|
|
drmEventContext event_context;
|
|
|
|
DamagePtr damage;
|
|
Bool dirty_enabled;
|
|
|
|
uint32_t cursor_width, cursor_height;
|
|
} modesettingRec, *modesettingPtr;
|
|
|
|
#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
|
|
|
|
uint32_t ms_drm_queue_alloc(xf86CrtcPtr crtc,
|
|
void *data,
|
|
ms_drm_handler_proc handler,
|
|
ms_drm_abort_proc abort);
|
|
|
|
void ms_drm_abort(ScrnInfoPtr scrn,
|
|
Bool (*match)(void *data, void *match_data),
|
|
void *match_data);
|
|
|
|
xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw);
|
|
xf86CrtcPtr ms_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
|
|
xf86CrtcPtr desired, BoxPtr crtc_box_ret);
|
|
|
|
int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
|
|
|
|
uint32_t ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect);
|
|
uint64_t ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence);
|
|
|
|
|
|
Bool ms_dri2_screen_init(ScreenPtr screen);
|
|
void ms_dri2_close_screen(ScreenPtr screen);
|
|
|
|
Bool ms_vblank_screen_init(ScreenPtr screen);
|
|
void ms_vblank_close_screen(ScreenPtr screen);
|
|
|
|
Bool ms_present_screen_init(ScreenPtr screen);
|