From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 04/25] drm: kirin: Remove uncessary parameter indirection Date: Tue, 23 Apr 2019 16:20:35 -0700 Message-ID: <1556061656-1733-5-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-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 128B68973E for ; Tue, 23 Apr 2019 23:21:07 +0000 (UTC) Received: by mail-pg1-x544.google.com with SMTP id z16so3743583pgv.11 for ; Tue, 23 Apr 2019 16:21:07 -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 RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKSW4gYSBmZXcgZnVuY3Rp b25zLCB3ZSBwYXNzIGluIGEgc3RydWN0IGFkZV9jcnRjLCB3aGljaCB3ZSBvbmx5CnVzZSB0byBn ZXQgdG8gdGhlIHVuZGVybHlpbmcgc3RydWN0IGFkZV9od19jdHguCgpUaHVzIHRoaXMgcGF0Y2gg cmVmYWN0b3JzIHRoZSBmdW5jdGlvbnMgdG8ganVzdCB0YWtlIHRoZQpzdHJ1Y3QgYWRlX2h3X2N0 eCBkaXJlY3RseS4KCkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNv bT4KQ2M6IFJvbmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogWGlud2VpIEtv bmcgPGtvbmcua29uZ3hpbndlaUBoaXNpbGljb24uY29tPgpDYzogQ2hlbiBGZW5nIDxwdWNrLmNo ZW5AaGlzaWxpY29uLmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6 IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IGRyaS1kZXZlbCA8ZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZz4KU2lnbmVkLW9mZi1ieTogWHUgWWlQaW5nIDx4dXlpcGlu Z0BoaXNpbGljb24uY29tPgpbanN0dWx0ejogcmV3b3JkZWQgY29tbWl0IG1lc3NhZ2VdClNpZ25l ZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIHwgMTIgKysrKystLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5j IGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5kZXgg YmViMmEzYy4uNTZhNTVkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fYWRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJp bi9raXJpbl9kcm1fYWRlLmMKQEAgLTIxMCwxMSArMjEwLDEwIEBAIHN0YXRpYyB2b2lkIGFkZV9z ZXRfcGl4X2NsayhzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4LAogCWFkal9tb2RlLT5jbG9jayA9IGNs a19nZXRfcmF0ZShjdHgtPmFkZV9waXhfY2xrKSAvIDEwMDA7CiB9CiAKLXN0YXRpYyB2b2lkIGFk ZV9sZGlfc2V0X21vZGUoc3RydWN0IGFkZV9jcnRjICphY3J0YywKK3N0YXRpYyB2b2lkIGFkZV9s ZGlfc2V0X21vZGUoc3RydWN0IGFkZV9od19jdHggKmN0eCwKIAkJCSAgICAgc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGUsCiAJCQkgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGpf bW9kZSkKIHsKLQlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0gYWNydGMtPmN0eDsKIAl2b2lkIF9f aW9tZW0gKmJhc2UgPSBjdHgtPmJhc2U7CiAJdTMyIHdpZHRoID0gbW9kZS0+aGRpc3BsYXk7CiAJ dTMyIGhlaWdodCA9IG1vZGUtPnZkaXNwbGF5OwpAQCAtMzAxLDkgKzMwMCw4IEBAIHN0YXRpYyB2 b2lkIGFkZV9wb3dlcl9kb3duKHN0cnVjdCBhZGVfaHdfY3R4ICpjdHgpCiAJY3R4LT5wb3dlcl9v biA9IGZhbHNlOwogfQogCi1zdGF0aWMgdm9pZCBhZGVfc2V0X21lZGlhbm9jX3FvcyhzdHJ1Y3Qg YWRlX2NydGMgKmFjcnRjKQorc3RhdGljIHZvaWQgYWRlX3NldF9tZWRpYW5vY19xb3Moc3RydWN0 IGFkZV9od19jdHggKmN0eCkKIHsKLQlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0gYWNydGMtPmN0 eDsKIAlzdHJ1Y3QgcmVnbWFwICptYXAgPSBjdHgtPm5vY19yZWdtYXA7CiAKIAlyZWdtYXBfdXBk YXRlX2JpdHMobWFwLCBBREUwX1FPU0dFTkVSQVRPUl9NT0RFLApAQCAtNTE1LDcgKzUxMyw3IEBA IHN0YXRpYyB2b2lkIGFkZV9jcnRjX2F0b21pY19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCQkJcmV0dXJuOwogCX0KIAotCWFkZV9zZXRfbWVkaWFub2NfcW9zKGFjcnRjKTsKKwlhZGVf c2V0X21lZGlhbm9jX3FvcyhjdHgpOwogCWFkZV9kaXNwbGF5X2VuYWJsZShhY3J0Yyk7CiAJYWRl X2R1bXBfcmVncyhjdHgtPmJhc2UpOwogCWRybV9jcnRjX3ZibGFua19vbihjcnRjKTsKQEAgLTU0 NSw3ICs1NDMsNyBAQCBzdGF0aWMgdm9pZCBhZGVfY3J0Y19tb2RlX3NldF9ub2ZiKHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAogCWlmICghY3R4LT5wb3dlcl9vbikKIAkJKHZvaWQpYWRlX3Bvd2Vy X3VwKGN0eCk7Ci0JYWRlX2xkaV9zZXRfbW9kZShhY3J0YywgbW9kZSwgYWRqX21vZGUpOworCWFk ZV9sZGlfc2V0X21vZGUoY3R4LCBtb2RlLCBhZGpfbW9kZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGFk ZV9jcnRjX2F0b21pY19iZWdpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCkBAIC01NTgsNyArNTU2 LDcgQEAgc3RhdGljIHZvaWQgYWRlX2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAogCWlmICghY3R4LT5wb3dlcl9vbikKIAkJKHZvaWQpYWRlX3Bvd2VyX3VwKGN0eCk7 Ci0JYWRlX2xkaV9zZXRfbW9kZShhY3J0YywgbW9kZSwgYWRqX21vZGUpOworCWFkZV9sZGlfc2V0 X21vZGUoY3R4LCBtb2RlLCBhZGpfbW9kZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGFkZV9jcnRjX2F0 b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0tIAoyLjcuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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 8ED89C10F03 for ; Tue, 23 Apr 2019 23:23:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5678B218DA for ; Tue, 23 Apr 2019 23:23:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NQairEvL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729271AbfDWXXB (ORCPT ); Tue, 23 Apr 2019 19:23:01 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40350 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728714AbfDWXVH (ORCPT ); Tue, 23 Apr 2019 19:21:07 -0400 Received: by mail-pg1-f193.google.com with SMTP id d31so8361220pgl.7 for ; Tue, 23 Apr 2019 16:21:07 -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=vuhHNfWnMx8uWZhY+QeUk1qBtGP4f5NldA6jQRHm+6s=; b=NQairEvLvSGh1SguVJ2rpCemcsun3HCniG1nJhW94XLuu7Ucb+iUdicNtGfflaMyUt MkrpWYirbCzWneqOb6R778tc9wbpCvxtcsrXfukpO27qUFuVsgTpP46Y5lrOKq9SR+zY ggMFp7R1m+u3dwTHZ2tIJW17pfMqlvGUsrZChyaGacT8cyxLEUyN9Qfc6jSMCBMGOZLl tHl5Phh9o8xC65tjxfg+VOplgFnhiaYcsGeR9QqyVVZJdXv+hRopVBIckebvJOQpVQNj FbpPMtEnmslUKSHEwPR1cmD/JV6yo9G1WlwxkY7QWyb2LCkNk64yJ7ARC+xgLv0rkL9c YD/Q== 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=vuhHNfWnMx8uWZhY+QeUk1qBtGP4f5NldA6jQRHm+6s=; b=ejRNq/c/AiB/pTFPTQEETdS0DqqNxHJRth4NKFspo0GxSRFYaExuW1zkyZnUoYyF+l uNzLzKubb7uevjDT20jR141ptG/w97kNEzDxAn2EU4DzuWlE96SgRqqezBC7FZ6PnViA vlN5L7L3cGa12wkSQ8TDXOJAMD7iC6P4nY/Q9tsC7SoSgwfUi1UNg6IvsdJOlRI2Amqk NDyNJw12BdAHb1Y76+nR4U+OeRjwyICyJwJYPRGJc4vEkWKSx9wWBm3tdtQBdR6NjAaf taq2u6hsz1s4nGzPBDoX9LiM/AG5z0XZ0AtV/bWiuUMHWG+PkubPDtMuKhp/BIKZ7OX7 0k9A== X-Gm-Message-State: APjAAAX9CtMmzjcts/ayALuazcv4mx9kb/s6bLUFL0F8sQ9a6pza9pxX T+swQGdsW/KFTVi1TwM5nReSeG+zguM= X-Google-Smtp-Source: APXvYqyU5nndpzr0QoWum+fQJyhtInddKfe6IAExSW1yiBxCfRbTNkbhkh/AY20A0+K5tMxuOD6cUA== X-Received: by 2002:a62:1c87:: with SMTP id c129mr4927145pfc.113.1556061666498; Tue, 23 Apr 2019 16:21:06 -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.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:05 -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 04/25] drm: kirin: Remove uncessary parameter indirection Date: Tue, 23 Apr 2019 16:20:35 -0700 Message-Id: <1556061656-1733-5-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 In a few functions, we pass in a struct ade_crtc, which we only use to get to the underlying struct ade_hw_ctx. Thus this patch refactors the functions to just take the struct ade_hw_ctx directly. 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 | 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 beb2a3c..56a55d9 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -210,11 +210,10 @@ static void ade_set_pix_clk(struct ade_hw_ctx *ctx, adj_mode->clock = clk_get_rate(ctx->ade_pix_clk) / 1000; } -static void ade_ldi_set_mode(struct ade_crtc *acrtc, +static void ade_ldi_set_mode(struct ade_hw_ctx *ctx, struct drm_display_mode *mode, struct drm_display_mode *adj_mode) { - struct ade_hw_ctx *ctx = acrtc->ctx; void __iomem *base = ctx->base; u32 width = mode->hdisplay; u32 height = mode->vdisplay; @@ -301,9 +300,8 @@ static void ade_power_down(struct ade_hw_ctx *ctx) ctx->power_on = false; } -static void ade_set_medianoc_qos(struct ade_crtc *acrtc) +static void ade_set_medianoc_qos(struct ade_hw_ctx *ctx) { - struct ade_hw_ctx *ctx = acrtc->ctx; struct regmap *map = ctx->noc_regmap; regmap_update_bits(map, ADE0_QOSGENERATOR_MODE, @@ -515,7 +513,7 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc, return; } - ade_set_medianoc_qos(acrtc); + ade_set_medianoc_qos(ctx); ade_display_enable(acrtc); ade_dump_regs(ctx->base); drm_crtc_vblank_on(crtc); @@ -545,7 +543,7 @@ static void ade_crtc_mode_set_nofb(struct drm_crtc *crtc) if (!ctx->power_on) (void)ade_power_up(ctx); - ade_ldi_set_mode(acrtc, mode, adj_mode); + ade_ldi_set_mode(ctx, mode, adj_mode); } static void ade_crtc_atomic_begin(struct drm_crtc *crtc, @@ -558,7 +556,7 @@ static void ade_crtc_atomic_begin(struct drm_crtc *crtc, if (!ctx->power_on) (void)ade_power_up(ctx); - ade_ldi_set_mode(acrtc, mode, adj_mode); + ade_ldi_set_mode(ctx, mode, adj_mode); } static void ade_crtc_atomic_flush(struct drm_crtc *crtc, -- 2.7.4