From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 10/25] drm: kirin: Move workqueue to ade_hw_ctx structure Date: Tue, 23 Apr 2019 16:20:41 -0700 Message-ID: <1556061656-1733-11-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F98A89740 for ; Tue, 23 Apr 2019 23:21:16 +0000 (UTC) Received: by mail-pl1-x643.google.com with SMTP id w24so8264694plp.2 for ; Tue, 23 Apr 2019 16:21:16 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org VGhlIHdvcmtxdWV1ZSB1c2VkIHRvIHJlc2V0IHRoZSBkaXNwbGF5IHdoZW4gd2UgaGl0IGFuIExE SQp1bmRlcmZsb3cgZXJyb3IgaXMgQURFIHNwZWNpZmljLCBzbyBzaW5jZSB0aGlzIHBhdGNoIHNl cmllcwp3b3JrcyB0byBtYWtlIHRoZSBraXJpbl9jcnRjIHN0cnVjdHVyZSBtb3JlIGdlbmVyaWMs IG1vdmUgdGhlCndvcmtxdWV1ZSB0byB0aGUgYWRlX2h3X2N0eCBzdHJ1Y3R1cmUgaW5zdGVhZC4K CkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KQ2M6IFJvbmdy b25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogWGlud2VpIEtvbmcgPGtvbmcua29u Z3hpbndlaUBoaXNpbGljb24uY29tPgpDYzogQ2hlbiBGZW5nIDxwdWNrLmNoZW5AaGlzaWxpY29u LmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0 ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IGRyaS1kZXZlbCA8ZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZz4KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFy by5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRl LmMgfCAxMiArKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJp bi9raXJpbl9kcm1fYWRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmlu X2RybV9hZGUuYwppbmRleCA5NGRjYWQwLi5mNTRjZjk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwpAQCAtNTIsNiArNTIsNyBAQCBzdHJ1 Y3QgYWRlX2h3X2N0eCB7CiAJc3RydWN0IGNsayAqbWVkaWFfbm9jX2NsazsKIAlzdHJ1Y3QgY2xr ICphZGVfcGl4X2NsazsKIAlzdHJ1Y3QgcmVzZXRfY29udHJvbCAqcmVzZXQ7CisJc3RydWN0IHdv cmtfc3RydWN0IGRybV9kZXZpY2Vfd3E7CiAJYm9vbCBwb3dlcl9vbjsKIAlpbnQgaXJxOwogCkBA IC02MSw3ICs2Miw2IEBAIHN0cnVjdCBhZGVfaHdfY3R4IHsKIHN0cnVjdCBraXJpbl9jcnRjIHsK IAlzdHJ1Y3QgZHJtX2NydGMgYmFzZTsKIAl2b2lkICpod19jdHg7Ci0Jc3RydWN0IHdvcmtfc3Ry dWN0IGRybV9kZXZpY2Vfd3E7CiAJYm9vbCBlbmFibGU7CiB9OwogCkBAIC0zNDksOSArMzQ5LDkg QEAgc3RhdGljIHZvaWQgYWRlX2NydGNfZGlzYWJsZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpj cnRjKQogCiBzdGF0aWMgdm9pZCBkcm1fdW5kZXJmbG93X3dxKHN0cnVjdCB3b3JrX3N0cnVjdCAq d29yaykKIHsKLQlzdHJ1Y3Qga2lyaW5fY3J0YyAqYWNydGMgPSBjb250YWluZXJfb2Yod29yaywg c3RydWN0IGtpcmluX2NydGMsCisJc3RydWN0IGFkZV9od19jdHggKmN0eCA9IGNvbnRhaW5lcl9v Zih3b3JrLCBzdHJ1Y3QgYWRlX2h3X2N0eCwKIAkJCQkJICAgICAgZHJtX2RldmljZV93cSk7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSAoJmFjcnRjLT5iYXNlKS0+ZGV2OworCXN0cnVj dCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gY3R4LT5jcnRjLT5kZXY7CiAJc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlOwogCiAJc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9zdXNwZW5kKGRy bV9kZXYpOwpAQCAtMzYyLDcgKzM2Miw2IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBhZGVfaXJxX2hh bmRsZXIoaW50IGlycSwgdm9pZCAqZGF0YSkKIHsKIAlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0g ZGF0YTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjdHgtPmNydGM7Ci0Jc3RydWN0IGtpcmlu X2NydGMgKmtjcnRjID0gdG9fa2lyaW5fY3J0YyhjcnRjKTsKIAl2b2lkIF9faW9tZW0gKmJhc2Ug PSBjdHgtPmJhc2U7CiAJdTMyIHN0YXR1czsKIApAQCAtMzc5LDcgKzM3OCw3IEBAIHN0YXRpYyBp cnFyZXR1cm5fdCBhZGVfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqZGF0YSkKIAkJYWRlX3Vw ZGF0ZV9iaXRzKGJhc2UgKyBMRElfSU5UX0NMUiwgVU5ERVJGTE9XX0lOVF9FTl9PRlNULAogCQkJ CU1BU0soMSksIDEpOwogCQlEUk1fRVJST1IoIkxESSB1bmRlcmZsb3chIik7Ci0JCXNjaGVkdWxl X3dvcmsoJmtjcnRjLT5kcm1fZGV2aWNlX3dxKTsKKwkJc2NoZWR1bGVfd29yaygmY3R4LT5kcm1f ZGV2aWNlX3dxKTsKIAl9CiAKIAlyZXR1cm4gSVJRX0hBTkRMRUQ7CkBAIC0xMDE2LDYgKzEwMTUs NyBAQCBzdGF0aWMgdm9pZCAqYWRlX2h3X2N0eF9hbGxvYyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl ICpwZGV2LAogCWlmIChyZXQpCiAJCXJldHVybiBFUlJfUFRSKC1FSU8pOwogCisJSU5JVF9XT1JL KCZjdHgtPmRybV9kZXZpY2Vfd3EsIGRybV91bmRlcmZsb3dfd3EpOwogCWN0eC0+Y3J0YyA9IGNy dGM7CiAKIAlyZXR1cm4gY3R4OwpAQCAtMTA3MSw4ICsxMDcxLDYgQEAgc3RhdGljIGludCBhZGVf ZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JSU5JVF9XT1JLKCZrY3J0Yy0+ZHJtX2RldmljZV93cSwgZHJtX3VuZGVyZmxv d193cSk7Ci0KIAlyZXR1cm4gMDsKIH0KIAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 4B669C10F03 for ; Tue, 23 Apr 2019 23:22:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A2B1218EA for ; Tue, 23 Apr 2019 23:22:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iQmaSI6q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728846AbfDWXWn (ORCPT ); Tue, 23 Apr 2019 19:22:43 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:43530 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728823AbfDWXVP (ORCPT ); Tue, 23 Apr 2019 19:21:15 -0400 Received: by mail-pl1-f194.google.com with SMTP id n8so8244110plp.10 for ; Tue, 23 Apr 2019 16:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xTm116jbzqBEXo1zbyHHVrRjnaN2HZMnf5sPll9zTbw=; b=iQmaSI6qMUz6Cmn3MAJaIzmnZjHAJOpl6IiabW5xVfy4iQLZ0Dw5AwDnOCUR4bkap4 LXSb39TrOxCo8f/ADnd/pKEZQEQdHh6WFj14PoTcv8SV0FvZEODFg0uXy/xrn8kXH0en GnFVY12TrHTMDPBQrHToJu7LFzJ3xSRuHCT8s3x+IHpMxkFEcm2rPrAElzrz/WuDMsS6 filnJMkHdg6n3/S0Vn6mnkGlIz8Tva2hPAwy0jS9vyFVfglvxeuHsXYuOKS+v4fWCpwx ul7M4gutNYptU3lCDZviwc3l9UNjf+08FowMjODa6EpbvuFy0jDnfPspn94fKl1NMbEs 5P1A== 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; bh=xTm116jbzqBEXo1zbyHHVrRjnaN2HZMnf5sPll9zTbw=; b=qwXQL6bxHktjhwcWMfiz6GTpPWAhVTbwM4KCK/7a1fV52ScKo2fEIrvtEOBrBTPfPJ eAnHfdIFf1ta6/yHhqzsU5CFOvUgMMFypFshKsk+3jy9QdydaDQlPnmLQtgBZA7zZZA4 FRS9hg3GFiwI5oy4qliME7rxkafFyCcV/spDVam8XQW4S8K7Bbtn4koga2T8BKoOrnkx eBB517uk+ZnrSfsVnkot2a7b3n/6K/TS6Uidbx0a1FbAgZUIf29y5KPgZ2LY0oShKNjH ONJN3WkfbTg3j/sDTKY3D0PDJG+RJ+GEaAN9xGJ5j31lkEqEPslOsdi/W7gOn4m+fEJv JXoQ== X-Gm-Message-State: APjAAAUmMxNc2tMTP6zfT9pu/LAr0DQ6wmwBjJKBJJEzXRBV/pf77zRZ rj4A17Aap7Ox6kRkINeEGAPvPxBBqUA= X-Google-Smtp-Source: APXvYqywTXKIf62IMwvoI+e2f34rybm50ANUcnv+iKH/YohFQP0Xgd9A95IgogAWE4lL9vspQkXEYg== X-Received: by 2002:a17:902:e684:: with SMTP id cn4mr28490956plb.71.1556061674718; Tue, 23 Apr 2019 16:21:14 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:13 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel Subject: [PATCH 10/25] drm: kirin: Move workqueue to ade_hw_ctx structure Date: Tue, 23 Apr 2019 16:20:41 -0700 Message-Id: <1556061656-1733-11-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The workqueue used to reset the display when we hit an LDI underflow error is ADE specific, so since this patch series works to make the kirin_crtc structure more generic, move the workqueue to the ade_hw_ctx structure instead. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 94dcad0..f54cf99 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -52,6 +52,7 @@ struct ade_hw_ctx { struct clk *media_noc_clk; struct clk *ade_pix_clk; struct reset_control *reset; + struct work_struct drm_device_wq; bool power_on; int irq; @@ -61,7 +62,6 @@ struct ade_hw_ctx { struct kirin_crtc { struct drm_crtc base; void *hw_ctx; - struct work_struct drm_device_wq; bool enable; }; @@ -349,9 +349,9 @@ static void ade_crtc_disable_vblank(struct drm_crtc *crtc) static void drm_underflow_wq(struct work_struct *work) { - struct kirin_crtc *acrtc = container_of(work, struct kirin_crtc, + struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx, drm_device_wq); - struct drm_device *drm_dev = (&acrtc->base)->dev; + struct drm_device *drm_dev = ctx->crtc->dev; struct drm_atomic_state *state; state = drm_atomic_helper_suspend(drm_dev); @@ -362,7 +362,6 @@ static irqreturn_t ade_irq_handler(int irq, void *data) { struct ade_hw_ctx *ctx = data; struct drm_crtc *crtc = ctx->crtc; - struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); void __iomem *base = ctx->base; u32 status; @@ -379,7 +378,7 @@ static irqreturn_t ade_irq_handler(int irq, void *data) ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST, MASK(1), 1); DRM_ERROR("LDI underflow!"); - schedule_work(&kcrtc->drm_device_wq); + schedule_work(&ctx->drm_device_wq); } return IRQ_HANDLED; @@ -1016,6 +1015,7 @@ static void *ade_hw_ctx_alloc(struct platform_device *pdev, if (ret) return ERR_PTR(-EIO); + INIT_WORK(&ctx->drm_device_wq, drm_underflow_wq); ctx->crtc = crtc; return ctx; @@ -1071,8 +1071,6 @@ static int ade_drm_init(struct platform_device *pdev) if (ret) return ret; - INIT_WORK(&kcrtc->drm_device_wq, drm_underflow_wq); - return 0; } -- 2.7.4