Commit 3a7d2f4f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next 



"small fixes and a change to not restrict etnaviv to certain architectures."

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/4bc1a4c8447bb947d2fe8facd0ff09c5b8753087.camel@pengutronix.de
parents c703bf9e 9e053523

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5193,7 +5193,7 @@ DRM DRIVERS FOR VIVANTE GPU IP 
M:	Lucas Stach <l.stach@pengutronix.de>

R:	Russell King <linux+etnaviv@armlinux.org.uk>

R:	Christian Gmeiner <christian.gmeiner@gmail.com>

L:	etnaviv@lists.freedesktop.org

L:	etnaviv@lists.freedesktop.org (moderated for non-subscribers)

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/etnaviv/

drivers/gpu/drm/etnaviv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
config DRM_ETNAVIV

	tristate "ETNAVIV (DRM support for Vivante GPU IP cores)"

	depends on DRM

	depends on ARCH_MXC || ARCH_DOVE || (ARM && COMPILE_TEST)

	depends on MMU

	select SHMEM

	select SYNC_FILE

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ struct etnaviv_perfmon_request; 
struct etnaviv_cmdbuf {

	/* suballocator this cmdbuf is allocated from */

	struct etnaviv_cmdbuf_suballoc *suballoc;

	/* user context key, must be unique between all active users */

	struct etnaviv_file_private *ctx;

	/* cmdbuf properties */

	int suballoc_offset;

	void *vaddr;

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) 
		mutex_lock(&obj->lock);

		pages = etnaviv_gem_get_pages(obj);

		mutex_unlock(&obj->lock);

		if (pages) {

		if (!IS_ERR(pages)) {

			int j;



			iter.hdr->data[0] = bomap - bomap_start;

drivers/gpu/drm/etnaviv/etnaviv_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct etnaviv_gem_submit_bo { 
struct etnaviv_gem_submit {

	struct drm_sched_job sched_job;

	struct kref refcount;

	struct etnaviv_file_private *ctx;

	struct etnaviv_gpu *gpu;

	struct dma_fence *out_fence, *in_fence;

	int out_fence_id;

CRA Git | Maintained and supported by SUSTech CRA and CCSE