From patchwork Tue Aug 20 23:06:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171863 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp179916ily; Tue, 20 Aug 2019 16:06:36 -0700 (PDT) X-Received: by 2002:a17:902:76c7:: with SMTP id j7mr30042668plt.247.1566342395982; Tue, 20 Aug 2019 16:06:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342395; cv=none; d=google.com; s=arc-20160816; b=wabto6b8snXT3PrleT0fjbcHKZr1WSrE9+hDB+qYW4rfn0FFRl74e23Sph0pRDO9a5 14+d0Ckk/a62OlZX/d3zvlWXndz77IA5aMXe3b8IaI8RpQhv6x+pJgkMh//dSzLYj5r6 GBdL5CFqM3P7Uxcp40d5K8DSnNYF0NH692OXTONGKCr4mmEoltPJ835yprZrs9Rd7O9O rR0DCGo7qVkyzUJRu6uaSGdajGyOzmqCskrAWASjzGdwtMFVIPQdO0B7My/LDLdsfxdu Myp61IPcuGidrZs4xCb5LYsK4dKW0BsT/dp2hzzBCo1NXWKDS49XFREJdWupMmt8pND1 kn1A== 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=sMMNrNPEyr5ojRnGMae00OuNvWMz/twMj42dMKt7nWI=; b=s9a/gpj8jSFRrdMkrZwfKEMKWHZFTXLS8bAbLRnm+DD+A9pxn/DFpgYiP60VEH/SSS mikFYImfFWFGy+hfkyMSI+dP/hSvoLAeR6XUunPQ7N/VZISKO04uEARgqhUp7iMENdfc fn/l+bg5qWrAHu7IiF8GKdEq376QRLTqMTl831J7WrvO8o0sVIHsM3Bj4MTO6EW6ZqG/ a3ZvUZxXtlK3iebdmdvGyyGTFNONdAbWhQSDOCkd3iJotvwG1eBZalGGOjWTdREo85Zt yLsMvwC2LH9V7cA6Fw8XuuMIs4freSe0KxV7mneriM3iAwzLZh2IE+PPXZQXA/oO3td4 YFRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IB7XgmYv; 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 e93sor6834994plk.27.2019.08.20.16.06.35 for (Google Transport Security); Tue, 20 Aug 2019 16:06:35 -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=IB7XgmYv; 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=sMMNrNPEyr5ojRnGMae00OuNvWMz/twMj42dMKt7nWI=; b=IB7XgmYvkwQEJtHZlzt4hH6T5NopJkfBoayNv/GodStcZXxTvSt35M0eDDE9K3LV2X t34RV1DW6QSCYi7l5B5gjU/nC/lzfgqYLQUgPK/FHUm7Q90eU6Xs99OSlhMpSBUAFZu/ Yimi+ol1E2NCdt3K/+oziOzE6uaD+OHWte422JmbCriql6H9kOHQKD/tsCDvM56LPSqq xcAGaApq98JTw0Q04lqdwrHP703sVt3Vds/7vEiDMpD3keehlJIiDsFeg+/lMwH4ucqu 0nxmOsfgPHJW/SjDgWdvnebrKFcXAhGduTdxDSkzdCzBM1GIttYl8RXIDDS2rgs60whC iuUg== 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=sMMNrNPEyr5ojRnGMae00OuNvWMz/twMj42dMKt7nWI=; b=twBwGLmcHgNfJFaai9mwcPPE1hFZDsmaFjfHWeRRMQS2M0Im/ZxKB9X9iFMP3TBJhz zoqup290Yimkl1lckVy2IoN2vsqezMDygU6b85ciqqJReFK93a15v8cuwrobHVBPI8rX 7jNalXyWRb9g6kGFs2HHoe0xQwncIN1vA+BROFl2ugGEdc1pFPfZputEtVSuyY5ClCg3 q8Er6KZ2NDUFfZ8RyzHhycoGjBeqC1DAFSzIZyql2SIQ2V2oOp1IgVnEB/0X+0oL/yVH OBZzXm9L2rY8JBAHJaX4OWzDkfxyzumX9ZI8Ld+EM+49kVp270rfApk6jNQHo4p7F39x YjTg== X-Gm-Message-State: APjAAAUX4pXNnSp3tqMG05egUljJsf3nh2UmNBH8nOuPxNhuYocoRLMX Bc8d4pLjQUftxrHuBg4RdnC1QMgJ X-Google-Smtp-Source: APXvYqxvBHkagafXH1CnZDG8/J2NJtGYyNSNZb9XstBXBy84ZynIq7jqLkNKO8FL/LW4w2k+JTFkdA== X-Received: by 2002:a17:902:1105:: with SMTP id d5mr31408400pla.197.1566342395612; Tue, 20 Aug 2019 16:06:35 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q4sm27564747pff.183.2019.08.20.16.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:34 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v5 04/25] drm: kirin: Remove uncessary parameter indirection Date: Tue, 20 Aug 2019 23:06:05 +0000 Message-Id: <20190820230626.23253-5-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org> References: <20190820230626.23253-1-john.stultz@linaro.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: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Acked-by: Xinliang Liu Reviewed-by: Sam Ravnborg 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(-) -- 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 d972342527b8..45351934d919 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,