diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-11-02 17:33:45 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-11-02 17:33:45 +0000 |
| commit | 398a7fa93a05b44adba1d7557b1ad4a24f466369 (patch) | |
| tree | 0d29311eecdb4dd8dade15b88884b991fec0f82e /strata/libdrm-common/drm.morph | |
| parent | 8a575a776e7476cb3beb22bb6b71e269c6b55580 (diff) | |
| parent | 6cb63998328664c5c234b5a5da7ea3a9026e4d2a (diff) | |
| download | infrastructure-398a7fa93a05b44adba1d7557b1ad4a24f466369.tar.gz | |
Merge tag 'baserock-15.34'
Conflicts:
README
clusters/release.morph
scripts/release-build
Change-Id: If289bcb168478405400c66717d7f33dcdde63cb6
Diffstat (limited to 'strata/libdrm-common/drm.morph')
| -rw-r--r-- | strata/libdrm-common/drm.morph | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index a614a831..4b0bdcc1 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -4,12 +4,14 @@ 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 '/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 + - 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 +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api |