diff options
Diffstat (limited to 'recipes/xorg-driver')
3 files changed, 2 insertions, 244 deletions
diff --git a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch deleted file mode 100644 index 0786539061..0000000000 --- a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 8dba6751950f65292c5f8a562e282045e9fe0803 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 22 Dec 2009 21:35:00 +0100 -Subject: [PATCH 1/2] omapfb-driver: hack out dpms for xorg 1.7.x - ---- - src/omapfb-driver.c | 41 ----------------------------------------- - 1 files changed, 0 insertions(+), 41 deletions(-) - -diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c -index a9d5fbc..ffa0df4 100644 ---- a/src/omapfb-driver.c -+++ b/src/omapfb-driver.c -@@ -41,9 +41,6 @@ - - #include "exa.h" - --#define DPMS_SERVER --#include <X11/extensions/dpms.h> -- - #include <linux/fb.h> - - /* TODO: we'd like this to come from kernel headers, but that's not a good -@@ -502,7 +499,6 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - /* Load the fallback module */ - xf86LoadSubModule(pScrn, "fb"); -- xf86LoaderReqSymLists(fbSymbols, NULL); - - /* Initialize fallbacks for the screen */ - if (!fbScreenInit(pScreen, ofb->fb, pScrn->virtualX, -@@ -580,13 +576,9 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* NO-OP currently */ - pScreen->SaveScreen = OMAPFBSaveScreen; - -- /* Setup DPMS support */ -- xf86DPMSInit(pScreen, OMAPFBDPMSSet, 0); -- - #ifdef USE_EXA - /* EXA init */ - xf86LoadSubModule(pScrn, "exa"); -- xf86LoaderReqSymLists(exaSymbols, NULL); - - /* TODO: This should depend on the AccelMethod option */ - ofb->exa = exaDriverAlloc(); -@@ -723,38 +715,6 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - return TRUE; - } - --static void --OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) --{ -- OMAPFBPtr ofb = OMAPFB(pScrn); -- -- switch (mode) { -- case DPMSModeOn: -- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_NO_BLANKING)) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "FBIOBLANK: %s\n", strerror(errno)); -- } -- break; -- case DPMSModeStandby: -- case DPMSModeSuspend: -- /* TODO: Maybe we would want to use the above modes for -- * dimming the LCD? That'd match the functionality -- * (save power) -- */ -- case DPMSModeOff: -- /* OMAPFB only supports on and off */ -- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_POWERDOWN)) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "FBIOBLANK: %s\n", strerror(errno)); -- } -- break; -- break; -- default: -- return; -- } -- --} -- - void - OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, - struct omapfb_caps *caps, -@@ -879,7 +839,6 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin) - if (!setupDone) { - setupDone = TRUE; - xf86AddDriver(&OMAPFB, module, HaveDriverFuncs); -- LoaderRefSymLists(fbSymbols, NULL); - return (pointer)1; - } else { - if (errmaj) *errmaj = LDR_ONCEONLY; --- -1.6.5 - diff --git a/recipes/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/recipes/xorg-driver/xf86-video-omapfb/omapfb-neon.diff deleted file mode 100644 index 325ca66f0c..0000000000 --- a/recipes/xorg-driver/xf86-video-omapfb/omapfb-neon.diff +++ /dev/null @@ -1,146 +0,0 @@ ---- /tmp/image-format-conversions.h 2009-02-03 10:18:04.000000000 +0100 -+++ git/src/image-format-conversions.h 2009-02-03 10:19:18.000000000 +0100 -@@ -30,6 +30,8 @@ - /* Basic C implementation of YV12/I420 to UYVY conversion */ - void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); - -+/* NEON implementation of YV12/I420 to UYVY conversion */ -+void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); - - #endif /* __IMAGE_FORMAT_CONVERSIONS_H__ */ - ---- /tmp/image-format-conversions.c 2009-02-03 10:18:04.000000000 +0100 -+++ git/src/image-format-conversions.c 2009-02-03 10:16:47.000000000 +0100 -@@ -2,6 +2,7 @@ - * Copyright 2008 Kalle Vahlman, <zuh@iki.fi> - * Ilpo Ruotsalainen, <lonewolf@iki.fi> - * Tuomas Kulve, <tuomas.kulve@movial.com> -+ * Ian Rickards, <ian.rickards@arm.com> - * - * - * Permission to use, copy, modify, distribute and sell this software and its -@@ -89,3 +90,104 @@ - } - } - -+void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest) -+{ -+ int x, y; -+ uint8_t *dest_even = dest; -+ uint8_t *dest_odd = dest + w * 2; -+ uint8_t *y_p_even = y_p; -+ uint8_t *y_p_odd = y_p + y_pitch; -+ -+ /*ErrorF("in uv12_to_uyvy, w: %d, pitch: %d\n", w, pitch);*/ -+ if (w<16) -+ { -+ for (y=0; y<h; y+=2) -+ { -+ for (x=0; x<w; x+=2) -+ { -+ /* Output two 2x1 macroblocks to form a 2x2 block from input */ -+ uint8_t u_val = *u_p++; -+ uint8_t v_val = *v_p++; -+ -+ /* Even row, first pixel */ -+ *dest_even++ = u_val; -+ *dest_even++ = *y_p_even++; -+ -+ /* Even row, second pixel */ -+ *dest_even++ = v_val; -+ *dest_even++ = *y_p_even++; -+ -+ /* Odd row, first pixel */ -+ *dest_odd++ = u_val; -+ *dest_odd++ = *y_p_odd++; -+ -+ /* Odd row, second pixel */ -+ *dest_odd++ = v_val; -+ *dest_odd++ = *y_p_odd++; -+ } -+ -+ dest_even += w * 2; -+ dest_odd += w * 2; -+ -+ u_p += ((uv_pitch << 1) - w) >> 1; -+ v_p += ((uv_pitch << 1) - w) >> 1; -+ -+ y_p_even += (y_pitch - w) + y_pitch; -+ y_p_odd += (y_pitch - w) + y_pitch; -+ } -+ } -+ else -+ { -+ for (y=0; y<h; y+=2) -+ { -+ x=w; -+ do { -+ // avoid using d8-d15 (q4-q7) aapcs callee-save registers -+ asm volatile ( -+ "1:\n\t" -+ "vld1.u8 {d0}, [%[u_p]]!\n\t" -+ "sub %[x],%[x],#16\n\t" -+ "cmp %[x],#16\n\t" -+ "vld1.u8 {d1}, [%[v_p]]!\n\t" -+ "vld1.u8 {q1}, [%[y_p_even]]!\n\t" -+ "vzip.u8 d0, d1\n\t" -+ "vld1.u8 {q2}, [%[y_p_odd]]!\n\t" -+ // use 2-element struct stores to zip up y with y&v -+ "vst2.u8 {q0,q1}, [%[dest_even]]!\n\t" -+ "vmov.u8 q1, q2\n\t" -+ "vst2.u8 {q0,q1}, [%[dest_odd]]!\n\t" -+ "bhs 1b\n\t" -+ : [u_p] "+r" (u_p), [v_p] "+r" (v_p), [y_p_even] "+r" (y_p_even), [y_p_odd] "+r" (y_p_odd), -+ [dest_even] "+r" (dest_even), [dest_odd] "+r" (dest_odd), -+ [x] "+r" (x) -+ : -+ : "cc", "memory", "d0","d1","d2","d3","d4","d5" -+ ); -+ if (x!=0) -+ { -+ // overlap final 16-pixel block to process requested width exactly -+ x = 16-x; -+ u_p -= x/2; -+ v_p -= x/2; -+ y_p_even -= x; -+ y_p_odd -= x; -+ dest_even -= x*2; -+ dest_odd -= x*2; -+ x = 16; -+ // do another 16-pixel block -+ } -+ } -+ while (x!=0); -+ -+ dest_even += w * 2; -+ dest_odd += w * 2; -+ -+ u_p += ((uv_pitch << 1) - w) >> 1; -+ v_p += ((uv_pitch << 1) - w) >> 1; -+ -+ y_p_even += (y_pitch - w) + y_pitch; -+ y_p_odd += (y_pitch - w) + y_pitch; -+ } -+ } -+} -+ ---- /tmp/omapfb-xv-generic.c 2009-02-03 10:52:18.000000000 +0100 -+++ git/src/omapfb-xv-generic.c 2009-02-03 10:52:24.000000000 +0100 -@@ -240,7 +240,7 @@ - uint8_t *yb = buf; - uint8_t *ub = yb + (src_y_pitch * src_h); - uint8_t *vb = ub + (src_uv_pitch * (src_h / 2)); -- uv12_to_uyvy(src_w & ~15, -+ uv12_to_uyvy_neon(src_w & ~15, - src_h & ~15, - src_y_pitch, - src_uv_pitch, -@@ -256,7 +256,7 @@ - uint8_t *yb = buf; - uint8_t *vb = yb + (src_y_pitch * src_h); - uint8_t *ub = vb + (src_uv_pitch * (src_h / 2)); -- uv12_to_uyvy(src_w & ~15, -+ uv12_to_uyvy_neon(src_w & ~15, - src_h & ~15, - src_y_pitch, - src_uv_pitch, diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index 609693a77e..53301042bd 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -2,14 +2,13 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -PR_append = "c" +PR_append = "d" -SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc" +SRCREV = "2ae9a57ebc3236cd0aec6534067b91a5c6916a3a" PV = "0.1.1+${PR}+gitr${SRCREV}" PE = "1" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ -file://0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch;patch=1 \ " S = "${WORKDIR}/git" |