summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-04-27 14:34:51 +0300
committerAlon Levy <alevy@redhat.com>2011-07-22 03:47:27 +0300
commitfc87a47c7fb61c2a5c3c8563b6fd1a500541649a (patch)
tree7eaa470ab9602c898e8137431e6e69291b1f6b0f
parent141154b6b5cf3abf7855477b72edc1618a0188e1 (diff)
add config options (empty for now)
-rw-r--r--src/qxl.h10
-rw-r--r--src/qxl_driver.c6
2 files changed, 16 insertions, 0 deletions
diff --git a/src/qxl.h b/src/qxl.h
index a04581e..490d259 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -83,6 +83,14 @@ typedef struct
typedef struct qxl_surface_t qxl_surface_t;
+/*
+ * Config Options
+ */
+
+enum {
+ OPTION_COUNT,
+};
+
struct _qxl_screen_t
{
/* These are the names QXL uses */
@@ -159,6 +167,8 @@ struct _qxl_screen_t
/* Evacuated surfaces are stored here during VT switches */
void * vt_surfaces;
+
+ OptionInfoRec options[OPTION_COUNT + 1];
};
static inline uint64_t
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index a206ae7..7e0588b 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -42,6 +42,10 @@
#endif
#define CHECK_POINT()
+const OptionInfoRec DefaultOptions[] = {
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
+};
+
int
qxl_garbage_collect (qxl_screen_t *qxl)
{
@@ -1215,6 +1219,8 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags)
/* option parsing and card differentiation */
xf86CollectOptions(pScrn, NULL);
+ memcpy(qxl->options, DefaultOptions, sizeof(DefaultOptions));
+ xf86ProcessOptions(scrnIndex, pScrn->options, qxl->options);
if (!qxl_map_memory(qxl, scrnIndex))
goto out;