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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 34911C47420 for ; Wed, 30 Sep 2020 21:16:20 +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 EB6302071E for ; Wed, 30 Sep 2020 21:16:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cCQpDwdZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB6302071E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 2ED8F6E82B; Wed, 30 Sep 2020 21:16:18 +0000 (UTC) Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id CEAF76E82A for ; Wed, 30 Sep 2020 21:16:16 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id k8so2187172pfk.2 for ; Wed, 30 Sep 2020 14:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZcEhH3LkJwJxm1/YqfDogAmQdhcYfaMPXbiNt/rTvIg=; b=cCQpDwdZb0pK722MSI5vjiBihKBpkBYoKbO9i9WYCp65PrcPU0SZJt/3DyayvVaYsJ zfjL3bYcgY48wx/138a6xBdmhUSBFkbtA6YRCIBL3/i7plw3nGxmSZNirfsfyUJ3NUgD clTIPjDvPeI94WZhyTANXSWFUU6DE+KLXk3hsbrUA1JrRivzv0fKsgNI5CIO0FiTHAfo VTuS0Vi34MlydR5o31Zl4B2Ou46i9225PQtDhUR1R8wFC87kWMN/q5lhOotBIiz+lMdk 24Dwt7vy63yhY5gOgFA8f2qCqGlelgmvkBvbyHj8os4I14vWsBjzdFkJFxH+P1orQ/Wz 089g== 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=ZcEhH3LkJwJxm1/YqfDogAmQdhcYfaMPXbiNt/rTvIg=; b=grdJ7L6XC5uz3IH4Yn7D5vA82rvT06bPuRLhqseMsJXScPP1L0DzHgIunIID7Cxkjg 1atwhxZ6LmZYUHVfV2L3s4QSc1LXkx4hMuL5F+t3WfS+kFffRYZItUmS7cmeml4mNuMP S3JJFU1DLjBnX6o1JQ3A+rSFM40l/I43xwLmhzKTaZUkz5T/fndLWWqCMZsAgmQTbzPL U11yFG4rvUayJWDU7oNervosPRSUVrpKN4gnYM4FObpdv2yUJfFJ70+8Sdh/VHmd+uF/ f35fD8PqWh4y6CBkXHUcnNdf+SbBSnZ+Z9/5MhFUzR0F25Uffe/Rs8UTs0ysRnGiD/RR IsKg== X-Gm-Message-State: AOAM530fVVa9tHjMBMptNvswLTIBY4C3N1MTxtWa3k7ZYuMDmWJyAVIc B9XYRA2sdbvQIoWwwT1jWz1uMIIvUN8= X-Google-Smtp-Source: ABdhPJxD11GEuDlHb0wKRQjVyEr8sh2uooNCpmemjI0OxxWDrhF/698+aqsFJ+xX8mM5791oIxfpYw== X-Received: by 2002:aa7:939b:0:b029:142:2501:35f1 with SMTP id t27-20020aa7939b0000b0290142250135f1mr4294458pfe.81.1601500575753; Wed, 30 Sep 2020 14:16:15 -0700 (PDT) Received: from localhost ([2601:1c0:5200:a6:307:a401:7b76:c6e5]) by smtp.gmail.com with ESMTPSA id a2sm3467427pfk.201.2020.09.30.14.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 14:16:14 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/3] drm/atomic: Use kthread worker for nonblocking commits Date: Wed, 30 Sep 2020 14:17:21 -0700 Message-Id: <20200930211723.3028059-3-robdclark@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200930211723.3028059-1-robdclark@gmail.com> References: <20200930211723.3028059-1-robdclark@gmail.com> MIME-Version: 1.0 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: Rob Clark , Thomas Zimmermann , David Airlie , linux-arm-msm@vger.kernel.org, open list , timmurray@google.com, Tejun Heo , Qais Yousef Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark This will allow us to more easily switch scheduling rules based on what userspace wants. Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 13 ++++++++---- include/drm/drm_atomic.h | 31 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9e1ad493e689..75eeec5e7b10 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1659,11 +1659,11 @@ static void commit_tail(struct drm_atomic_state *old_state) drm_atomic_state_put(old_state); } -static void commit_work(struct work_struct *work) +static void commit_work(struct kthread_work *work) { struct drm_atomic_state *state = container_of(work, struct drm_atomic_state, - commit_work); + commit_kwork); commit_tail(state); } @@ -1797,6 +1797,7 @@ int drm_atomic_helper_commit(struct drm_device *dev, struct drm_atomic_state *state, bool nonblock) { + struct kthread_worker *worker = NULL; int ret; if (state->async_update) { @@ -1814,7 +1815,7 @@ int drm_atomic_helper_commit(struct drm_device *dev, if (ret) return ret; - INIT_WORK(&state->commit_work, commit_work); + kthread_init_work(&state->commit_kwork, commit_work); ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) @@ -1857,8 +1858,12 @@ int drm_atomic_helper_commit(struct drm_device *dev, */ drm_atomic_state_get(state); + if (nonblock) - queue_work(system_unbound_wq, &state->commit_work); + worker = drm_atomic_pick_worker(state); + + if (worker) + kthread_queue_work(worker, &state->commit_kwork); else commit_tail(state); diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index d07c851d255b..8d0ee19953df 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -373,8 +373,18 @@ struct drm_atomic_state { * * Work item which can be used by the driver or helpers to execute the * commit without blocking. + * + * This is deprecated, use commit_kwork. */ struct work_struct commit_work; + + /** + * @commit_kwork: + * + * Work item which can be used by the driver or helpers to execute the + * commit without blocking. + */ + struct kthread_work commit_kwork; }; void __drm_crtc_commit_free(struct kref *kref); @@ -954,6 +964,27 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p); (new_obj_state) = (__state)->private_objs[__i].new_state, 1); \ (__i)++) +/** + * drm_atomic_pick_worker - helper to get kworker to use for nonblocking commit + * @state: the &drm_atomic_state for the commit + * + * Pick an appropriate worker for a given atomic update. The first CRTC + * invovled in the atomic update is used to pick the worker, to prevent + * serializing multiple pageflips / atomic-updates on indenpendent CRTCs. + */ +static inline struct kthread_worker * +drm_atomic_pick_worker(const struct drm_atomic_state *state) +{ + struct drm_crtc_state *crtc_state; + struct drm_crtc *crtc; + unsigned i; + + for_each_new_crtc_in_state(state, crtc, crtc_state, i) + return crtc->worker; + + return NULL; +} + /** * drm_atomic_crtc_needs_modeset - compute combined modeset need * @state: &drm_crtc_state for the CRTC -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel