Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf723497 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3c2bfbaa 426ef1bb

drivers/gpu/drm/etnaviv/etnaviv_gem.h

+2 −1
Original line number Diff line number Diff line
@@ -106,9 +106,10 @@ struct etnaviv_gem_submit { 
	struct etnaviv_gpu *gpu;

	struct ww_acquire_ctx ticket;

	struct dma_fence *fence;

	u32 flags;

	unsigned int nr_bos;

	struct etnaviv_gem_submit_bo bos[0];

	u32 flags;

	/* No new members here, the previous one is variable-length! */

};



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

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int submit_fence_sync(const struct etnaviv_gem_submit *submit) 
	for (i = 0; i < submit->nr_bos; i++) {

		struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj;

		bool write = submit->bos[i].flags & ETNA_SUBMIT_BO_WRITE;

		bool explicit = !(submit->flags & ETNA_SUBMIT_NO_IMPLICIT);

		bool explicit = !!(submit->flags & ETNA_SUBMIT_NO_IMPLICIT);



		ret = etnaviv_gpu_fence_sync_obj(etnaviv_obj, context, write,

						 explicit);