From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 08/25] drm: kirin: Dynamically allocate the hw_ctx Date: Tue, 23 Apr 2019 16:20:39 -0700 Message-ID: <1556061656-1733-9-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-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6856E89740 for ; Tue, 23 Apr 2019 23:21:13 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id w23so8271747ply.4 for ; Tue, 23 Apr 2019 16:21:13 -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: Xu YiPing , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW9kaWZpZXMgdGhlCmluaXRpYWxpemF0aW9uIGZ1 bmN0aW9uIHRvIGR5bmFtaWNhbGx5IGFsbG9jYXRlIHRoZSBhZGVfaHdfY3R4CnN0cnVjdHVyZSBw cmV2aW91c2x5IGtlcHQgYXMgcGFydCBvZiBzdHJ1Y3QgYWRlX2RhdGEuCgpUaGlzIGlzIGRvbmUg c28gdGhhdCBsYXRlciB3ZSBjYW4gaGF2ZSB0aGUgaHdfY3R4IHBvaW50IHRvCmhhcmR3YXJlIHJl dmlzaW9uIHNwZWNpZmljIGN0eCBzdHJ1Y3R1cmVzLgoKQ2M6IFhpbmxpYW5nIExpdSA8ei5saXV4 aW5saWFuZ0BoaXNpbGljb24uY29tPgpDYzogUm9uZ3JvbmcgWm91IDx6b3Vyb25ncm9uZ0BnbWFp bC5jb20+CkNjOiBYaW53ZWkgS29uZyA8a29uZy5rb25neGlud2VpQGhpc2lsaWNvbi5jb20+CkNj OiBDaGVuIEZlbmcgPHB1Y2suY2hlbkBoaXNpbGljb24uY29tPgpDYzogRGF2aWQgQWlybGllIDxh aXJsaWVkQGxpbnV4LmllPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzog ZHJpLWRldmVsIDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnPgpTaWduZWQtb2ZmLWJ5 OiBYdSBZaVBpbmcgPHh1eWlwaW5nQGhpc2lsaWNvbi5jb20+Cltqc3R1bHR6OiByZXdvcmRlZCBj b21taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxp bmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1f YWRlLmMgfCAzOSArKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjQg aW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlz aWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwppbmRleCBjMjljYTc1Li4wYWE3MTZlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwpAQCAt NzIsNyArNzIsNyBAQCBzdHJ1Y3Qga2lyaW5fcGxhbmUgewogc3RydWN0IGFkZV9kYXRhIHsKIAlz dHJ1Y3Qga2lyaW5fY3J0YyBjcnRjOwogCXN0cnVjdCBraXJpbl9wbGFuZSBwbGFuZXNbQURFX0NI X05VTV07Ci0Jc3RydWN0IGFkZV9od19jdHggY3R4OworCXN0cnVjdCBhZGVfaHdfY3R4ICpod19j dHg7CiB9OwogCiAvKiBhZGUtZm9ybWF0IGluZm86ICovCkBAIC05NTEsNTUgKzk1MSw2MiBAQCBz dGF0aWMgaW50IGFkZV9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBr aXJpbl9wbGFuZSAqa3BsYW5lLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGFkZV9kdHNf cGFyc2Uoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwgc3RydWN0IGFkZV9od19jdHggKmN0 eCkKK3N0YXRpYyB2b2lkICphZGVfaHdfY3R4X2FsbG9jKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCiB7CiAJc3RydWN0IHJlc291cmNlICpyZXM7CiAJc3RydWN0IGRldmljZSAqZGV2ID0g JnBkZXYtPmRldjsKIAlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gcGRldi0+ZGV2Lm9mX25vZGU7 CisJc3RydWN0IGFkZV9od19jdHggKmN0eCA9IE5VTEw7CisKKwljdHggPSBkZXZtX2t6YWxsb2Mo ZGV2LCBzaXplb2YoKmN0eCksIEdGUF9LRVJORUwpOworCWlmICghY3R4KSB7CisJCURSTV9FUlJP UigiZmFpbGVkIHRvIGFsbG9jIGFkZV9od19jdHhcbiIpOworCQlyZXR1cm4gRVJSX1BUUigtRU5P TUVNKTsKKwl9CiAKIAlyZXMgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2UocGRldiwgSU9SRVNPVVJD RV9NRU0sIDApOwogCWN0eC0+YmFzZSA9IGRldm1faW9yZW1hcF9yZXNvdXJjZShkZXYsIHJlcyk7 CiAJaWYgKElTX0VSUihjdHgtPmJhc2UpKSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHJlbWFw IGFkZSBpbyBiYXNlXG4iKTsKLQkJcmV0dXJuICBQVFJfRVJSKGN0eC0+YmFzZSk7CisJCXJldHVy biBFUlJfUFRSKC1FSU8pOwogCX0KIAogCWN0eC0+cmVzZXQgPSBkZXZtX3Jlc2V0X2NvbnRyb2xf Z2V0KGRldiwgTlVMTCk7CiAJaWYgKElTX0VSUihjdHgtPnJlc2V0KSkKLQkJcmV0dXJuIFBUUl9F UlIoY3R4LT5yZXNldCk7CisJCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwogCiAJY3R4LT5ub2Nf cmVnbWFwID0KIAkJc3lzY29uX3JlZ21hcF9sb29rdXBfYnlfcGhhbmRsZShucCwgImhpc2lsaWNv bixub2Mtc3lzY29uIik7CiAJaWYgKElTX0VSUihjdHgtPm5vY19yZWdtYXApKSB7CiAJCURSTV9F UlJPUigiZmFpbGVkIHRvIGdldCBub2MgcmVnbWFwXG4iKTsKLQkJcmV0dXJuIFBUUl9FUlIoY3R4 LT5ub2NfcmVnbWFwKTsKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT0RFVik7CiAJfQogCiAJY3R4LT5p cnEgPSBwbGF0Zm9ybV9nZXRfaXJxKHBkZXYsIDApOwogCWlmIChjdHgtPmlycSA8IDApIHsKIAkJ RFJNX0VSUk9SKCJmYWlsZWQgdG8gZ2V0IGlycVxuIik7Ci0JCXJldHVybiAtRU5PREVWOworCQly ZXR1cm4gRVJSX1BUUigtRU5PREVWKTsKIAl9CiAKIAljdHgtPmFkZV9jb3JlX2NsayA9IGRldm1f Y2xrX2dldChkZXYsICJjbGtfYWRlX2NvcmUiKTsKIAlpZiAoSVNfRVJSKGN0eC0+YWRlX2NvcmVf Y2xrKSkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBwYXJzZSBjbGsgQURFX0NPUkVcbiIpOwot CQlyZXR1cm4gUFRSX0VSUihjdHgtPmFkZV9jb3JlX2Nsayk7CisJCXJldHVybiBFUlJfUFRSKC1F Tk9ERVYpOwogCX0KIAogCWN0eC0+bWVkaWFfbm9jX2NsayA9IGRldm1fY2xrX2dldChkZXYsICJj bGtfY29kZWNfanBlZyIpOwogCWlmIChJU19FUlIoY3R4LT5tZWRpYV9ub2NfY2xrKSkgewogCQlE Uk1fRVJST1IoImZhaWxlZCB0byBwYXJzZSBjbGsgQ09ERUNfSlBFR1xuIik7Ci0JCXJldHVybiBQ VFJfRVJSKGN0eC0+bWVkaWFfbm9jX2Nsayk7CisJCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwog CX0KIAogCWN0eC0+YWRlX3BpeF9jbGsgPSBkZXZtX2Nsa19nZXQoZGV2LCAiY2xrX2FkZV9waXgi KTsKIAlpZiAoSVNfRVJSKGN0eC0+YWRlX3BpeF9jbGspKSB7CiAJCURSTV9FUlJPUigiZmFpbGVk IHRvIHBhcnNlIGNsayBBREVfUElYXG4iKTsKLQkJcmV0dXJuIFBUUl9FUlIoY3R4LT5hZGVfcGl4 X2Nsayk7CisJCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwogCX0KIAotCXJldHVybiAwOworCXJl dHVybiBjdHg7CiB9CiAKIHN0YXRpYyBpbnQgYWRlX2RybV9pbml0KHN0cnVjdCBwbGF0Zm9ybV9k ZXZpY2UgKnBkZXYpCkBAIC0xMDIwLDE0ICsxMDI3LDE2IEBAIHN0YXRpYyBpbnQgYWRlX2RybV9p bml0KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJfQogCXBsYXRmb3JtX3NldF9kcnZk YXRhKHBkZXYsIGFkZSk7CiAKLQljdHggPSAmYWRlLT5jdHg7CisJY3R4ID0gYWRlX2h3X2N0eF9h bGxvYyhwZGV2KTsKKwlpZiAoSVNfRVJSKGN0eCkpIHsKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8g aW5pdGlhbGl6ZSBraXJpbl9wcml2IGh3IGN0eFxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0K KwlhZGUtPmh3X2N0eCA9IGN0eDsKKwogCWtjcnRjID0gJmFkZS0+Y3J0YzsKIAlrY3J0Yy0+aHdf Y3R4ID0gY3R4OwogCi0JcmV0ID0gYWRlX2R0c19wYXJzZShwZGV2LCBjdHgpOwotCWlmIChyZXQp Ci0JCXJldHVybiByZXQ7Ci0KIAkvKgogCSAqIHBsYW5lIGluaXQKIAkgKiBUT0RPOiBOb3cgb25s eSBzdXBwb3J0IHByaW1hcnkgcGxhbmUsIG92ZXJsYXkgcGxhbmVzCi0tIAoyLjcuNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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 4F9B8C282DD for ; Tue, 23 Apr 2019 23:22:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1212A218EA for ; Tue, 23 Apr 2019 23:22:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="e9dZ1wVL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728844AbfDWXVR (ORCPT ); Tue, 23 Apr 2019 19:21:17 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:34303 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728813AbfDWXVN (ORCPT ); Tue, 23 Apr 2019 19:21:13 -0400 Received: by mail-pl1-f194.google.com with SMTP id y6so8277342plt.1 for ; Tue, 23 Apr 2019 16:21:12 -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=ZL7k6e/+E9bi/0it7T1LpM5/z2yHQD26NCZ4fJDDMXo=; b=e9dZ1wVLSPvWA/a7Am/iUIeh3p/2KfR17jKwh4ILeoBT1TFA6w2cGTm+5redia83kT NZLaz34vgkgOSq93x41VFcF8ZGOo93Fa+fhuuTFqu4uGONrzbEduvBmgco2DzKF9B7CY KnIAMAhlyqkhVN8Y2gBmw82LR73xjibvdiwjBWUhWU6sjpYuHsNAx3wC+wdWh4SSZ/5c lPP9mghFDRCC4UsYuozd4QxjmFyx9fmMr0UybTHs8nJfKr1CiLsQJtu0vRGC2EypQA0T dDehixG3Yxse6Uap9N4y+PQiM2M5jq2MXVW0JkFP7d0GwwOaQvneXn+rAWMXTxh54Vpq lbuw== 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=ZL7k6e/+E9bi/0it7T1LpM5/z2yHQD26NCZ4fJDDMXo=; b=NrrJU7EUIKLvTE2r287Qtw3qkVxlm8s/5+G2Kw72aBLYWdKpb21JFaMzzubEtkXCJj Q+qZT780lsBcQS7bf+LA2Vrcim4PHEdJyhYDCtwVBDviRmgJeXY2RIYMWXaYlxYiigl8 ysx3I4rOvq6jJb+wkT0dWrXJa28atCQajOz6oZDnOWsIcdn8/w0JnMnc40T1B+bKzvm8 ULLm4U+meLqX7PEpMCYbO5sWCaEIHAWjAJl1oRb+d1+uPFI+Vnj1e5Wia4fZ7kCPM3fi APq11nMGKrdnXxv29aQx3e8R0gYF/aC8m1jIldvQfSLQmYd5jzjifP4z9SvpOF1j1I5x FR9A== X-Gm-Message-State: APjAAAUl1gcs37tRi1srJvXMfValXHuVmO00P4exissMijgdVwkF3biv U5nK563cU9umgw/14Tr5jWz2V9veJwY= X-Google-Smtp-Source: APXvYqwe2/5g10OCkqetibI8U3Eh/TAGQv3PJF1E8wn4SUxctSU1TSdYDszeqlbbwNLKeQ2z0TEn3w== X-Received: by 2002:a17:902:2bc9:: with SMTP id l67mr29137478plb.237.1556061672036; Tue, 23 Apr 2019 16:21:12 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:11 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 08/25] drm: kirin: Dynamically allocate the hw_ctx Date: Tue, 23 Apr 2019 16:20:39 -0700 Message-Id: <1556061656-1733-9-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 From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch modifies the initialization function to dynamically allocate the ade_hw_ctx structure previously kept as part of struct ade_data. This is done so that later we can have the hw_ctx point to hardware revision specific ctx structures. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 39 +++++++++++++++---------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index c29ca75..0aa716e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -72,7 +72,7 @@ struct kirin_plane { struct ade_data { struct kirin_crtc crtc; struct kirin_plane planes[ADE_CH_NUM]; - struct ade_hw_ctx ctx; + struct ade_hw_ctx *hw_ctx; }; /* ade-format info: */ @@ -951,55 +951,62 @@ static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, return 0; } -static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx) +static void *ade_hw_ctx_alloc(struct platform_device *pdev) { struct resource *res; struct device *dev = &pdev->dev; struct device_node *np = pdev->dev.of_node; + struct ade_hw_ctx *ctx = NULL; + + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); + if (!ctx) { + DRM_ERROR("failed to alloc ade_hw_ctx\n"); + return ERR_PTR(-ENOMEM); + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctx->base = devm_ioremap_resource(dev, res); if (IS_ERR(ctx->base)) { DRM_ERROR("failed to remap ade io base\n"); - return PTR_ERR(ctx->base); + return ERR_PTR(-EIO); } ctx->reset = devm_reset_control_get(dev, NULL); if (IS_ERR(ctx->reset)) - return PTR_ERR(ctx->reset); + return ERR_PTR(-ENODEV); ctx->noc_regmap = syscon_regmap_lookup_by_phandle(np, "hisilicon,noc-syscon"); if (IS_ERR(ctx->noc_regmap)) { DRM_ERROR("failed to get noc regmap\n"); - return PTR_ERR(ctx->noc_regmap); + return ERR_PTR(-ENODEV); } ctx->irq = platform_get_irq(pdev, 0); if (ctx->irq < 0) { DRM_ERROR("failed to get irq\n"); - return -ENODEV; + return ERR_PTR(-ENODEV); } ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core"); if (IS_ERR(ctx->ade_core_clk)) { DRM_ERROR("failed to parse clk ADE_CORE\n"); - return PTR_ERR(ctx->ade_core_clk); + return ERR_PTR(-ENODEV); } ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg"); if (IS_ERR(ctx->media_noc_clk)) { DRM_ERROR("failed to parse clk CODEC_JPEG\n"); - return PTR_ERR(ctx->media_noc_clk); + return ERR_PTR(-ENODEV); } ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix"); if (IS_ERR(ctx->ade_pix_clk)) { DRM_ERROR("failed to parse clk ADE_PIX\n"); - return PTR_ERR(ctx->ade_pix_clk); + return ERR_PTR(-ENODEV); } - return 0; + return ctx; } static int ade_drm_init(struct platform_device *pdev) @@ -1020,14 +1027,16 @@ static int ade_drm_init(struct platform_device *pdev) } platform_set_drvdata(pdev, ade); - ctx = &ade->ctx; + ctx = ade_hw_ctx_alloc(pdev); + if (IS_ERR(ctx)) { + DRM_ERROR("failed to initialize kirin_priv hw ctx\n"); + return -EINVAL; + } + ade->hw_ctx = ctx; + kcrtc = &ade->crtc; kcrtc->hw_ctx = ctx; - ret = ade_dts_parse(pdev, ctx); - if (ret) - return ret; - /* * plane init * TODO: Now only support primary plane, overlay planes -- 2.7.4