summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/intel_driver.h2
-rw-r--r--src/intel_module.c8
-rw-r--r--src/sna/sna_accel.c2
-rw-r--r--src/uxa/intel_uxa.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 94959f7d..503202c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,7 +699,7 @@ fi
if test "x$have_accel" = "xnone"; then
if test "x$KMS" = "xyes"; then
if test "x$SNA" != "xno" -o "x$UXA" != "xno"; then
- AC_DEFINE(DEFAULT_ACCEL_METHOD, NONE, [Default acceleration method])
+ AC_DEFINE(DEFAULT_ACCEL_METHOD, NOACCEL, [Default acceleration method])
else
AC_MSG_ERROR([Invalid default acceleration option])
fi
diff --git a/src/intel_driver.h b/src/intel_driver.h
index 7ce6b752..13e26886 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -136,7 +136,7 @@ int intel_put_master(ScrnInfoPtr scrn);
void intel_put_device(ScrnInfoPtr scrn);
#define IS_DEFAULT_ACCEL_METHOD(x) ({ \
- enum { SNA, UXA, GLAMOR, NONE } default_accel_method__ = DEFAULT_ACCEL_METHOD; \
+ enum { NOACCEL, SNA, UXA, GLAMOR } default_accel_method__ = DEFAULT_ACCEL_METHOD; \
default_accel_method__ == x; \
})
diff --git a/src/intel_module.c b/src/intel_module.c
index 95200d0c..57ac5ef4 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -489,7 +489,7 @@ _xf86findDriver(const char *ident, XF86ConfDevicePtr p)
return NULL;
}
-static enum accel_method { NONE, SNA, UXA, GLAMOR } get_accel_method(void)
+static enum accel_method { NOACCEL, SNA, UXA, GLAMOR } get_accel_method(void)
{
enum accel_method accel_method = DEFAULT_ACCEL_METHOD;
XF86ConfDevicePtr dev;
@@ -504,7 +504,7 @@ static enum accel_method { NONE, SNA, UXA, GLAMOR } get_accel_method(void)
s = xf86FindOptionValue(dev->dev_option_lst, "AccelMethod");
if (s ) {
if (strcasecmp(s, "none") == 0)
- accel_method = NONE;
+ accel_method = NOACCEL;
else if (strcasecmp(s, "sna") == 0)
accel_method = SNA;
else if (strcasecmp(s, "uxa") == 0)
@@ -564,13 +564,13 @@ intel_scrn_create(DriverPtr driver,
#if KMS
switch (get_accel_method()) {
#if USE_SNA
- case NONE:
+ case NOACCEL:
case SNA:
return sna_init_scrn(scrn, entity_num);
#endif
#if USE_UXA
#if !USE_SNA
- case NONE:
+ case NOACCEL:
#endif
case GLAMOR:
case UXA:
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 00ff492a..f8a5924d 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -17625,7 +17625,7 @@ static bool sna_option_accel_none(struct sna *sna)
s = xf86GetOptValString(sna->Options, OPTION_ACCEL_METHOD);
if (s == NULL)
- return IS_DEFAULT_ACCEL_METHOD(NONE);
+ return IS_DEFAULT_ACCEL_METHOD(NOACCEL);
return strcasecmp(s, "none") == 0;
}
diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
index 255a245f..19604d4b 100644
--- a/src/uxa/intel_uxa.c
+++ b/src/uxa/intel_uxa.c
@@ -1427,7 +1427,7 @@ static Bool intel_option_accel_none(intel_screen_private *intel)
s = xf86GetOptValString(intel->Options, OPTION_ACCEL_METHOD);
if (s == NULL)
- return IS_DEFAULT_ACCEL_METHOD(NONE);
+ return IS_DEFAULT_ACCEL_METHOD(NOACCEL);
return strcasecmp(s, "none") == 0;
}