From patchwork Thu Aug 1 03:44:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170290 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836170ile; Wed, 31 Jul 2019 20:45:02 -0700 (PDT) X-Received: by 2002:a17:90a:c588:: with SMTP id l8mr6221666pjt.16.1564631102774; Wed, 31 Jul 2019 20:45:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631102; cv=none; d=google.com; s=arc-20160816; b=fY0mX2w/F6VNvIZ4jSWiBUSG/vKtFnTSsTzhIU+ScGZaoCo+DPojIAkBrivXPZXpTE /qy24yepOLVs4R9nODkwe3UPiv1MmiwWoOrADCL0F/PQRleqcgeBlZWmo13P7ou2Ts2Z tyjp6fjw+MCJqJ1GDUPHEhJoTmSesXLBWfaiswmIughMS7rlH1EQ/62KUvDyrdQz4/2a ik+JA9+UmKUPv3SEzPcSAvuoQvGZmtT9P/eEQz3x45Xo7rNMecXqTjFsXqzZ+iBT6bv2 T7Vqd7yzOzCgzwcJfsXpT2rhDr2NaXNuBP8PbHjc60Ee64FXYpHPLJ91GYe0FKgb0+8w RK7g== 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=F6mhNt9xKY3uV6IZqhaRNS+0qqJSN5zpoSD/eavy3uU=; b=ksq6+H3AmZIi7Vsw5Z6903t1ReZIe1rR53QKyPJ4QdTj8H/gMVZUZ6LJ3qM1plBA0f 5D3pBm0mW4UjPJKkfN+1AumbJEo0FCI5yWFCSm2JniPXhYK8YxonauAob58eF3YHXGFP nxLx+S3+DKpCfcJrNGlYDt0TNYccy8zm/wNh3EmxiRA2s7O6UV5keyQBZ34gSiqzywJz E5IHsd6NWDrDd2x0oi7hye9wFiUHqe9MCY/PuYls3XCY5pRjcUfVjMehGk7NkTxHpwsk 4EFj4K9ZDv1H5D09/6qE/cluSqoEyCHVrQ4afgrj2eMuV/I/OEDt18cHlfd0klG+m22X UAnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vEzEX4JH; 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 a3sor51357661pfo.61.2019.07.31.20.45.02 for (Google Transport Security); Wed, 31 Jul 2019 20:45:02 -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=vEzEX4JH; 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=F6mhNt9xKY3uV6IZqhaRNS+0qqJSN5zpoSD/eavy3uU=; b=vEzEX4JHVuUi5sYWo6MR1DLYLnODyR9Lkq+GuIce+gy0uur0/q7RL3aqHaX60sB2QY e0vT1vQfQB3bxmbNeWqNTHaoJxk/z/Mr567FQbh3EVVuekusAb0zloFF5PbR8W8/f1uW G8vwxvMZtt2GoBiEwTUHQ5U6UJTEfwa98UVB8mimPQphNKA4h6Fio4aEHXmUgz+/Gx8H yoQjKUIehHdbRSvgLX5jcXqYYRfqE88vbn8IHAe3WQXjHUurf1B4FRZUOhc7Y4DSl+lW 86BsFdYSqDfLWQe1fr/jA1WUeGK+v+9v8IfI8BJMI741YvdP+y+A9a63vDkGZjWePEWh 94vw== 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=F6mhNt9xKY3uV6IZqhaRNS+0qqJSN5zpoSD/eavy3uU=; b=jH/LSZNIQjhy85kTENrOAIWCOccYWE1ZSFuMb7Mf+Zpv3oLXyvmQ2Adx7uPVEvVxw4 lokoFgjVVV9yGjXhs5/9CKRw55ieP2KE8VfavxEIU3wouxuAuKdNbTjMOdH8iSFYjTCb wS9PM2oak+uWUWaDw/mA3SXXmxcc8uN70TnbZ5TwatGijEu3Itj0Q5ZcLaMalTwozWYS tAJSLX4L+eQLGiQm1R2IoDRLQ/IGQyG8kJcZsIdUSGRLuIOfyweWeK8v1LJi03MMvMc4 uap8wxoxhi5rXABPlq+BjsmITpMdsmdZOnvNBTzjVkuydZPOOD/+IRZzOD5eFGGn1ssY rj7Q== X-Gm-Message-State: APjAAAXFJ4CzKAA9QZREYg6Ztl8kou02ghRI6ncLEKb05UbfFqQdpFqq +XNHmzxiQL7SB3pr5RZb+ySNuI+p X-Google-Smtp-Source: APXvYqzUf9MX/78dPWJhL5pQmUlIgIXdOyov3muaXgm6GM6xJ64ZGPwiBUJA5inxS8yWFTdCXCsnuw== X-Received: by 2002:aa7:93bb:: with SMTP id x27mr52442349pff.10.1564631102402; Wed, 31 Jul 2019 20:45:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.45.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:01 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v3 11/26] drm: kirin: Move workqueue to ade_hw_ctx structure Date: Thu, 1 Aug 2019 03:44:24 +0000 Message-Id: <20190801034439.98227-12-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-1-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: Rongrong Zou Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 0e0fe1cb945f..ec4857e45b6e 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 display_reset_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 display_reset_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, display_reset_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->display_reset_wq); + schedule_work(&ctx->display_reset_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->display_reset_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->display_reset_wq, drm_underflow_wq); - return 0; }