Skip to content

Commit cf72349

Browse files
committed
Merge branch 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux
Pull drm/etnaviv fixes from Lucas Stach: "I realized I just missed the cut-off point for the final drm fixes pull, but I have 2 more etnaviv fixes that need to go into 4.12, as they fix fallout from the explicit sync work introduced in the last merge window" [ Pulling directly because Dave is on vacation. Noted by Daniel Vetter, and acked by Dave Airlie - Linus ] * 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux: drm/etnaviv: Fix implicit/explicit sync sense inversion drm/etnaviv: fix submit flags getting overwritten by BO content
2 parents 3c2bfba + 426ef1b commit cf72349

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/gpu/drm/etnaviv/etnaviv_gem.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ struct etnaviv_gem_submit {
106106
struct etnaviv_gpu *gpu;
107107
struct ww_acquire_ctx ticket;
108108
struct dma_fence *fence;
109+
u32 flags;
109110
unsigned int nr_bos;
110111
struct etnaviv_gem_submit_bo bos[0];
111-
u32 flags;
112+
/* No new members here, the previous one is variable-length! */
112113
};
113114

114115
int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static int submit_fence_sync(const struct etnaviv_gem_submit *submit)
172172
for (i = 0; i < submit->nr_bos; i++) {
173173
struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj;
174174
bool write = submit->bos[i].flags & ETNA_SUBMIT_BO_WRITE;
175-
bool explicit = !(submit->flags & ETNA_SUBMIT_NO_IMPLICIT);
175+
bool explicit = !!(submit->flags & ETNA_SUBMIT_NO_IMPLICIT);
176176

177177
ret = etnaviv_gpu_fence_sync_obj(etnaviv_obj, context, write,
178178
explicit);

0 commit comments

Comments
 (0)