From 24892baafd5dfb4a6996683c78c9105f6e8b2333 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 22 Sep 2013 14:29:30 +0200 Subject: [PATCH] azbox: default to manual blitting to check if kernel-autoblit is getting usable, use "AZBOX_KERNEL_BLIT=1" environment variable Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/997f8761b0cb86ebd8d1baa028b0fcda9233b3c9 Author: Stefan Seyfried Date: 2013-09-22 (Sun, 22 Sep 2013) --- src/driver/fbaccel.cpp | 6 +++--- src/driver/framebuffer_ng.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver/fbaccel.cpp b/src/driver/fbaccel.cpp index 6e8a46b4e..8c1e8dec2 100644 --- a/src/driver/fbaccel.cpp +++ b/src/driver/fbaccel.cpp @@ -870,10 +870,10 @@ void CFbAccel::_blit() #define FBIO_BLIT 0x22 #define FBIO_SET_MANUAL_BLIT _IOW('F', 0x21, __u8) #endif -static bool azblit = getenv("AZBOX_MANUAL_BLIT") ? true : false; -void CFbAccel::blit() +static bool autoblit = getenv("AZBOX_KERNEL_BLIT") ? true : false; +void CFbAccel::_blit() { - if (!azblit) + if (autoblit) return; // blit if (ioctl(fb->fd, FBIO_BLIT) < 0) diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index 2f34cc485..14d079569 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -418,8 +418,8 @@ fprintf(stderr, "CFrameBuffer::setMode avail: %d active: %d\n", available, activ #define FBIO_SET_MANUAL_BLIT _IOW('F', 0x21, __u8) #define FBIO_BLIT 0x22 #endif - // set manual blit if AZBOX_MANUAL_BLIT environment variable is set - unsigned char tmp = getenv("AZBOX_MANUAL_BLIT") ? 1 : 0; + // set auto blit if AZBOX_KERNEL_BLIT environment variable is set + unsigned char tmp = getenv("AZBOX_KERNEL_BLIT") ? 0 : 1; if (ioctl(fd, FBIO_SET_MANUAL_BLIT, &tmp)<0) perror("FBIO_SET_MANUAL_BLIT");