Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2014-02-02 15:47:36 +01:00
commit f0123688a3
7 changed files with 43 additions and 3 deletions

View File

@ -1,3 +1,6 @@
4.1.2
- rebuild for xlib changes
4.1.1
- update to boblightd-478

View File

@ -18,7 +18,7 @@
PKG_NAME="boblightd"
PKG_VERSION="478"
PKG_REV="1"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://code.google.com/p/boblight"

View File

@ -0,0 +1,32 @@
From b091ef6be8a4d8f3c04c2ff15f6d20364438e8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Date: Thu, 30 Jan 2014 18:54:24 +0100
Subject: [PATCH] drm/radeon: fix UVD IRQ support on SI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise decoding isn't really useable.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/si.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 07ce587..a22df95 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -6334,6 +6334,10 @@ restart_ih:
break;
}
break;
+ case 124: /* UVD */
+ DRM_DEBUG("IH: UVD int: 0x%08x\n", src_data);
+ radeon_fence_process(rdev, R600_RING_TYPE_UVD_INDEX);
+ break;
case 146:
case 147:
addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);
--
1.8.1.2

View File

@ -33,6 +33,8 @@ PKG_LONGDESC="rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supp
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
MAKEFLAGS="-j1"
make_target() {
make prefix=/usr \
incdir=/usr/include/librtmp \

View File

@ -31,3 +31,5 @@ PKG_LONGDESC="X Fixes Library"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

View File

@ -32,7 +32,8 @@ PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT e
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull \
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
--enable-malloc0returnsnull \
--disable-silent-rules \
--disable-docs \
--disable-specs \

View File

@ -32,4 +32,4 @@ PKG_LONGDESC="The X Rendering Extension (Render) introduces digital image compos
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"