From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25DE9C11F67 for ; Thu, 8 Jul 2021 17:38:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05B2461921 for ; Thu, 8 Jul 2021 17:38:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbhGHRlE (ORCPT ); Thu, 8 Jul 2021 13:41:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229815AbhGHRlC (ORCPT ); Thu, 8 Jul 2021 13:41:02 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99D01C061574 for ; Thu, 8 Jul 2021 10:38:20 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id g10so4614441wmh.2 for ; Thu, 08 Jul 2021 10:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=RdVtO26kKykbuARG+kcM5sPhsNaIfc6/4+aL71+B0Iudfror1HlkQkTm9U3ziJQ02S mdYfxXt4zcJCBHe/R69CBAczNjFW9qG+cRooM1yaROf+I+pr3TJvSGJQSgMhtOo9Pu1X dKSZOU36/TenDGQGVSciBtUFxUoFfg+J0JnQA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=dF/lzC1TLDM3kJM3vCZolEG4CghuU/r4tzqtvuFNrgOnunChGDFkY57JU87RAiHLQh dU17ZBV++bcfGDkqGRggUplMStAum4Krqs09vP5RvSoDXVQ6u+KYdMuSfWGEWsAZXRhP rFbSgKx3p+6J/ZMiDc6fRUpRcwsyGKPRsZ7hRjNIT30UP29sGEdBhXpkWro96+1WQ4jY Ok7ulJajt2kU4XaWAvxU63k4k3qmdQyiLXgE6h0kwx50Npcsr1a5KSpPDX/Z0WqXVG/h ZsNllSdXrOfYTWIas7JWp/zNn7B3vHINiiZolYJnASshQXk1oqPWie7jhQRBtNzUqq/F nRtA== X-Gm-Message-State: AOAM532cq3+Rxt9og6+MOWJ+Ns9Z7rtQNVvBVF4crA3AE7esVZ4TZx0C n+EKAdGvcffdtv7g5BJ0htquBQ== X-Google-Smtp-Source: ABdhPJzeSdQ8WqEeuo+D61tem+xEHOYWy9du2bmluQAeHGxaTOG7LUFORkddeLlac2VtuV5cIKUW2g== X-Received: by 2002:a7b:c4ca:: with SMTP id g10mr6647151wmk.148.1625765899284; Thu, 08 Jul 2021 10:38:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , Daniel Vetter , Daniel Vetter , Lucas Stach , Russell King , Christian Gmeiner , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , etnaviv@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH v3 11/20] drm/etnaviv: Use scheduler dependency handling Date: Thu, 8 Jul 2021 19:37:45 +0200 Message-Id: <20210708173754.3877540-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org We need to pull the drm_sched_job_init much earlier, but that's very minor surgery. v2: Actually fix up cleanup paths by calling drm_sched_job_init, which I wanted to to in the previous round (and did, for all other drivers). Spotted by Lucas. Signed-off-by: Daniel Vetter Cc: Lucas Stach Cc: Russell King Cc: Christian Gmeiner Cc: Sumit Semwal Cc: "Christian König" Cc: etnaviv@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org --- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 58 +++++++++--------- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +------------------- drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- 4 files changed, 35 insertions(+), 94 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h index 98e60df882b6..63688e6e4580 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h @@ -80,9 +80,6 @@ struct etnaviv_gem_submit_bo { u64 va; struct etnaviv_gem_object *obj; struct etnaviv_vram_mapping *mapping; - struct dma_fence *excl; - unsigned int nr_shared; - struct dma_fence **shared; }; /* Created per submit-ioctl, to track bo's and cmdstream bufs, etc, @@ -95,7 +92,7 @@ struct etnaviv_gem_submit { struct etnaviv_file_private *ctx; struct etnaviv_gpu *gpu; struct etnaviv_iommu_context *mmu_context, *prev_mmu_context; - struct dma_fence *out_fence, *in_fence; + struct dma_fence *out_fence; int out_fence_id; struct list_head node; /* GPU active submit list */ struct etnaviv_cmdbuf cmdbuf; diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 4dd7d9d541c0..5b97ce1299ad 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -188,16 +188,10 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit) if (submit->flags & ETNA_SUBMIT_NO_IMPLICIT) continue; - if (bo->flags & ETNA_SUBMIT_BO_WRITE) { - ret = dma_resv_get_fences(robj, &bo->excl, - &bo->nr_shared, - &bo->shared); - if (ret) - return ret; - } else { - bo->excl = dma_resv_get_excl_unlocked(robj); - } - + ret = drm_sched_job_await_implicit(&submit->sched_job, &bo->obj->base, + bo->flags & ETNA_SUBMIT_BO_WRITE); + if (ret) + return ret; } return ret; @@ -403,8 +397,6 @@ static void submit_cleanup(struct kref *kref) wake_up_all(&submit->gpu->fence_event); - if (submit->in_fence) - dma_fence_put(submit->in_fence); if (submit->out_fence) { /* first remove from IDR, so fence can not be found anymore */ mutex_lock(&submit->gpu->fence_lock); @@ -529,7 +521,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, ret = etnaviv_cmdbuf_init(priv->cmdbuf_suballoc, &submit->cmdbuf, ALIGN(args->stream_size, 8) + 8); if (ret) - goto err_submit_objects; + goto err_submit_put; submit->ctx = file->driver_priv; etnaviv_iommu_context_get(submit->ctx->mmu); @@ -537,51 +529,61 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, submit->exec_state = args->exec_state; submit->flags = args->flags; + ret = drm_sched_job_init(&submit->sched_job, + &ctx->sched_entity[args->pipe], + submit->ctx); + if (ret) + goto err_submit_put; + ret = submit_lookup_objects(submit, file, bos, args->nr_bos); if (ret) - goto err_submit_objects; + goto err_submit_job; if ((priv->mmu_global->version != ETNAVIV_IOMMU_V2) && !etnaviv_cmd_validate_one(gpu, stream, args->stream_size / 4, relocs, args->nr_relocs)) { ret = -EINVAL; - goto err_submit_objects; + goto err_submit_job; } if (args->flags & ETNA_SUBMIT_FENCE_FD_IN) { - submit->in_fence = sync_file_get_fence(args->fence_fd); - if (!submit->in_fence) { + struct dma_fence *in_fence = sync_file_get_fence(args->fence_fd); + if (!in_fence) { ret = -EINVAL; - goto err_submit_objects; + goto err_submit_job; } + + ret = drm_sched_job_await_fence(&submit->sched_job, in_fence); + if (ret) + goto err_submit_job; } ret = submit_pin_objects(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_reloc(submit, stream, args->stream_size / 4, relocs, args->nr_relocs); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_perfmon_validate(submit, args->exec_state, pmrs); if (ret) - goto err_submit_objects; + goto err_submit_job; memcpy(submit->cmdbuf.vaddr, stream, args->stream_size); ret = submit_lock_objects(submit, &ticket); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_fence_sync(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; - ret = etnaviv_sched_push_job(&ctx->sched_entity[args->pipe], submit); + ret = etnaviv_sched_push_job(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; submit_attach_object_fences(submit); @@ -595,7 +597,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, sync_file = sync_file_create(submit->out_fence); if (!sync_file) { ret = -ENOMEM; - goto err_submit_objects; + goto err_submit_job; } fd_install(out_fence_fd, sync_file->file); } @@ -603,7 +605,9 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, args->fence_fd = out_fence_fd; args->fence = submit->out_fence_id; -err_submit_objects: +err_submit_job: + drm_sched_job_cleanup(&submit->sched_job); +err_submit_put: etnaviv_submit_put(submit); err_submit_ww_acquire: diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 180bb633d5c5..2bbbd6ccc95e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -17,58 +17,6 @@ module_param_named(job_hang_limit, etnaviv_job_hang_limit, int , 0444); static int etnaviv_hw_jobs_limit = 4; module_param_named(hw_job_limit, etnaviv_hw_jobs_limit, int , 0444); -static struct dma_fence * -etnaviv_sched_dependency(struct drm_sched_job *sched_job, - struct drm_sched_entity *entity) -{ - struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job); - struct dma_fence *fence; - int i; - - if (unlikely(submit->in_fence)) { - fence = submit->in_fence; - submit->in_fence = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - - for (i = 0; i < submit->nr_bos; i++) { - struct etnaviv_gem_submit_bo *bo = &submit->bos[i]; - int j; - - if (bo->excl) { - fence = bo->excl; - bo->excl = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - - for (j = 0; j < bo->nr_shared; j++) { - if (!bo->shared[j]) - continue; - - fence = bo->shared[j]; - bo->shared[j] = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - kfree(bo->shared); - bo->nr_shared = 0; - bo->shared = NULL; - } - - return NULL; -} - static struct dma_fence *etnaviv_sched_run_job(struct drm_sched_job *sched_job) { struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job); @@ -140,29 +88,22 @@ static void etnaviv_sched_free_job(struct drm_sched_job *sched_job) } static const struct drm_sched_backend_ops etnaviv_sched_ops = { - .dependency = etnaviv_sched_dependency, .run_job = etnaviv_sched_run_job, .timedout_job = etnaviv_sched_timedout_job, .free_job = etnaviv_sched_free_job, }; -int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity, - struct etnaviv_gem_submit *submit) +int etnaviv_sched_push_job(struct etnaviv_gem_submit *submit) { int ret = 0; /* * Hold the fence lock across the whole operation to avoid jobs being * pushed out of order with regard to their sched fence seqnos as - * allocated in drm_sched_job_init. + * allocated in drm_sched_job_arm. */ mutex_lock(&submit->gpu->fence_lock); - ret = drm_sched_job_init(&submit->sched_job, sched_entity, - submit->ctx); - if (ret) - goto out_unlock; - drm_sched_job_arm(&submit->sched_job); submit->out_fence = dma_fence_get(&submit->sched_job.s_fence->finished); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.h b/drivers/gpu/drm/etnaviv/etnaviv_sched.h index c0a6796e22c9..baebfa069afc 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.h @@ -18,7 +18,6 @@ struct etnaviv_gem_submit *to_etnaviv_submit(struct drm_sched_job *sched_job) int etnaviv_sched_init(struct etnaviv_gpu *gpu); void etnaviv_sched_fini(struct etnaviv_gpu *gpu); -int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity, - struct etnaviv_gem_submit *submit); +int etnaviv_sched_push_job(struct etnaviv_gem_submit *submit); #endif /* __ETNAVIV_SCHED_H__ */ -- 2.32.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09392C07E96 for ; Thu, 8 Jul 2021 17:38:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3BC16191D for ; Thu, 8 Jul 2021 17:38:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3BC16191D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8BD66E96E; Thu, 8 Jul 2021 17:38:22 +0000 (UTC) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C5F96E96D for ; Thu, 8 Jul 2021 17:38:20 +0000 (UTC) Received: by mail-wm1-x335.google.com with SMTP id k32so1395435wms.4 for ; Thu, 08 Jul 2021 10:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=RdVtO26kKykbuARG+kcM5sPhsNaIfc6/4+aL71+B0Iudfror1HlkQkTm9U3ziJQ02S mdYfxXt4zcJCBHe/R69CBAczNjFW9qG+cRooM1yaROf+I+pr3TJvSGJQSgMhtOo9Pu1X dKSZOU36/TenDGQGVSciBtUFxUoFfg+J0JnQA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=WNX+8l2A3zDbWPRk0kjrYz0Hhstb1+a6lZLWQh1YhD7KQgq26E+g0VGR/ojcszKByz XuGLXEKNd3ZqRgP0r8Tq/uMoNwZCpvpgdaP8FqXdBlS21lS7VigCn7yAZ33IJgXmhird LIYTeLHj3cUKi4PRlYjBKhCQXKcgSvn5hfF2YwPj2EmJFFXfl5HOtODnSz1aTaQQP7EI Q+8oZzxNtX2T0QKqoPDS05zQX3dXKxRGaEuR0q4aDxGl6+vS7tTmioY2qQgFYE1/g1QO nxn7GeiNz9e9nesg7MiE1wVGdMll3X4YPm10UHdxAjHTSy/8BZL5dn7bhiPgo/Ijajuq MV+A== X-Gm-Message-State: AOAM533RXe0jG075TGInvF7Fv7xqIkDcfm7xnmo8NIEPRsgZ2QkL2D3/ +F/u9BzL3U2lH3EHtKv0wAaLLOS9UmZy/w== X-Google-Smtp-Source: ABdhPJzeSdQ8WqEeuo+D61tem+xEHOYWy9du2bmluQAeHGxaTOG7LUFORkddeLlac2VtuV5cIKUW2g== X-Received: by 2002:a7b:c4ca:: with SMTP id g10mr6647151wmk.148.1625765899284; Thu, 08 Jul 2021 10:38:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH v3 11/20] drm/etnaviv: Use scheduler dependency handling Date: Thu, 8 Jul 2021 19:37:45 +0200 Message-Id: <20210708173754.3877540-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , etnaviv@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, Russell King , Daniel Vetter , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We need to pull the drm_sched_job_init much earlier, but that's very minor surgery. v2: Actually fix up cleanup paths by calling drm_sched_job_init, which I wanted to to in the previous round (and did, for all other drivers). Spotted by Lucas. Signed-off-by: Daniel Vetter Cc: Lucas Stach Cc: Russell King Cc: Christian Gmeiner Cc: Sumit Semwal Cc: "Christian König" Cc: etnaviv@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org --- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 58 +++++++++--------- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +------------------- drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- 4 files changed, 35 insertions(+), 94 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h index 98e60df882b6..63688e6e4580 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h @@ -80,9 +80,6 @@ struct etnaviv_gem_submit_bo { u64 va; struct etnaviv_gem_object *obj; struct etnaviv_vram_mapping *mapping; - struct dma_fence *excl; - unsigned int nr_shared; - struct dma_fence **shared; }; /* Created per submit-ioctl, to track bo's and cmdstream bufs, etc, @@ -95,7 +92,7 @@ struct etnaviv_gem_submit { struct etnaviv_file_private *ctx; struct etnaviv_gpu *gpu; struct etnaviv_iommu_context *mmu_context, *prev_mmu_context; - struct dma_fence *out_fence, *in_fence; + struct dma_fence *out_fence; int out_fence_id; struct list_head node; /* GPU active submit list */ struct etnaviv_cmdbuf cmdbuf; diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 4dd7d9d541c0..5b97ce1299ad 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -188,16 +188,10 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit) if (submit->flags & ETNA_SUBMIT_NO_IMPLICIT) continue; - if (bo->flags & ETNA_SUBMIT_BO_WRITE) { - ret = dma_resv_get_fences(robj, &bo->excl, - &bo->nr_shared, - &bo->shared); - if (ret) - return ret; - } else { - bo->excl = dma_resv_get_excl_unlocked(robj); - } - + ret = drm_sched_job_await_implicit(&submit->sched_job, &bo->obj->base, + bo->flags & ETNA_SUBMIT_BO_WRITE); + if (ret) + return ret; } return ret; @@ -403,8 +397,6 @@ static void submit_cleanup(struct kref *kref) wake_up_all(&submit->gpu->fence_event); - if (submit->in_fence) - dma_fence_put(submit->in_fence); if (submit->out_fence) { /* first remove from IDR, so fence can not be found anymore */ mutex_lock(&submit->gpu->fence_lock); @@ -529,7 +521,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, ret = etnaviv_cmdbuf_init(priv->cmdbuf_suballoc, &submit->cmdbuf, ALIGN(args->stream_size, 8) + 8); if (ret) - goto err_submit_objects; + goto err_submit_put; submit->ctx = file->driver_priv; etnaviv_iommu_context_get(submit->ctx->mmu); @@ -537,51 +529,61 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, submit->exec_state = args->exec_state; submit->flags = args->flags; + ret = drm_sched_job_init(&submit->sched_job, + &ctx->sched_entity[args->pipe], + submit->ctx); + if (ret) + goto err_submit_put; + ret = submit_lookup_objects(submit, file, bos, args->nr_bos); if (ret) - goto err_submit_objects; + goto err_submit_job; if ((priv->mmu_global->version != ETNAVIV_IOMMU_V2) && !etnaviv_cmd_validate_one(gpu, stream, args->stream_size / 4, relocs, args->nr_relocs)) { ret = -EINVAL; - goto err_submit_objects; + goto err_submit_job; } if (args->flags & ETNA_SUBMIT_FENCE_FD_IN) { - submit->in_fence = sync_file_get_fence(args->fence_fd); - if (!submit->in_fence) { + struct dma_fence *in_fence = sync_file_get_fence(args->fence_fd); + if (!in_fence) { ret = -EINVAL; - goto err_submit_objects; + goto err_submit_job; } + + ret = drm_sched_job_await_fence(&submit->sched_job, in_fence); + if (ret) + goto err_submit_job; } ret = submit_pin_objects(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_reloc(submit, stream, args->stream_size / 4, relocs, args->nr_relocs); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_perfmon_validate(submit, args->exec_state, pmrs); if (ret) - goto err_submit_objects; + goto err_submit_job; memcpy(submit->cmdbuf.vaddr, stream, args->stream_size); ret = submit_lock_objects(submit, &ticket); if (ret) - goto err_submit_objects; + goto err_submit_job; ret = submit_fence_sync(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; - ret = etnaviv_sched_push_job(&ctx->sched_entity[args->pipe], submit); + ret = etnaviv_sched_push_job(submit); if (ret) - goto err_submit_objects; + goto err_submit_job; submit_attach_object_fences(submit); @@ -595,7 +597,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, sync_file = sync_file_create(submit->out_fence); if (!sync_file) { ret = -ENOMEM; - goto err_submit_objects; + goto err_submit_job; } fd_install(out_fence_fd, sync_file->file); } @@ -603,7 +605,9 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, args->fence_fd = out_fence_fd; args->fence = submit->out_fence_id; -err_submit_objects: +err_submit_job: + drm_sched_job_cleanup(&submit->sched_job); +err_submit_put: etnaviv_submit_put(submit); err_submit_ww_acquire: diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 180bb633d5c5..2bbbd6ccc95e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -17,58 +17,6 @@ module_param_named(job_hang_limit, etnaviv_job_hang_limit, int , 0444); static int etnaviv_hw_jobs_limit = 4; module_param_named(hw_job_limit, etnaviv_hw_jobs_limit, int , 0444); -static struct dma_fence * -etnaviv_sched_dependency(struct drm_sched_job *sched_job, - struct drm_sched_entity *entity) -{ - struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job); - struct dma_fence *fence; - int i; - - if (unlikely(submit->in_fence)) { - fence = submit->in_fence; - submit->in_fence = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - - for (i = 0; i < submit->nr_bos; i++) { - struct etnaviv_gem_submit_bo *bo = &submit->bos[i]; - int j; - - if (bo->excl) { - fence = bo->excl; - bo->excl = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - - for (j = 0; j < bo->nr_shared; j++) { - if (!bo->shared[j]) - continue; - - fence = bo->shared[j]; - bo->shared[j] = NULL; - - if (!dma_fence_is_signaled(fence)) - return fence; - - dma_fence_put(fence); - } - kfree(bo->shared); - bo->nr_shared = 0; - bo->shared = NULL; - } - - return NULL; -} - static struct dma_fence *etnaviv_sched_run_job(struct drm_sched_job *sched_job) { struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job); @@ -140,29 +88,22 @@ static void etnaviv_sched_free_job(struct drm_sched_job *sched_job) } static const struct drm_sched_backend_ops etnaviv_sched_ops = { - .dependency = etnaviv_sched_dependency, .run_job = etnaviv_sched_run_job, .timedout_job = etnaviv_sched_timedout_job, .free_job = etnaviv_sched_free_job, }; -int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity, - struct etnaviv_gem_submit *submit) +int etnaviv_sched_push_job(struct etnaviv_gem_submit *submit) { int ret = 0; /* * Hold the fence lock across the whole operation to avoid jobs being * pushed out of order with regard to their sched fence seqnos as - * allocated in drm_sched_job_init. + * allocated in drm_sched_job_arm. */ mutex_lock(&submit->gpu->fence_lock); - ret = drm_sched_job_init(&submit->sched_job, sched_entity, - submit->ctx); - if (ret) - goto out_unlock; - drm_sched_job_arm(&submit->sched_job); submit->out_fence = dma_fence_get(&submit->sched_job.s_fence->finished); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.h b/drivers/gpu/drm/etnaviv/etnaviv_sched.h index c0a6796e22c9..baebfa069afc 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.h @@ -18,7 +18,6 @@ struct etnaviv_gem_submit *to_etnaviv_submit(struct drm_sched_job *sched_job) int etnaviv_sched_init(struct etnaviv_gpu *gpu); void etnaviv_sched_fini(struct etnaviv_gpu *gpu); -int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity, - struct etnaviv_gem_submit *submit); +int etnaviv_sched_push_job(struct etnaviv_gem_submit *submit); #endif /* __ETNAVIV_SCHED_H__ */ -- 2.32.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DEEAC11F66 for ; Thu, 8 Jul 2021 17:38:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50D2A6191D for ; Thu, 8 Jul 2021 17:38:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50D2A6191D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9623E6E96D; Thu, 8 Jul 2021 17:38:22 +0000 (UTC) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BCD16E96C for ; Thu, 8 Jul 2021 17:38:20 +0000 (UTC) Received: by mail-wm1-x32f.google.com with SMTP id j34so4586190wms.5 for ; Thu, 08 Jul 2021 10:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=RdVtO26kKykbuARG+kcM5sPhsNaIfc6/4+aL71+B0Iudfror1HlkQkTm9U3ziJQ02S mdYfxXt4zcJCBHe/R69CBAczNjFW9qG+cRooM1yaROf+I+pr3TJvSGJQSgMhtOo9Pu1X dKSZOU36/TenDGQGVSciBtUFxUoFfg+J0JnQA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjNW4u1I0U0Q7toaCUK63SQ1n8cRfb0yAV1MC4gWi04=; b=r7h0X1BqyJPEJE4g/2FU6CMBFEA/erkW2IjWm+anDSHDO/deNa0f+XOngXk0DPJ/Sd z2tFF8IoJwMydx3RXI8+kdkXflkjwqcR8LIFe+tRPT5nP9qc7NuoTe6e8or9kqUr3UqQ Q3i1GwlCOyeKzRnYtz36+jeh4d014ET2rbmHl7qDkKBhWVQjanAP3/nZiBzMHw1nES/Q uIa9Yvsg2meY2MtcDh0Jsc+zvShvbwJ2cVd/2+OKU2LFmlLnw8QPak7840hL4cINKvKW p/dvLrAtYCDwcIeo+G3jkCbz7tXDedh4UoYRodRKHjtbF8N+hKfN0kdKjaw1RzHdLwRc rWqA== X-Gm-Message-State: AOAM533I1HBd9qboOW4Z5YvoFtGWGfkle+D5R8CyIqQsrDgriLQHTPq8 Pi68I/AlGoN1xMSm+XB28zt9TgSNT+YlcA== X-Google-Smtp-Source: ABdhPJzeSdQ8WqEeuo+D61tem+xEHOYWy9du2bmluQAeHGxaTOG7LUFORkddeLlac2VtuV5cIKUW2g== X-Received: by 2002:a7b:c4ca:: with SMTP id g10mr6647151wmk.148.1625765899284; Thu, 08 Jul 2021 10:38:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 8 Jul 2021 19:37:45 +0200 Message-Id: <20210708173754.3877540-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 11/20] drm/etnaviv: Use scheduler dependency handling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , etnaviv@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, Christian Gmeiner , Russell King , Daniel Vetter , linux-media@vger.kernel.org, Sumit Semwal , Lucas Stach Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" V2UgbmVlZCB0byBwdWxsIHRoZSBkcm1fc2NoZWRfam9iX2luaXQgbXVjaCBlYXJsaWVyLCBidXQg dGhhdCdzIHZlcnkKbWlub3Igc3VyZ2VyeS4KCnYyOiBBY3R1YWxseSBmaXggdXAgY2xlYW51cCBw YXRocyBieSBjYWxsaW5nIGRybV9zY2hlZF9qb2JfaW5pdCwgd2hpY2gKSSB3YW50ZWQgdG8gdG8g aW4gdGhlIHByZXZpb3VzIHJvdW5kIChhbmQgZGlkLCBmb3IgYWxsIG90aGVyIGRyaXZlcnMpLgpT cG90dGVkIGJ5IEx1Y2FzLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBMdWNhcyBTdGFjaCA8bC5zdGFjaEBwZW5ndXRyb25peC5kZT4K Q2M6IFJ1c3NlbGwgS2luZyA8bGludXgrZXRuYXZpdkBhcm1saW51eC5vcmcudWs+CkNjOiBDaHJp c3RpYW4gR21laW5lciA8Y2hyaXN0aWFuLmdtZWluZXJAZ21haWwuY29tPgpDYzogU3VtaXQgU2Vt d2FsIDxzdW1pdC5zZW13YWxAbGluYXJvLm9yZz4KQ2M6ICJDaHJpc3RpYW4gS8O2bmlnIiA8Y2hy aXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpDYzogZXRuYXZpdkBsaXN0cy5mcmVlZGVza3RvcC5vcmcK Q2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogbGluYXJvLW1tLXNpZ0BsaXN0cy5s aW5hcm8ub3JnCi0tLQogZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW0uaCAgICAg ICAgfCAgNSArLQogZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMg fCA1OCArKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZf c2NoZWQuYyAgICAgIHwgNjMgKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9l dG5hdml2L2V0bmF2aXZfc2NoZWQuaCAgICAgIHwgIDMgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMzUg aW5zZXJ0aW9ucygrKSwgOTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW0uaCBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2 aXZfZ2VtLmgKaW5kZXggOThlNjBkZjg4MmI2Li42MzY4OGU2ZTQ1ODAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ2VtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2V0bmF2aXYvZXRuYXZpdl9nZW0uaApAQCAtODAsOSArODAsNiBAQCBzdHJ1Y3QgZXRuYXZpdl9n ZW1fc3VibWl0X2JvIHsKIAl1NjQgdmE7CiAJc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqb2Jq OwogCXN0cnVjdCBldG5hdml2X3ZyYW1fbWFwcGluZyAqbWFwcGluZzsKLQlzdHJ1Y3QgZG1hX2Zl bmNlICpleGNsOwotCXVuc2lnbmVkIGludCBucl9zaGFyZWQ7Ci0Jc3RydWN0IGRtYV9mZW5jZSAq KnNoYXJlZDsKIH07CiAKIC8qIENyZWF0ZWQgcGVyIHN1Ym1pdC1pb2N0bCwgdG8gdHJhY2sgYm8n cyBhbmQgY21kc3RyZWFtIGJ1ZnMsIGV0YywKQEAgLTk1LDcgKzkyLDcgQEAgc3RydWN0IGV0bmF2 aXZfZ2VtX3N1Ym1pdCB7CiAJc3RydWN0IGV0bmF2aXZfZmlsZV9wcml2YXRlICpjdHg7CiAJc3Ry dWN0IGV0bmF2aXZfZ3B1ICpncHU7CiAJc3RydWN0IGV0bmF2aXZfaW9tbXVfY29udGV4dCAqbW11 X2NvbnRleHQsICpwcmV2X21tdV9jb250ZXh0OwotCXN0cnVjdCBkbWFfZmVuY2UgKm91dF9mZW5j ZSwgKmluX2ZlbmNlOworCXN0cnVjdCBkbWFfZmVuY2UgKm91dF9mZW5jZTsKIAlpbnQgb3V0X2Zl bmNlX2lkOwogCXN0cnVjdCBsaXN0X2hlYWQgbm9kZTsgLyogR1BVIGFjdGl2ZSBzdWJtaXQgbGlz dCAqLwogCXN0cnVjdCBldG5hdml2X2NtZGJ1ZiBjbWRidWY7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbV9zdWJtaXQuYyBiL2RyaXZlcnMvZ3B1L2RybS9l dG5hdml2L2V0bmF2aXZfZ2VtX3N1Ym1pdC5jCmluZGV4IDRkZDdkOWQ1NDFjMC4uNWI5N2NlMTI5 OWFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbV9zdWJt aXQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbV9zdWJtaXQuYwpA QCAtMTg4LDE2ICsxODgsMTAgQEAgc3RhdGljIGludCBzdWJtaXRfZmVuY2Vfc3luYyhzdHJ1Y3Qg ZXRuYXZpdl9nZW1fc3VibWl0ICpzdWJtaXQpCiAJCWlmIChzdWJtaXQtPmZsYWdzICYgRVROQV9T VUJNSVRfTk9fSU1QTElDSVQpCiAJCQljb250aW51ZTsKIAotCQlpZiAoYm8tPmZsYWdzICYgRVRO QV9TVUJNSVRfQk9fV1JJVEUpIHsKLQkJCXJldCA9IGRtYV9yZXN2X2dldF9mZW5jZXMocm9iaiwg JmJvLT5leGNsLAotCQkJCQkJICAmYm8tPm5yX3NoYXJlZCwKLQkJCQkJCSAgJmJvLT5zaGFyZWQp OwotCQkJaWYgKHJldCkKLQkJCQlyZXR1cm4gcmV0OwotCQl9IGVsc2UgewotCQkJYm8tPmV4Y2wg PSBkbWFfcmVzdl9nZXRfZXhjbF91bmxvY2tlZChyb2JqKTsKLQkJfQotCisJCXJldCA9IGRybV9z Y2hlZF9qb2JfYXdhaXRfaW1wbGljaXQoJnN1Ym1pdC0+c2NoZWRfam9iLCAmYm8tPm9iai0+YmFz ZSwKKwkJCQkJCSAgIGJvLT5mbGFncyAmIEVUTkFfU1VCTUlUX0JPX1dSSVRFKTsKKwkJaWYgKHJl dCkKKwkJCXJldHVybiByZXQ7CiAJfQogCiAJcmV0dXJuIHJldDsKQEAgLTQwMyw4ICszOTcsNiBA QCBzdGF0aWMgdm9pZCBzdWJtaXRfY2xlYW51cChzdHJ1Y3Qga3JlZiAqa3JlZikKIAogCXdha2Vf dXBfYWxsKCZzdWJtaXQtPmdwdS0+ZmVuY2VfZXZlbnQpOwogCi0JaWYgKHN1Ym1pdC0+aW5fZmVu Y2UpCi0JCWRtYV9mZW5jZV9wdXQoc3VibWl0LT5pbl9mZW5jZSk7CiAJaWYgKHN1Ym1pdC0+b3V0 X2ZlbmNlKSB7CiAJCS8qIGZpcnN0IHJlbW92ZSBmcm9tIElEUiwgc28gZmVuY2UgY2FuIG5vdCBi ZSBmb3VuZCBhbnltb3JlICovCiAJCW11dGV4X2xvY2soJnN1Ym1pdC0+Z3B1LT5mZW5jZV9sb2Nr KTsKQEAgLTUyOSw3ICs1MjEsNyBAQCBpbnQgZXRuYXZpdl9pb2N0bF9nZW1fc3VibWl0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0ID0gZXRuYXZpdl9jbWRidWZfaW5p dChwcml2LT5jbWRidWZfc3ViYWxsb2MsICZzdWJtaXQtPmNtZGJ1ZiwKIAkJCQkgIEFMSUdOKGFy Z3MtPnN0cmVhbV9zaXplLCA4KSArIDgpOwogCWlmIChyZXQpCi0JCWdvdG8gZXJyX3N1Ym1pdF9v YmplY3RzOworCQlnb3RvIGVycl9zdWJtaXRfcHV0OwogCiAJc3VibWl0LT5jdHggPSBmaWxlLT5k cml2ZXJfcHJpdjsKIAlldG5hdml2X2lvbW11X2NvbnRleHRfZ2V0KHN1Ym1pdC0+Y3R4LT5tbXUp OwpAQCAtNTM3LDUxICs1MjksNjEgQEAgaW50IGV0bmF2aXZfaW9jdGxfZ2VtX3N1Ym1pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCXN1Ym1pdC0+ZXhlY19zdGF0ZSA9IGFy Z3MtPmV4ZWNfc3RhdGU7CiAJc3VibWl0LT5mbGFncyA9IGFyZ3MtPmZsYWdzOwogCisJcmV0ID0g ZHJtX3NjaGVkX2pvYl9pbml0KCZzdWJtaXQtPnNjaGVkX2pvYiwKKwkJCQkgJmN0eC0+c2NoZWRf ZW50aXR5W2FyZ3MtPnBpcGVdLAorCQkJCSBzdWJtaXQtPmN0eCk7CisJaWYgKHJldCkKKwkJZ290 byBlcnJfc3VibWl0X3B1dDsKKwogCXJldCA9IHN1Ym1pdF9sb29rdXBfb2JqZWN0cyhzdWJtaXQs IGZpbGUsIGJvcywgYXJncy0+bnJfYm9zKTsKIAlpZiAocmV0KQotCQlnb3RvIGVycl9zdWJtaXRf b2JqZWN0czsKKwkJZ290byBlcnJfc3VibWl0X2pvYjsKIAogCWlmICgocHJpdi0+bW11X2dsb2Jh bC0+dmVyc2lvbiAhPSBFVE5BVklWX0lPTU1VX1YyKSAmJgogCSAgICAhZXRuYXZpdl9jbWRfdmFs aWRhdGVfb25lKGdwdSwgc3RyZWFtLCBhcmdzLT5zdHJlYW1fc2l6ZSAvIDQsCiAJCQkJICAgICAg cmVsb2NzLCBhcmdzLT5ucl9yZWxvY3MpKSB7CiAJCXJldCA9IC1FSU5WQUw7Ci0JCWdvdG8gZXJy X3N1Ym1pdF9vYmplY3RzOworCQlnb3RvIGVycl9zdWJtaXRfam9iOwogCX0KIAogCWlmIChhcmdz LT5mbGFncyAmIEVUTkFfU1VCTUlUX0ZFTkNFX0ZEX0lOKSB7Ci0JCXN1Ym1pdC0+aW5fZmVuY2Ug PSBzeW5jX2ZpbGVfZ2V0X2ZlbmNlKGFyZ3MtPmZlbmNlX2ZkKTsKLQkJaWYgKCFzdWJtaXQtPmlu X2ZlbmNlKSB7CisJCXN0cnVjdCBkbWFfZmVuY2UgKmluX2ZlbmNlID0gc3luY19maWxlX2dldF9m ZW5jZShhcmdzLT5mZW5jZV9mZCk7CisJCWlmICghaW5fZmVuY2UpIHsKIAkJCXJldCA9IC1FSU5W QUw7Ci0JCQlnb3RvIGVycl9zdWJtaXRfb2JqZWN0czsKKwkJCWdvdG8gZXJyX3N1Ym1pdF9qb2I7 CiAJCX0KKworCQlyZXQgPSBkcm1fc2NoZWRfam9iX2F3YWl0X2ZlbmNlKCZzdWJtaXQtPnNjaGVk X2pvYiwgaW5fZmVuY2UpOworCQlpZiAocmV0KQorCQkJZ290byBlcnJfc3VibWl0X2pvYjsKIAl9 CiAKIAlyZXQgPSBzdWJtaXRfcGluX29iamVjdHMoc3VibWl0KTsKIAlpZiAocmV0KQotCQlnb3Rv IGVycl9zdWJtaXRfb2JqZWN0czsKKwkJZ290byBlcnJfc3VibWl0X2pvYjsKIAogCXJldCA9IHN1 Ym1pdF9yZWxvYyhzdWJtaXQsIHN0cmVhbSwgYXJncy0+c3RyZWFtX3NpemUgLyA0LAogCQkJICAg cmVsb2NzLCBhcmdzLT5ucl9yZWxvY3MpOwogCWlmIChyZXQpCi0JCWdvdG8gZXJyX3N1Ym1pdF9v YmplY3RzOworCQlnb3RvIGVycl9zdWJtaXRfam9iOwogCiAJcmV0ID0gc3VibWl0X3BlcmZtb25f dmFsaWRhdGUoc3VibWl0LCBhcmdzLT5leGVjX3N0YXRlLCBwbXJzKTsKIAlpZiAocmV0KQotCQln b3RvIGVycl9zdWJtaXRfb2JqZWN0czsKKwkJZ290byBlcnJfc3VibWl0X2pvYjsKIAogCW1lbWNw eShzdWJtaXQtPmNtZGJ1Zi52YWRkciwgc3RyZWFtLCBhcmdzLT5zdHJlYW1fc2l6ZSk7CiAKIAly ZXQgPSBzdWJtaXRfbG9ja19vYmplY3RzKHN1Ym1pdCwgJnRpY2tldCk7CiAJaWYgKHJldCkKLQkJ Z290byBlcnJfc3VibWl0X29iamVjdHM7CisJCWdvdG8gZXJyX3N1Ym1pdF9qb2I7CiAKIAlyZXQg PSBzdWJtaXRfZmVuY2Vfc3luYyhzdWJtaXQpOwogCWlmIChyZXQpCi0JCWdvdG8gZXJyX3N1Ym1p dF9vYmplY3RzOworCQlnb3RvIGVycl9zdWJtaXRfam9iOwogCi0JcmV0ID0gZXRuYXZpdl9zY2hl ZF9wdXNoX2pvYigmY3R4LT5zY2hlZF9lbnRpdHlbYXJncy0+cGlwZV0sIHN1Ym1pdCk7CisJcmV0 ID0gZXRuYXZpdl9zY2hlZF9wdXNoX2pvYihzdWJtaXQpOwogCWlmIChyZXQpCi0JCWdvdG8gZXJy X3N1Ym1pdF9vYmplY3RzOworCQlnb3RvIGVycl9zdWJtaXRfam9iOwogCiAJc3VibWl0X2F0dGFj aF9vYmplY3RfZmVuY2VzKHN1Ym1pdCk7CiAKQEAgLTU5NSw3ICs1OTcsNyBAQCBpbnQgZXRuYXZp dl9pb2N0bF9nZW1fc3VibWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJ CXN5bmNfZmlsZSA9IHN5bmNfZmlsZV9jcmVhdGUoc3VibWl0LT5vdXRfZmVuY2UpOwogCQlpZiAo IXN5bmNfZmlsZSkgewogCQkJcmV0ID0gLUVOT01FTTsKLQkJCWdvdG8gZXJyX3N1Ym1pdF9vYmpl Y3RzOworCQkJZ290byBlcnJfc3VibWl0X2pvYjsKIAkJfQogCQlmZF9pbnN0YWxsKG91dF9mZW5j ZV9mZCwgc3luY19maWxlLT5maWxlKTsKIAl9CkBAIC02MDMsNyArNjA1LDkgQEAgaW50IGV0bmF2 aXZfaW9jdGxfZ2VtX3N1Ym1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAog CWFyZ3MtPmZlbmNlX2ZkID0gb3V0X2ZlbmNlX2ZkOwogCWFyZ3MtPmZlbmNlID0gc3VibWl0LT5v dXRfZmVuY2VfaWQ7CiAKLWVycl9zdWJtaXRfb2JqZWN0czoKK2Vycl9zdWJtaXRfam9iOgorCWRy bV9zY2hlZF9qb2JfY2xlYW51cCgmc3VibWl0LT5zY2hlZF9qb2IpOworZXJyX3N1Ym1pdF9wdXQ6 CiAJZXRuYXZpdl9zdWJtaXRfcHV0KHN1Ym1pdCk7CiAKIGVycl9zdWJtaXRfd3dfYWNxdWlyZToK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfc2NoZWQuYyBiL2Ry aXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfc2NoZWQuYwppbmRleCAxODBiYjYzM2Q1YzUu LjJiYmJkNmNjYzk1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZp dl9zY2hlZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfc2NoZWQuYwpA QCAtMTcsNTggKzE3LDYgQEAgbW9kdWxlX3BhcmFtX25hbWVkKGpvYl9oYW5nX2xpbWl0LCBldG5h dml2X2pvYl9oYW5nX2xpbWl0LCBpbnQgLCAwNDQ0KTsKIHN0YXRpYyBpbnQgZXRuYXZpdl9od19q b2JzX2xpbWl0ID0gNDsKIG1vZHVsZV9wYXJhbV9uYW1lZChod19qb2JfbGltaXQsIGV0bmF2aXZf aHdfam9ic19saW1pdCwgaW50ICwgMDQ0NCk7CiAKLXN0YXRpYyBzdHJ1Y3QgZG1hX2ZlbmNlICoK LWV0bmF2aXZfc2NoZWRfZGVwZW5kZW5jeShzdHJ1Y3QgZHJtX3NjaGVkX2pvYiAqc2NoZWRfam9i LAotCQkJIHN0cnVjdCBkcm1fc2NoZWRfZW50aXR5ICplbnRpdHkpCi17Ci0Jc3RydWN0IGV0bmF2 aXZfZ2VtX3N1Ym1pdCAqc3VibWl0ID0gdG9fZXRuYXZpdl9zdWJtaXQoc2NoZWRfam9iKTsKLQlz dHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKLQlpbnQgaTsKLQotCWlmICh1bmxpa2VseShzdWJtaXQt PmluX2ZlbmNlKSkgewotCQlmZW5jZSA9IHN1Ym1pdC0+aW5fZmVuY2U7Ci0JCXN1Ym1pdC0+aW5f ZmVuY2UgPSBOVUxMOwotCi0JCWlmICghZG1hX2ZlbmNlX2lzX3NpZ25hbGVkKGZlbmNlKSkKLQkJ CXJldHVybiBmZW5jZTsKLQotCQlkbWFfZmVuY2VfcHV0KGZlbmNlKTsKLQl9Ci0KLQlmb3IgKGkg PSAwOyBpIDwgc3VibWl0LT5ucl9ib3M7IGkrKykgewotCQlzdHJ1Y3QgZXRuYXZpdl9nZW1fc3Vi bWl0X2JvICpibyA9ICZzdWJtaXQtPmJvc1tpXTsKLQkJaW50IGo7Ci0KLQkJaWYgKGJvLT5leGNs KSB7Ci0JCQlmZW5jZSA9IGJvLT5leGNsOwotCQkJYm8tPmV4Y2wgPSBOVUxMOwotCi0JCQlpZiAo IWRtYV9mZW5jZV9pc19zaWduYWxlZChmZW5jZSkpCi0JCQkJcmV0dXJuIGZlbmNlOwotCi0JCQlk bWFfZmVuY2VfcHV0KGZlbmNlKTsKLQkJfQotCi0JCWZvciAoaiA9IDA7IGogPCBiby0+bnJfc2hh cmVkOyBqKyspIHsKLQkJCWlmICghYm8tPnNoYXJlZFtqXSkKLQkJCQljb250aW51ZTsKLQotCQkJ ZmVuY2UgPSBiby0+c2hhcmVkW2pdOwotCQkJYm8tPnNoYXJlZFtqXSA9IE5VTEw7Ci0KLQkJCWlm ICghZG1hX2ZlbmNlX2lzX3NpZ25hbGVkKGZlbmNlKSkKLQkJCQlyZXR1cm4gZmVuY2U7Ci0KLQkJ CWRtYV9mZW5jZV9wdXQoZmVuY2UpOwotCQl9Ci0JCWtmcmVlKGJvLT5zaGFyZWQpOwotCQliby0+ bnJfc2hhcmVkID0gMDsKLQkJYm8tPnNoYXJlZCA9IE5VTEw7Ci0JfQotCi0JcmV0dXJuIE5VTEw7 Ci19Ci0KIHN0YXRpYyBzdHJ1Y3QgZG1hX2ZlbmNlICpldG5hdml2X3NjaGVkX3J1bl9qb2Ioc3Ry dWN0IGRybV9zY2hlZF9qb2IgKnNjaGVkX2pvYikKIHsKIAlzdHJ1Y3QgZXRuYXZpdl9nZW1fc3Vi bWl0ICpzdWJtaXQgPSB0b19ldG5hdml2X3N1Ym1pdChzY2hlZF9qb2IpOwpAQCAtMTQwLDI5ICs4 OCwyMiBAQCBzdGF0aWMgdm9pZCBldG5hdml2X3NjaGVkX2ZyZWVfam9iKHN0cnVjdCBkcm1fc2No ZWRfam9iICpzY2hlZF9qb2IpCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3NjaGVkX2Jh Y2tlbmRfb3BzIGV0bmF2aXZfc2NoZWRfb3BzID0gewotCS5kZXBlbmRlbmN5ID0gZXRuYXZpdl9z Y2hlZF9kZXBlbmRlbmN5LAogCS5ydW5fam9iID0gZXRuYXZpdl9zY2hlZF9ydW5fam9iLAogCS50 aW1lZG91dF9qb2IgPSBldG5hdml2X3NjaGVkX3RpbWVkb3V0X2pvYiwKIAkuZnJlZV9qb2IgPSBl dG5hdml2X3NjaGVkX2ZyZWVfam9iLAogfTsKIAotaW50IGV0bmF2aXZfc2NoZWRfcHVzaF9qb2Io c3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKnNjaGVkX2VudGl0eSwKLQkJCSAgIHN0cnVjdCBldG5h dml2X2dlbV9zdWJtaXQgKnN1Ym1pdCkKK2ludCBldG5hdml2X3NjaGVkX3B1c2hfam9iKHN0cnVj dCBldG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdCkKIHsKIAlpbnQgcmV0ID0gMDsKIAogCS8qCiAJ ICogSG9sZCB0aGUgZmVuY2UgbG9jayBhY3Jvc3MgdGhlIHdob2xlIG9wZXJhdGlvbiB0byBhdm9p ZCBqb2JzIGJlaW5nCiAJICogcHVzaGVkIG91dCBvZiBvcmRlciB3aXRoIHJlZ2FyZCB0byB0aGVp ciBzY2hlZCBmZW5jZSBzZXFub3MgYXMKLQkgKiBhbGxvY2F0ZWQgaW4gZHJtX3NjaGVkX2pvYl9p bml0LgorCSAqIGFsbG9jYXRlZCBpbiBkcm1fc2NoZWRfam9iX2FybS4KIAkgKi8KIAltdXRleF9s b2NrKCZzdWJtaXQtPmdwdS0+ZmVuY2VfbG9jayk7CiAKLQlyZXQgPSBkcm1fc2NoZWRfam9iX2lu aXQoJnN1Ym1pdC0+c2NoZWRfam9iLCBzY2hlZF9lbnRpdHksCi0JCQkJIHN1Ym1pdC0+Y3R4KTsK LQlpZiAocmV0KQotCQlnb3RvIG91dF91bmxvY2s7Ci0KIAlkcm1fc2NoZWRfam9iX2FybSgmc3Vi bWl0LT5zY2hlZF9qb2IpOwogCiAJc3VibWl0LT5vdXRfZmVuY2UgPSBkbWFfZmVuY2VfZ2V0KCZz dWJtaXQtPnNjaGVkX2pvYi5zX2ZlbmNlLT5maW5pc2hlZCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X3NjaGVkLmggYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZp di9ldG5hdml2X3NjaGVkLmgKaW5kZXggYzBhNjc5NmUyMmM5Li5iYWViZmEwNjlhZmMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfc2NoZWQuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X3NjaGVkLmgKQEAgLTE4LDcgKzE4LDYgQEAgc3Ry dWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqdG9fZXRuYXZpdl9zdWJtaXQoc3RydWN0IGRybV9zY2hl ZF9qb2IgKnNjaGVkX2pvYikKIAogaW50IGV0bmF2aXZfc2NoZWRfaW5pdChzdHJ1Y3QgZXRuYXZp dl9ncHUgKmdwdSk7CiB2b2lkIGV0bmF2aXZfc2NoZWRfZmluaShzdHJ1Y3QgZXRuYXZpdl9ncHUg KmdwdSk7Ci1pbnQgZXRuYXZpdl9zY2hlZF9wdXNoX2pvYihzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0 eSAqc2NoZWRfZW50aXR5LAotCQkJICAgc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3VibWl0 KTsKK2ludCBldG5hdml2X3NjaGVkX3B1c2hfam9iKHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQg KnN1Ym1pdCk7CiAKICNlbmRpZiAvKiBfX0VUTkFWSVZfU0NIRURfSF9fICovCi0tIAoyLjMyLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=