From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 13 Jul 2020 09:20:15 +1000 Subject: [PATCH] nouveau: fixup driver for new X server ABI --- src/compat-api.h | 4 ++++ src/nouveau_exa.c | 2 +- src/nv_driver.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/compat-api.h b/src/compat-api.h index fde2f4b..8a1fcf9 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -102,4 +102,8 @@ #endif +#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) +#define secondary_dst slave_dst +#endif + #endif diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 55df6f8..db3b112 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) #ifdef NOUVEAU_PIXMAP_SHARING static Bool -nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) +nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) { struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); diff --git a/src/nv_driver.c b/src/nv_driver.c index e72a6b6..f9ab4af 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) { RegionRec pixregion; - PixmapRegionInit(&pixregion, dirty->slave_dst); + PixmapRegionInit(&pixregion, dirty->secondary_dst); - DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); + DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); #ifdef HAS_DIRTYTRACKING_ROTATION PixmapSyncDirtyHelper(dirty); #else PixmapSyncDirtyHelper(dirty, &pixregion); #endif - DamageRegionProcessPending(&dirty->slave_dst->drawable); + DamageRegionProcessPending(&dirty->secondary_dst->drawable); RegionUninit(&pixregion); } -- 2.33.1 'txt' type='search' size='10' name='q' value=''/>
path: root/tests/guix-package-net.sh
AgeCommit message (Expand)Author
2022-01-19package: Honor '--dry-run' when target profile is already in store....Fixes <https://issues.guix.gnu.org/53267>. Reported by Tirifto <tirifto@posteo.cz>. Regression introduced in 65ffb9388c1c3d870cb07e4cb3ef12c9ac06a161. In the (unlikely) case where the profile we're targeting with "guix upgrade -n" or similar is already built, a new profile generation would be created and linked to despite the use of '-n'. This is because 65ffb9388c1c3d870cb07e4cb3ef12c9ac06a161 assumed that dry-run behavior would be handled solely by the build handler, which is not the case when there's nothing to build. * guix/scripts/package.scm (build-and-use-profile): Reintroduce #:dry-run? and honor it. (process-actions): Pass #:dry-run? to 'build-and-use-profile'. * tests/guix-package-net.sh: Add test. Ludovic Courtès
2022-01-16tests: Clean up after 'tests/guix-package-net.sh'....* tests/guix-package-net.sh: Remove second 'trap' line. Change first 'trap' line to remove "$module_dir" and *.lock files. Ludovic Courtès
2020-09-28tests: Simplify shell exit status negation;...* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh: Use the shell '!' keyword to negate command exit status in place of 'if ...; then false; else true; fi' Eric Bavier
2020-05-23guix package: Support multiple profiles with '--list-installed'....* guix/scripts/package.scm (process-query): List installed multiple profiles. * tests/guix-package-net.sh: Test it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> zimoun