From patchwork Thu Aug 1 03:44:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170289 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836144ile; Wed, 31 Jul 2019 20:45:01 -0700 (PDT) X-Received: by 2002:a17:90a:f491:: with SMTP id bx17mr6390748pjb.118.1564631101333; Wed, 31 Jul 2019 20:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631101; cv=none; d=google.com; s=arc-20160816; b=C5+V4m6u8MXimRY56k+h8NGjtgXMQrhnIs2y2wlh+yld6ogyc1uM1UEolRnXaO18Fz sO59OGsKLzUmh2tMsa2+Ppd8mVQJM07cdQZ5xM8gTw8q1iFW501KAGyu71qAT49rEIjB h7txL0gspJSL6HJY7/3zN70gRivVk8/re2+7n+8AYHen0rfHzc23RduJX/dwwfI1wvQR oFuXuTJGk9FMJF8Z+TPoUwmoYTOIFg2kI3oh7n9e8gCxVh01nbk7FXLLO4mSxM+KUG2v /ZioWC8W9xMsCqa98SSRNKqmGphSsuOodgRlFXyn9Xd/dW5rLJRhBCigoAKJpFcPAn/s zPlA== 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=7V27YU7YMF+tZPi0O4Ugz3veVJN966k99LkEuw17xeY=; b=BcWJJML7HG8oLiAq2oCk742+bFYpkau7+H+JlrXVt+KncygAPjN4Hjc/T0poLna5Yt oqGrLKNL7K39FEVYNGBN7R3SsQGEuTnphixdgDYtzMqS3lfghRVij79Jb56b1Bp4LNKt gg51DnIQWKNmmcRAH/m2aCwt3H5QkWleQu/C440C4ITgBnERtYvKMprCS9xULBz+dE+7 zLPlJuNxdrXMrVbkPHksjVW1HrZxkYsbV0+/h5Ym5pWXCU05VUlOlPbfI5GfuQqKfRdE +Vkm7wNhMuZIqy/OX63SSuMBi3jNlMC5T0kB+tCNqWrUKibIXV0mr9kycyAUVXCj7B99 iYLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ql0l5+P+; 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 c27sor20536391pgl.52.2019.07.31.20.45.01 for (Google Transport Security); Wed, 31 Jul 2019 20:45:01 -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=ql0l5+P+; 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=7V27YU7YMF+tZPi0O4Ugz3veVJN966k99LkEuw17xeY=; b=ql0l5+P+mf3WMVVy/yqVmjy+Oi65lqVK0DmdJ3uF8Nw4Wf5d0BwNFACRz3v7CkikjX Yd30hkInZkBXabP80PeIrme1yJ/Ip+O9cnqds2hbokZqg3RQNmjxWQl8Qbi4vmEIfqKK +F0amK2NQldKuKzSXexa/Nlj5Cgbu5FavZFzbN175XIAfRziR0JvosWELHfVqH8owdUc VMrKjDraq9FULY7g7KhFS9qzQOJ7XlP6lwLGP8knvtKBTv99kNZzmT9WmbcEfyB+6uLl Frv1ZK7q5RLYDrxqzNFNjCeURud/RAdSSsthXsdMdnbtscwgxnZzZ8M0c4NKTtzaWj5K jmww== 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=7V27YU7YMF+tZPi0O4Ugz3veVJN966k99LkEuw17xeY=; b=r4WPE64Fo2DaBGswJZuGbSoiTDieAOJsIOqSGM2KrCJFFk1c8YFWt6BBHLfZj3IMA0 +tLdIRfIbzovj7z6cJQPMFcAyzxlUXxJq9BNdQwkAw0+NQ76zGcqthP2EXOscMxFJJPz l8bnU8ygGtRKcO307T+Dr3JARUjnlOQUID2jI9Vxw10YZeK1C/g1LFrTfBBgVpwVuWXv XZws6aFyI3aUuzfUfcRzt9rsliT3Gq2/f3qG5vtlPVq8FC6gH3BketWRxpNyKTHHjI2w zflLeefR+sGXiM0649O7mFdRe9EX2Xnunn64TPi+wCxqAiJ7cfCjxqKNi/xurs/mTUYz ThLg== X-Gm-Message-State: APjAAAUGZjm2UGQz5VQhr3DlvjFWZBcc6PiW57L9EXQ7BT1QSYhYNd/a JqY8O12tc2vCMNLGht5k94E7q55J X-Google-Smtp-Source: APXvYqwEhFxACC26/Eik5Mctv+bkSEzw74Z5kusBkQCvg6V/F07XrF+4u0xrAKRk3NaklKsj9Z8wrA== X-Received: by 2002:a63:a66:: with SMTP id z38mr21652140pgk.247.1564631100809; Wed, 31 Jul 2019 20:45:00 -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.44.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:00 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v3 10/26] drm: kirin: Move request irq handle in ade hw ctx alloc Date: Thu, 1 Aug 2019 03:44:23 +0000 Message-Id: <20190801034439.98227-11-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> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch modifies the initialization routines so the devm_request_irq() function is called as part of the allocation function. This will be needed in the future when we will have different allocation functions to allocate hardware specific hw_ctx structures, which will setup the vblank irq differently. Cc: Rongrong Zou Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 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 ddcfe0c42d7c..0e0fe1cb945f 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -54,6 +54,8 @@ struct ade_hw_ctx { struct reset_control *reset; bool power_on; int irq; + + struct drm_crtc *crtc; }; struct kirin_crtc { @@ -358,9 +360,9 @@ static void drm_underflow_wq(struct work_struct *work) static irqreturn_t ade_irq_handler(int irq, void *data) { - struct kirin_crtc *kcrtc = data; - struct ade_hw_ctx *ctx = kcrtc->hw_ctx; - struct drm_crtc *crtc = &kcrtc->base; + 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; @@ -951,12 +953,14 @@ static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, return 0; } -static void *ade_hw_ctx_alloc(struct platform_device *pdev) +static void *ade_hw_ctx_alloc(struct platform_device *pdev, + struct drm_crtc *crtc) { struct resource *res; struct device *dev = &pdev->dev; struct device_node *np = pdev->dev.of_node; struct ade_hw_ctx *ctx = NULL; + int ret; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) { @@ -1006,6 +1010,14 @@ static void *ade_hw_ctx_alloc(struct platform_device *pdev) return ERR_PTR(-ENODEV); } + /* vblank irq init */ + ret = devm_request_irq(dev, ctx->irq, ade_irq_handler, + IRQF_SHARED, dev->driver->name, ctx); + if (ret) + return ERR_PTR(-EIO); + + ctx->crtc = crtc; + return ctx; } @@ -1027,7 +1039,7 @@ static int ade_drm_init(struct platform_device *pdev) } platform_set_drvdata(pdev, ade); - ctx = ade_hw_ctx_alloc(pdev); + ctx = ade_hw_ctx_alloc(pdev, &ade->crtc.base); if (IS_ERR(ctx)) { DRM_ERROR("failed to initialize kirin_priv hw ctx\n"); return -EINVAL; @@ -1059,15 +1071,8 @@ static int ade_drm_init(struct platform_device *pdev) if (ret) return ret; - /* vblank irq init */ - ret = devm_request_irq(dev->dev, ctx->irq, ade_irq_handler, - IRQF_SHARED, dev->driver->name, kcrtc); - INIT_WORK(&kcrtc->display_reset_wq, drm_underflow_wq); - if (ret) - return ret; - return 0; }