From 0e58397cce01711f0c547d98f6a00224bdaaf2ec Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Feb 2009 10:54:18 +0100 Subject: xf86-video-omapfb: add patch for armv7a to do pixel conversion with NEON SIMD --- .../xorg-driver/xf86-video-omapfb/omapfb-neon.diff | 146 +++++++++++++++++++++ packages/xorg-driver/xf86-video-omapfb_git.bb | 7 +- 2 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff diff --git a/packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff new file mode 100644 index 0000000000..325ca66f0c --- /dev/null +++ b/packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff @@ -0,0 +1,146 @@ +--- /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, + * Ilpo Ruotsalainen, + * Tuomas Kulve, ++ * Ian Rickards, + * + * + * 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> 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> 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/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb index e364ecc4c6..f718e7684e 100644 --- a/packages/xorg-driver/xf86-video-omapfb_git.bb +++ b/packages/xorg-driver/xf86-video-omapfb_git.bb @@ -2,13 +2,16 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -PR ="r19" +PR ="r20" SRCREV = "ef0b41c332a710fb33f996df77bd4a96b56878da" PV = "0.0.1+${PR}+gitr${SRCREV}" PE = "1" -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http" +SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ + " + +SRC_URI_append_armv7a = " file://omapfb-neon.diff;patch=1" S = "${WORKDIR}/git" -- cgit v1.2.3 From 1d16c51cfd50fe5e5eb6492e882efe3a03f38e74 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Feb 2009 10:57:52 +0100 Subject: checksums: add more checksums --- conf/checksums.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index ee9d8c1795..bd3a008d34 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -502,6 +502,10 @@ sha256=59eddefa715b3810af20b2b190ae16b46d0b733144d36dc7ddd51b32adac013e md5=b827d300eb28458f6588eb843cba418d sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b +[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.0.tar.bz2] +md5=64f780e7f95c252eaaed0201c3d9a4ca +sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659 + [http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz] md5=8054781c58ae9cf6fe498316860b5ea8 sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c @@ -1390,6 +1394,10 @@ sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134 md5=e77887dbafc515c63feac84686bcb3bc sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9 +[http://www.apache.org/dist/apr/apr-1.3.3.tar.bz2] +md5=2090c21dee4f0eb1512604127dcd158f +sha256=d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37 + [http://www.apache.org/dist/apr/apr-util-0.9.12.tar.gz] md5=8e9cc71a1303b67b3278fbeab9799f2e sha256=5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3 @@ -23818,6 +23826,10 @@ sha256=95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f md5=55ca0cfd09b1c1555d492d6961d9af46 sha256=8d5f6ad0318a8958eaf5772657007ffb545a36c9cd8190f2511cfa03c0069d63 +[ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/xfsprogs_2.8.16-1.tar.gz] +md5=632c7745f884dc5e6fd707a18971aca3 +sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f + [http://slackware.osuosl.org/slackware-12.0/source/a/xfsprogs/xfsprogs_2.8.16-1.tar.gz] md5=632c7745f884dc5e6fd707a18971aca3 sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f -- cgit v1.2.3