From patchwork Tue Apr 23 23:20:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162743 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354607jan; Tue, 23 Apr 2019 16:21:09 -0700 (PDT) X-Received: by 2002:a62:cfc4:: with SMTP id b187mr29617846pfg.130.1556061669746; Tue, 23 Apr 2019 16:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061669; cv=none; d=google.com; s=arc-20160816; b=NPo65aDrMHoPrLUD4uVPOoFMqevx4hafOvdlA9XWQWtGmSiSRIfZ7Pfud5Ffvla4Bj dPLwnbFLU/KCsOTKjYfu3r3MuzKs5KxKqRNhuMhi3RdimLJ915jCpJKmz6tK0N/bCaZK sCBTwDPJdRwgBVXrCri6Vp0CRn9K/9JsTVZevI7wITsJ1hoamfujqpy9RVXaGlNGG19o HZ7EmPu8gLFiFXViOYSlXuAInNrEsOMcoabBCVMfbREB+wV+I+xN7OSIQa+CdBLlCAnZ 8ySIyjPZmGG51EwxNbGy8zOmyrw6EEde98/KcEgcKXtwyO9mXVjCSxXPts3KcVR49+J/ afMQ== 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=DvGXg8jivUTV+n5vONXfna2nW1twVfjjnPtpm0T5HXo=; b=V/yZKLGdq16bhd5+2wQsEZuVSZToNN3uLfhfaTTgrLvM3jj+dneSWRrqZGiXSB3kzI v9XFRwP3dZzA1aUg+SefoEaoygR7Is1YSJG7tbIn4rMqULHqOry0QxA3eqFbtiGfOxzz sXhKtoFz2KOl5xnEogvKsTyi6JqF6jz2qu4PB7OMz9o7rlUPncp/okafFTuK6kFTxbrx vtVtR6yXyHPGyWKQAgx2MFaQPzo7ZpQ3Hhr6RECrBGHGLYwYnUUosP9r6IrrhqH4dMDj 61v0VM97mHajcjRFqjiGF+o/j9QNUfSI3LmWDqEEJI32n3Rau7I37XNPc24kg8CH1QVx Bi6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KrpWhKYW; 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 b190sor3679802pfg.49.2019.04.23.16.21.09 for (Google Transport Security); Tue, 23 Apr 2019 16:21:09 -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=KrpWhKYW; 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=DvGXg8jivUTV+n5vONXfna2nW1twVfjjnPtpm0T5HXo=; b=KrpWhKYW3Rt3OXTN4s/LhMn1SA/vDPr40ld8JhkyD2zMO5eJRf04FrAZ6Nx06TZKtf 8QpH25Eis+u+ebanyinpluKKZ6DweUpfjUZw185649keXFPW5eUNN/VpRqL5Ppkoitkg P/LJ1ayWw9uoe2uZFK6kCIRDjn+evIR1Tq2nVfcsrZ1Cl+/1mHvkdla9RKI4V/H9unzi D2ZGzuC/AgRRev9P33HxO05DFP7BSB/tWY0m/L21Z4Vxb9I6XYuRt+usNHBxvfxJc6hc 2aZQFuUcITPHGThudIK9btSOvA3YX3UuGyjPBY1FqRq1E3y3qq0acm479HWiX3GDbkvu 5kpQ== 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=DvGXg8jivUTV+n5vONXfna2nW1twVfjjnPtpm0T5HXo=; b=PAD3JmPZ3g/ia7fXs5AZgVjLVe4tgv10ksO38uehW1FDsDo0PFD0Ng+Ed9JnJqYrRl INpJ64stPd1eYF0yHGt2MjSNYlL46SfTaPWAq34RT8ZeTUjbzs13AD8rZLVUQbX/bubN EQpt4ALhfpM+Qm9PyTHF9UuRWHZy/ttEC0fOHcGPA6P9m8rJzFRYktpB+xQ67q21BvBq bGPC/PMZJEkeB9J2jFdlKKUt6H2nEW9HxvPoWEq4nCVd+Ojg0D16PDk1XCThKmhBwSEQ uQat57z/5lY5YLSqh4qnEdEPelEvh5tkGzWHChZJlQqkOWoCIu6R5sd0geLEA5V0DKUs /yZw== X-Gm-Message-State: APjAAAXGUixj6qOpFkfXOp6IV8w4TxHaqiJCm4pdAmdwWMn2tmjWJ/JN HmsigyU9NUJgRnhLjlFC6w16qL0J X-Google-Smtp-Source: APXvYqyAvxDUilcktH+6XRWek7LPMSsg6O1HVQtsJu2ELkYiMLsR/yRPKk2D7OsCpdbUeG/UoUsPSA== X-Received: by 2002:a62:a513:: with SMTP id v19mr29373670pfm.212.1556061669266; Tue, 23 Apr 2019 16:21:09 -0700 (PDT) Return-Path: 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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:08 -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 06/25] drm: kirin: Rename ade_plane to kirin_plane Date: Tue, 23 Apr 2019 16:20:37 -0700 Message-Id: <1556061656-1733-7-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> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch renames the struct ade_plane to kirin_plane. The struct kirin_plane will later used by both kirin620 and future kirin960 driver, and will be moved to a common kirin_drm_drv.h in a future patch 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 | 57 +++++++++++++------------ 1 file changed, 29 insertions(+), 28 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 27a5441..a229da9 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -41,8 +41,9 @@ #define to_ade_crtc(crtc) \ container_of(crtc, struct ade_crtc, base) -#define to_ade_plane(plane) \ - container_of(plane, struct ade_plane, base) +#define to_kirin_plane(plane) \ + container_of(plane, struct kirin_plane, base) + struct ade_hw_ctx { void __iomem *base; @@ -62,15 +63,15 @@ struct ade_crtc { bool enable; }; -struct ade_plane { +struct kirin_plane { struct drm_plane base; - void *ctx; - u8 ch; /* channel */ + void *hw_ctx; + u32 ch; }; struct ade_data { struct ade_crtc acrtc; - struct ade_plane aplane[ADE_CH_NUM]; + struct kirin_plane planes[ADE_CH_NUM]; struct ade_hw_ctx ctx; }; @@ -795,16 +796,16 @@ static void ade_compositor_routing_disable(void __iomem *base, u32 ch) /* * Typicaly, a channel looks like: DMA-->clip-->scale-->ctrans-->compositor */ -static void ade_update_channel(struct ade_plane *aplane, +static void ade_update_channel(struct kirin_plane *kplane, struct drm_framebuffer *fb, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, u32 src_x, u32 src_y, u32 src_w, u32 src_h) { - struct ade_hw_ctx *ctx = aplane->ctx; + struct ade_hw_ctx *ctx = kplane->hw_ctx; void __iomem *base = ctx->base; u32 fmt = ade_get_format(fb->format->format); - u32 ch = aplane->ch; + u32 ch = kplane->ch; u32 in_w; u32 in_h; @@ -828,11 +829,11 @@ static void ade_update_channel(struct ade_plane *aplane, ade_compositor_routing_set(base, ch, crtc_x, crtc_y, in_w, in_h, fmt); } -static void ade_disable_channel(struct ade_plane *aplane) +static void ade_disable_channel(struct kirin_plane *kplane) { - struct ade_hw_ctx *ctx = aplane->ctx; + struct ade_hw_ctx *ctx = kplane->hw_ctx; void __iomem *base = ctx->base; - u32 ch = aplane->ch; + u32 ch = kplane->ch; DRM_DEBUG_DRIVER("disable channel%d\n", ch + 1); @@ -894,10 +895,10 @@ static int ade_plane_atomic_check(struct drm_plane *plane, static void ade_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state) { - struct drm_plane_state *state = plane->state; - struct ade_plane *aplane = to_ade_plane(plane); + struct drm_plane_state *state = plane->state; + struct kirin_plane *kplane = to_kirin_plane(plane); - ade_update_channel(aplane, state->fb, state->crtc_x, state->crtc_y, + ade_update_channel(kplane, state->fb, state->crtc_x, state->crtc_y, state->crtc_w, state->crtc_h, state->src_x >> 16, state->src_y >> 16, state->src_w >> 16, state->src_h >> 16); @@ -906,9 +907,9 @@ static void ade_plane_atomic_update(struct drm_plane *plane, static void ade_plane_atomic_disable(struct drm_plane *plane, struct drm_plane_state *old_state) { - struct ade_plane *aplane = to_ade_plane(plane); + struct kirin_plane *kplane = to_kirin_plane(plane); - ade_disable_channel(aplane); + ade_disable_channel(kplane); } static const struct drm_plane_helper_funcs ade_plane_helper_funcs = { @@ -926,7 +927,7 @@ static struct drm_plane_funcs ade_plane_funcs = { .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, }; -static int ade_plane_init(struct drm_device *dev, struct ade_plane *aplane, +static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, enum drm_plane_type type) { const u32 *fmts; @@ -934,18 +935,18 @@ static int ade_plane_init(struct drm_device *dev, struct ade_plane *aplane, int ret = 0; /* get properties */ - fmts_cnt = ade_get_channel_formats(aplane->ch, &fmts); + fmts_cnt = ade_get_channel_formats(kplane->ch, &fmts); if (ret) return ret; - ret = drm_universal_plane_init(dev, &aplane->base, 1, &ade_plane_funcs, + ret = drm_universal_plane_init(dev, &kplane->base, 1, &ade_plane_funcs, fmts, fmts_cnt, NULL, type, NULL); if (ret) { - DRM_ERROR("fail to init plane, ch=%d\n", aplane->ch); + DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch); return ret; } - drm_plane_helper_add(&aplane->base, &ade_plane_helper_funcs); + drm_plane_helper_add(&kplane->base, &ade_plane_helper_funcs); return 0; } @@ -1007,7 +1008,7 @@ static int ade_drm_init(struct platform_device *pdev) struct ade_data *ade; struct ade_hw_ctx *ctx; struct ade_crtc *acrtc; - struct ade_plane *aplane; + struct kirin_plane *kplane; enum drm_plane_type type; int ret; int i; @@ -1033,19 +1034,19 @@ static int ade_drm_init(struct platform_device *pdev) * need to do. */ for (i = 0; i < ADE_CH_NUM; i++) { - aplane = &ade->aplane[i]; - aplane->ch = i; - aplane->ctx = ctx; + kplane = &ade->planes[i]; + kplane->ch = i; + kplane->hw_ctx = ctx; type = i == PRIMARY_CH ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; - ret = ade_plane_init(dev, aplane, type); + ret = ade_plane_init(dev, kplane, type); if (ret) return ret; } /* crtc init */ - ret = ade_crtc_init(dev, &acrtc->base, &ade->aplane[PRIMARY_CH].base); + ret = ade_crtc_init(dev, &acrtc->base, &ade->planes[PRIMARY_CH].base); if (ret) return ret;