From: Dave Airlie <airlied@redhat.com>
Date: Fri, 5 Apr 2019 01:21:47 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2019-04-04' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=14d2bd53a47a7e1cb3e03d00a6b952734cf90f3f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'drm-misc-next-2019-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.2:

UAPI Changes:
-syncobj: Add TIMELINE_WAIT|QUERY|TRANSFER|TIMELINE_SIGNAL ioctls (Chunming)
-Clarify that 1.0 can be represented by drm_color_lut (Daniel)

Cross-subsystem Changes:
-dt-bindings: Add binding for rk3066 hdmi (Johan)
-dt-bindings: Add binding for Feiyang FY07024DI26A30-D panel (Jagan)
-dt-bindings: Add Rocktech vendor prefix and jh057n00900 panel bindings (Guido)
-MAINTAINERS: Add lima and ASPEED entries (Joel & Qiang)

Core Changes:
-memory: use dma_alloc_coherent when mem encryption is active (Christian)
-dma_buf: add support for a dma_fence chain (Christian)
-shmem_gem: fix off-by-one bug in new shmem gem helpers (Dan)

Driver Changes:
-rockchip: Add support for rk3066 hdmi (Johan)
-ASPEED: Add driver supporting ASPEED BMC display controller to drm (Joel)
-lima: Add driver supporting Arm Mali4xx gpus to drm (Qiang)
-vc4/v3d: Various cleanups and improved error handling (Eric)
-panel: Add support for Feiyang FY07024DI26A30-D MIPI-DSI panel (Jagan)
-panel: Add support for Rocktech jh057n00900 MIPI-DSI panel (Guido)

Cc: Johan Jonker <jbx6244@gmail.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Guido Günther <agx@sigxcpu.org>
Cc: Joel Stanley <joel@jms.id.au>
[airlied: fixed XA limit build breakage, Rodrigo also submitted the same patch, but
I squashed it in the merge.]
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190404201016.GA139524@art_vandelay
---

14d2bd53a47a7e1cb3e03d00a6b952734cf90f3f
diff --cc drivers/gpu/drm/lima/lima_ctx.c
index 000000000000,c8d12f7c6894..22fff6caa961
mode 000000,100644..100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@@ -1,0 -1,98 +1,98 @@@
+ // SPDX-License-Identifier: GPL-2.0 OR MIT
+ /* Copyright 2018-2019 Qiang Yu <yuq825@gmail.com> */
+ 
+ #include <linux/slab.h>
+ 
+ #include "lima_device.h"
+ #include "lima_ctx.h"
+ 
+ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
+ {
+ 	struct lima_ctx *ctx;
+ 	int i, err;
+ 
+ 	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+ 	if (!ctx)
+ 		return -ENOMEM;
+ 	ctx->dev = dev;
+ 	kref_init(&ctx->refcnt);
+ 
+ 	for (i = 0; i < lima_pipe_num; i++) {
+ 		err = lima_sched_context_init(dev->pipe + i, ctx->context + i, &ctx->guilty);
+ 		if (err)
+ 			goto err_out0;
+ 	}
+ 
 -	err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
++	err = xa_alloc(&mgr->handles, id, ctx, xa_limit_32b, GFP_KERNEL);
+ 	if (err < 0)
+ 		goto err_out0;
+ 
+ 	return 0;
+ 
+ err_out0:
+ 	for (i--; i >= 0; i--)
+ 		lima_sched_context_fini(dev->pipe + i, ctx->context + i);
+ 	kfree(ctx);
+ 	return err;
+ }
+ 
+ static void lima_ctx_do_release(struct kref *ref)
+ {
+ 	struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt);
+ 	int i;
+ 
+ 	for (i = 0; i < lima_pipe_num; i++)
+ 		lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i);
+ 	kfree(ctx);
+ }
+ 
+ int lima_ctx_free(struct lima_ctx_mgr *mgr, u32 id)
+ {
+ 	struct lima_ctx *ctx;
+ 	int ret = 0;
+ 
+ 	mutex_lock(&mgr->lock);
+ 	ctx = xa_erase(&mgr->handles, id);
+ 	if (ctx)
+ 		kref_put(&ctx->refcnt, lima_ctx_do_release);
+ 	else
+ 		ret = -EINVAL;
+ 	mutex_unlock(&mgr->lock);
+ 	return ret;
+ }
+ 
+ struct lima_ctx *lima_ctx_get(struct lima_ctx_mgr *mgr, u32 id)
+ {
+ 	struct lima_ctx *ctx;
+ 
+ 	mutex_lock(&mgr->lock);
+ 	ctx = xa_load(&mgr->handles, id);
+ 	if (ctx)
+ 		kref_get(&ctx->refcnt);
+ 	mutex_unlock(&mgr->lock);
+ 	return ctx;
+ }
+ 
+ void lima_ctx_put(struct lima_ctx *ctx)
+ {
+ 	kref_put(&ctx->refcnt, lima_ctx_do_release);
+ }
+ 
+ void lima_ctx_mgr_init(struct lima_ctx_mgr *mgr)
+ {
+ 	mutex_init(&mgr->lock);
+ 	xa_init_flags(&mgr->handles, XA_FLAGS_ALLOC);
+ }
+ 
+ void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr)
+ {
+ 	struct lima_ctx *ctx;
+ 	unsigned long id;
+ 
+ 	xa_for_each(&mgr->handles, id, ctx) {
+ 		kref_put(&ctx->refcnt, lima_ctx_do_release);
+ 	}
+ 
+ 	xa_destroy(&mgr->handles);
+ 	mutex_destroy(&mgr->lock);
+ }