summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_irq.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-09-13 07:01:49 +1000
committerDave Airlie <airlied@redhat.com>2014-09-13 07:01:49 +1000
commit98faa78ce7f1f986e11e7805d31b409782a6d2d4 (patch)
treefd9b33437c6299306119866e74421bf2190390ca /drivers/gpu/drm/drm_irq.c
parentedbaae5a5cab89de0e64b8c03ebd9a8d5d266550 (diff)
parent6865b20ad354548a045c74a388eb37afe1ad5174 (diff)
Merge tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel into drm-next
So here's the header cleanup, rebased on top of drm-next. Two new header files are created here: - drivers/gpu/drm/drm_internal.h for non-legacy drm.ko private declarations. - include/drm/drm_legacy.h for legacy interfaces used by non-kms drivers. And of course lots fo stuff gets shuffled into the already existing drivers/gpu/drm/drm_legacy.h for drm.ko internal stuff. topic branch smoke-tested in drm-intel-nightly for a bit. And the 0day tester also worked through it (and found a few places I didn't add a static to functions). * tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel: drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c drm: Move drm_class to drm_internal.h drm: Move LOCK_TEST_WITH_RETURN to <drm/drm_legacy.h> drm: Move legacy buffer structures to <drm/drm_legacy.h> drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h> drm: Purge ioctl forward declarations from drmP.h drm: unexport drm_global_mutex drm: Move piles of functions from drmP.h to drm_internal.h drm: Move vblank related module options into drm_irq.c drm: Drop drm_sysfs_class from drmP.h drm: Move __drm_pci_free to drm_legacy.h drm: Create drm legacy driver header drm: Move drm_legacy_vma_flush into drm_legacy.h drm: Move sg functions into drm_legacy.h drm: Move dma functions into drm_legacy.h
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
-rw-r--r--drivers/gpu/drm/drm_irq.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 034297640b4..80ff94ada75 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -34,6 +34,7 @@
#include <drm/drmP.h>
#include "drm_trace.h"
+#include "drm_internal.h"
#include <linux/interrupt.h> /* For task queue support */
#include <linux/slab.h>
@@ -59,6 +60,20 @@ static bool
drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
struct timeval *tvblank, unsigned flags);
+static unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */
+
+/*
+ * Default to use monotonic timestamps for wait-for-vblank and page-flip
+ * complete events.
+ */
+unsigned int drm_timestamp_monotonic = 1;
+
+static int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */
+
+module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
+module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
+module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
+
/**
* drm_update_vblank_count - update the master vblank counter
* @dev: DRM device