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>
70 lines
2.4 KiB
Makefile
70 lines
2.4 KiB
Makefile
# Copyright 2005 Adam Jackson.
|
|
#
|
|
# 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
|
|
# on 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
|
|
# ADAM JACKSON 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.
|
|
|
|
# this is obnoxious:
|
|
# -module lets us name the module exactly how we want
|
|
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
|
|
# _ladir passes a dummy rpath to libtool so the thing will actually link
|
|
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
|
|
|
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS)
|
|
|
|
AM_CPPFLAGS = \
|
|
$(XORG_INCS) \
|
|
-I$(top_srcdir)/glamor \
|
|
-I$(srcdir)/../../ddc \
|
|
-I$(srcdir)/../../dri2 \
|
|
-I$(srcdir)/../../i2c \
|
|
-I$(srcdir)/../../modes \
|
|
-I$(srcdir)/../../parser \
|
|
-I$(srcdir)/../../ramdac \
|
|
$(NULL)
|
|
|
|
modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
|
|
modesetting_drv_la_LDFLAGS = -module -avoid-version
|
|
modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS)
|
|
modesetting_drv_ladir = @moduledir@/drivers
|
|
|
|
modesetting_drv_la_SOURCES = \
|
|
dri2.c \
|
|
driver.c \
|
|
driver.h \
|
|
drmmode_display.c \
|
|
drmmode_display.h \
|
|
dumb_bo.c \
|
|
dumb_bo.h \
|
|
present.c \
|
|
vblank.c \
|
|
$(NULL)
|
|
|
|
drivermandir = $(DRIVER_MAN_DIR)
|
|
driverman_PRE = modesetting.man
|
|
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
|
|
|
|
EXTRA_DIST = modesetting.man
|
|
|
|
CLEANFILES = $(driverman_DATA)
|
|
|
|
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
|
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
|
|
|
.man.$(DRIVER_MAN_SUFFIX):
|
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|