From patchwork Tue Apr 23 23:20:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162747 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354703jan; Tue, 23 Apr 2019 16:21:15 -0700 (PDT) X-Received: by 2002:a63:d349:: with SMTP id u9mr25916575pgi.83.1556061675295; Tue, 23 Apr 2019 16:21:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061675; cv=none; d=google.com; s=arc-20160816; b=I8GUQArFGu8j9Df09EKc5NfZPYNNE4B5t/rBjgWd6d858LAOxDYvHwPXwx+4bOB/s+ NPDk4pp6nzwIo1Ry4ePc9DvU4OTe8VOsOKB2cxi2Xwqb8kYZKkKpBE92iHhx+3jyqKwY ONk7bsEgiX2rNmZEq+33U8XZCkCL8FelVeOWKzJi0iiMM+qH1Myr1waE9QvoNw08jmEU 9ZgHxk7ucnNwjd9VtMf0Z+vygvIZ/DmWAjrM7l2gadbNHTUoxFih5+8hZEWAGwiTTxb5 WxtgIGM50lTLwKkVLN+sm/yO1s0XtpMidagCsoZDJMy2J5A/NvlKoEF4UydRL6xr0Xtg JscQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xTm116jbzqBEXo1zbyHHVrRjnaN2HZMnf5sPll9zTbw=; b=E3hA3s5qtTqLeWcfMkTCJ5NrKQBFyruxSrru8UGmk/1/CYWasLezpD94OHCCKItDtd fw8MFgV2AMT+EfD+kmRs+ozm1UiyYmBhxJ7bSp3fTroAT87qT/icVm2LdZB6wXA8XJqO hqvzvnphkld20UAPS8/sOKbtcuywdQBqkLu7FLTHu0ZohF+6BP6bl9MN8UfI6OJAX/Fk 9Mw/7sSva0OlHz34gG3EfeT3fQ++mS5fOUBeHDyqpbLxElXasakuLKWUHUgfu44uMXd3 LNlDA2UR0FhFidqNZD2NebGDrKclbi0lMoT2RAd5NmzTA8z1rJYJts58X/yJuPeL0P9M qKzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iQmaSI6q; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w10sor14757105plz.54.2019.04.23.16.21.15 for (Google Transport Security); Tue, 23 Apr 2019 16:21:15 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iQmaSI6q; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=b8m9L3hYnmxNbg181oCUYNyakSBrrNoUbQaGrocPk2Uc+P9tX+Nv/G2PO2Fc/8noJB V+Tia02ypqPWmGZGNciawequqERrYrV4Co7NQnWVV9SovqstIfnB0eP/7pK8WTbzuCcV LzVm6hInPfuemct5rqDZXJSQOLMIFurfoehRA7KdTZT8C5hUisQNRSDdSKRyjUNojGBA crJmHGcA9PmPO5pGWXvBXJxM5dLcs01BZih3YZMlPXzx6+N9Clq0LzyOnMdZFv4y4zXq 4XH3HDOynvE0GrCWR/Oua9tpTtC6lWi/jAkyJZMRRi8OG/10oB8kby5jqYaxVppBozEJ wH7A== X-Gm-Message-State: APjAAAXx9v+LPFcutcg2X9OCJXlpweR1vJAJC49k4LpwL9Ghrls1TwlB H5HQf63k5SRMN7oPOxxcqXXKz7Ed 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) Return-Path: 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> 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(-) -- 2.7.4 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; }