summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-04-27 14:39:37 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-04-30 11:06:24 (GMT)
commitf8f9da28f93aa0ce767fad3b118085a66a396cb3 (patch)
treeaaa77af3eb50a41ed8e0112a57b1b63ed9e72f6b
parent9cfa80796fcfad9520a77f65cf479e1cdbd3716c (diff)
downloaddefinitions-f8f9da28f93aa0ce767fad3b118085a66a396cb3.tar.gz
Upgrade libdrm to 2.4.60 and patch for jetson
Jetson support now requires new features not found in mainline yet Change-Id: I3128058e8e821ec00f26877ed42a1c46dcbd12b5
-rw-r--r--strata/libdrm-common.morph4
-rw-r--r--strata/libdrm-common/drm.morph9
2 files changed, 11 insertions, 2 deletions
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index 0efac1e..16ef237 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -10,7 +10,7 @@ chunks:
- name: drm
repo: upstream:drm
morph: strata/libdrm-common/drm.morph
- ref: d2e0f552467ca11162fe04dfed55de4590280f23
- unpetrify-ref: libdrm-2.4.59
+ ref: 5f7b6723e1bed755c230817eea0563bab5b2a8a7
+ unpetrify-ref: libdrm-2.4.60
build-depends:
- xorg-lib-libpciaccess
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
index d1a5381..a614a83 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.morph
@@ -1,6 +1,15 @@
name: drm
kind: chunk
build-system: autotools
+pre-configure-commands:
+ # Tegra requires a new coherent BO attribute, not currently upstream, so
+ # patch it here
+ - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1 << 4)' include/drm/nouveau_drm.h
+ - |
+ sed -i '/info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;/a\
+ if (bo->flags & NOUVEAU_BO_COHERENT)\
+ info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;' nouveau/abi16.c
+ - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' nouveau/nouveau.h
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api