From patchwork Thu Aug 1 03:44:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170284 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836049ile; Wed, 31 Jul 2019 20:44:53 -0700 (PDT) X-Received: by 2002:a17:902:ac87:: with SMTP id h7mr2502930plr.36.1564631093654; Wed, 31 Jul 2019 20:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631093; cv=none; d=google.com; s=arc-20160816; b=e5R6Kq2O0M71P9IHVBoc1/xL1stSFtTOi7NNYzNeGgOOwmT5C1j0xVzVJ6Eht67KCA 0SjAG5HwjTe4mnVWH+clu455TYcPX9w6192V3xfjBNVL05kQBHjdRM5Fo3jS16OF4q/J KZGcgkCWjeVi/Gtf2VBE9kHTqi8Jkc4uiKFouz2c9Krz7tpJZyjKor2NWPFa7DwARSeR SWBOjxGgCJwQh9fxW7bPs3WAXM68IbxP6E69j063WxcteQdxVlrTO8zmZXS5lvX90mOH zWVM4G93GJ/N7b70oViBBoahlCXMlwHGFg1xMx2Im7x2OW9QSq+VNXbqBPLEVVEGyySl PrBw== 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=uEC63dbARYEuBlfRwpeBf8DWjhjcKGFjgUkUYEDal2c=; b=NP6suXt0hgm7M7veeVfPtIYectFDsAHBHN0CYSHlFyU9ovRWMYsXsms5A2ldHuJXT3 aN1L/nDPQzYg09AQfrhJrBySVlCxdpwwvJ48CTH8jNyf3cJZoJXnJd+rZekCLHgL3xrL pCuG7pUelEuWq+chGWRwhLtMUZF890oRYztXyg1qw1p4dJbbw3OrAAaiRutc4gfjMCFs gTz2JojgUtL1qw8iOHUL3Rnq885280gWgTbE7HHLKrxdabWK6Ejy/P1ZzUb/OmrIRGcQ Rz1hm9GyucRD1+QnJUJjO+gHCphsYu4ZFGyeizziKe592ECqCxcmmuRUBY6fEdSnDmgh 9BJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vRnBOW0k; 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 y1sor21205546plb.65.2019.07.31.20.44.53 for (Google Transport Security); Wed, 31 Jul 2019 20:44:53 -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=vRnBOW0k; 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=uEC63dbARYEuBlfRwpeBf8DWjhjcKGFjgUkUYEDal2c=; b=vRnBOW0k+1Eg+RO86kU/byWqXZO9hXCUEe93OtnP7i+y4PXdVg5McCbFb1f5MRy2RS RohLpJZEfhAUCcVrDUb4vJTMC3q6GO8q2UR1COosrAVvIlhSW7420qSKLOgAD4WBBBw6 KuDaSl70QaywqUqFDR7ZWXlBwZRZtWIYue/PlUeHjPRHs5SgYp22jsIE4M4HeQocfLi6 1ozKxtqdd6b7RIv+ldjSbyUdFo7DrXj3juTCByOncD0xGM2b/a1fU27HmmShG6Lme4kN fkaXleAJopS0b084QGZsCIxoo+gSizQEvdoo7ELcJsG2EyyfGtisIYjfZ26JGy0R6rYM ZekQ== 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=uEC63dbARYEuBlfRwpeBf8DWjhjcKGFjgUkUYEDal2c=; b=g3+yIpLpjArW7Y/NHEbNUn6PEvc1yCCaYf0QCfFS9P32h3bkPco5P7SpcwN3XAj4yZ /+vxQvv1/HSVDXU+nwH0BfZ+bD2ZO7lu7dKbARKmFxRkRtSDiEfO4ta5PBsotGV8B4fs LutPDBM2wuCSgWIb7CTpnvSVoxmRVAcoxFCt7OhqXTwI/i2wMh6MNJFu8SiUA8nVLmlG QAr5LnejZED3+uSGU9AfCez1u3SZFuwApcSmf0VCzW72Dr7kJh3PJCHmlpPiVVLAk9rd uzpBgcigzftjqWpA8ZQ+Dy3uju9QgZchIF8GurDbKSRMp7qgRRXw9SORfgHAv3Gqt+bS CNEg== X-Gm-Message-State: APjAAAXtK98+teAR1bIZRXvR48iT2padGJqaT05ohP0u3RupIDKjmhsL HWv9f2L5U8K5mFgQdvRiVmO6YrrN X-Google-Smtp-Source: APXvYqyFPrpF1ZkyRxvqbslTyH9glBjcshx+BTBA0o+bExSUREc6tM4oDj8esscrMOpDE+uS5xwn+A== X-Received: by 2002:a17:902:be03:: with SMTP id r3mr125030318pls.156.1564631093229; Wed, 31 Jul 2019 20:44:53 -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.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:44:52 -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 05/26] drm: kirin: Remove uncessary parameter indirection Date: Thu, 1 Aug 2019 03:44:18 +0000 Message-Id: <20190801034439.98227-6-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 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: 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 --- 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 9a9e3b688ba3..756aefd5bcff 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,