From patchwork Fri Dec 14 23:57:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeykumar Sankaran X-Patchwork-Id: 10731843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BFECD112C for ; Fri, 14 Dec 2018 23:58:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C47D2D19A for ; Fri, 14 Dec 2018 23:58:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 505242D1D9; Fri, 14 Dec 2018 23:58:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D63722D19A for ; Fri, 14 Dec 2018 23:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727775AbeLNX6G (ORCPT ); Fri, 14 Dec 2018 18:58:06 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36520 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726772AbeLNX6G (ORCPT ); Fri, 14 Dec 2018 18:58:06 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DA547608CB; Fri, 14 Dec 2018 23:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544831884; bh=j7PIt9IWXgmuXAOB/vXkdjHBErVICbB11wF0jIZkeJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmKpYV/M40Vbtg4McUV84VQ4vdAfUOpE+3IR7GnCVOOFKhNUNH/FoWeKQSWubyycK WMSgeOgoSz/MODzKBt46j8WQq+V/fmC9wxEJCzmquFKU0hB9wsM/YO8OPG+pMUGdpA OUUczuNr9Bqc/EtPcJhmKjn7iRUGABzyalMjILd0= Received: from jeykumar-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jsanka@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 90E4B60854; Fri, 14 Dec 2018 23:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544831884; bh=j7PIt9IWXgmuXAOB/vXkdjHBErVICbB11wF0jIZkeJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmKpYV/M40Vbtg4McUV84VQ4vdAfUOpE+3IR7GnCVOOFKhNUNH/FoWeKQSWubyycK WMSgeOgoSz/MODzKBt46j8WQq+V/fmC9wxEJCzmquFKU0hB9wsM/YO8OPG+pMUGdpA OUUczuNr9Bqc/EtPcJhmKjn7iRUGABzyalMjILd0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 90E4B60854 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jsanka@codeaurora.org From: Jeykumar Sankaran To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: Jeykumar Sankaran , seanpaul@chromium.org, robdclark@gmail.com, hoegsberg@google.com, jcrouse@codeaurora.org Subject: [PATCH v5 4/5] drm/msm: clean up display thread Date: Fri, 14 Dec 2018 15:57:54 -0800 Message-Id: <1544831875-32566-4-git-send-email-jsanka@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1544831875-32566-1-git-send-email-jsanka@codeaurora.org> References: <1544831875-32566-1-git-send-email-jsanka@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since there are no clients using these threads, cleaning it up. changes in v2: - switch all the dependent clients to use system wq before removing the disp_threads (Sean Paul) changes in v3: - none changes in v4: - none changes in v5: - Rebase on latest tip with [1] (Sean Paul) [1] https://patchwork.freedesktop.org/patch/255105/ Signed-off-by: Jeykumar Sankaran --- drivers/gpu/drm/msm/msm_drv.c | 43 ++----------------------------------------- drivers/gpu/drm/msm/msm_drv.h | 1 - 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c61ce06..f7cb2c7 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -287,13 +287,8 @@ static int msm_drm_uninit(struct device *dev) kfree(vbl_ev); } - /* clean up display commit/event worker threads */ + /* clean up event worker threads */ for (i = 0; i < priv->num_crtcs; i++) { - if (priv->disp_thread[i].thread) { - kthread_destroy_worker(&priv->disp_thread[i].worker); - priv->disp_thread[i].thread = NULL; - } - if (priv->event_thread[i].thread) { kthread_destroy_worker(&priv->event_thread[i].worker); priv->event_thread[i].thread = NULL; @@ -551,26 +546,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) */ param.sched_priority = 16; for (i = 0; i < priv->num_crtcs; i++) { - - /* initialize display thread */ - priv->disp_thread[i].crtc_id = priv->crtcs[i]->base.id; - kthread_init_worker(&priv->disp_thread[i].worker); - priv->disp_thread[i].dev = ddev; - priv->disp_thread[i].thread = - kthread_run(kthread_worker_fn, - &priv->disp_thread[i].worker, - "crtc_commit:%d", priv->disp_thread[i].crtc_id); - ret = sched_setscheduler(priv->disp_thread[i].thread, - SCHED_FIFO, ¶m); - if (ret) - pr_warn("display thread priority update failed: %d\n", - ret); - - if (IS_ERR(priv->disp_thread[i].thread)) { - DRM_DEV_ERROR(dev, "failed to create crtc_commit kthread\n"); - priv->disp_thread[i].thread = NULL; - } - /* initialize event thread */ priv->event_thread[i].crtc_id = priv->crtcs[i]->base.id; kthread_init_worker(&priv->event_thread[i].worker); @@ -580,13 +555,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) &priv->event_thread[i].worker, "crtc_event:%d", priv->event_thread[i].crtc_id); - /** - * event thread should also run at same priority as disp_thread - * because it is handling frame_done events. A lower priority - * event thread and higher priority disp_thread can causes - * frame_pending counters beyond 2. This can lead to commit - * failure at crtc commit level. - */ ret = sched_setscheduler(priv->event_thread[i].thread, SCHED_FIFO, ¶m); if (ret) @@ -598,16 +566,9 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv->event_thread[i].thread = NULL; } - if ((!priv->disp_thread[i].thread) || - !priv->event_thread[i].thread) { + if (!priv->event_thread[i].thread) { /* clean up previously created threads if any */ for ( ; i >= 0; i--) { - if (priv->disp_thread[i].thread) { - kthread_stop( - priv->disp_thread[i].thread); - priv->disp_thread[i].thread = NULL; - } - if (priv->event_thread[i].thread) { kthread_stop( priv->event_thread[i].thread); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 8fad151..2a30fc4 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -199,7 +199,6 @@ struct msm_drm_private { unsigned int num_crtcs; struct drm_crtc *crtcs[MAX_CRTCS]; - struct msm_drm_thread disp_thread[MAX_CRTCS]; struct msm_drm_thread event_thread[MAX_CRTCS]; unsigned int num_encoders;