From f8f9da28f93aa0ce767fad3b118085a66a396cb3 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Mon, 27 Apr 2015 14:39:37 +0000 Subject: Upgrade libdrm to 2.4.60 and patch for jetson Jetson support now requires new features not found in mainline yet Change-Id: I3128058e8e821ec00f26877ed42a1c46dcbd12b5 --- strata/libdrm-common.morph | 4 ++-- strata/libdrm-common/drm.morph | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 0efac1e3..16ef2375 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 d1a5381b..a614a831 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 -- cgit v1.2.1