From patchwork Mon Aug 19 23:03:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171747 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3596216ily; Mon, 19 Aug 2019 16:03:56 -0700 (PDT) X-Received: by 2002:a17:90b:14c:: with SMTP id em12mr23936675pjb.28.1566255836728; Mon, 19 Aug 2019 16:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566255836; cv=none; d=google.com; s=arc-20160816; b=CRmyyRWgVJqeHSy4ZwmC9213AAijV0Vk+mVsEfDUJObFbu0LreglulvJSamGe/gOhP nmpr3KJ93f0MVU0UfOC99xvAsTWpjmIBcpbevLm3iLtg9MMveuiVhzeg+bNVEoSLtGho xXqYzOUxqHkmtNDyaWdZ8Kb26emp5/PwxbVEn/ju+IiRGfM3dBTM+MZUA8roIaWy/MVP 4SFM/ldwfhTWLSdRA/suKHXb0qwAkeRfNTUcOufrHR7fOq3pgE1NAIU4CsBglCO1ZBuQ tlEkJlwUvPpNREpqxAsqDhYKXSz2wwBgRMkpRvQSMfydcQteWny2HiWBQYOPU9Gf0+Ht zIjg== 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=5xXqlqGWu5A581PxcE1TU9HQN3Deqwd26JfZ6CBJo3I=; b=WktoEX4Eq5Eu57UvzsZNlND47MnHTVvJBN4HhVMzZmIHfHKKiSOvWrA+5STGu8X1LC V8jEcQUrB9zn/q1GVXlJdVHkgM7kdq0imXipJHfEcnk5i4a0pE7uFm9fsSncS1h9B8lI eFzuyz3hOc6beGT/PkYRx+heqt9NjZG3LDMh5kcGqou2N4RV5/pXK2xtTRr7JZCxRfwe pP6isIQcJv41sDC1W4SZKv00iyv6x+yJ8Ng/gvnePngRvzP9MF64+ZL8sDLjwNBR4zhl UA11F5FKKcKQYAKNF/ZW1riU616CNdKwnZ0JOP2QvLwOo8ZMvCL+3AAni7i4RiatdnTa eSQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i+7JlJtd; 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 o4sor2488278pjs.5.2019.08.19.16.03.56 for (Google Transport Security); Mon, 19 Aug 2019 16:03:56 -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=i+7JlJtd; 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=5xXqlqGWu5A581PxcE1TU9HQN3Deqwd26JfZ6CBJo3I=; b=i+7JlJtdwvhF0sU+zkXbFNUp/U9CGl0fhE6aCXvRQ6LAEgcqtBgbtAwFQz/f4UShbr o1CilFSSiyAlklLCS4XbjMea207NHBunBUsC+CyfYie1eHyQ1s++OXJaLWv6KBpF0RtQ 8MV7AeU1PYnGdfYWDPHg3znzttuK89H8oFUoaN7yfFQoPktS+rX9t4yajotfrLNMrBZ+ fC6f1ALQ1sfh81EerbqgsD/GIvBQV5XpD2yaFU6CBT0OeBvhgWlcAGfVc5tf5DEDBvWW J1ttv4bZm9XEjn8k5xoz/VUbWv2c1udxvDVfb4s7xSgW8Wc9dRQyAX85EJzy165ScrLr Dg7w== 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=5xXqlqGWu5A581PxcE1TU9HQN3Deqwd26JfZ6CBJo3I=; b=I/LlQsSbca/psknp/McvTXmz62JZbY6bNYxHnO5IA1K9Wr55aNgOhT2vEO2Ir4Y3id 6uTU/mWPkA6Cup1UaxkJQKKQ3PQsd8eC+xynt76JmfLEziY5w3nUrhk2k0beZHEOSRpU MNXGiYr5TABKGN4lNPOHIplQb2LEovuFCnEzLV/R3A3i0XU5ZR4K6wybMN2Sm9k2vtWw ON7hTDwcdvtdqyFzSo8ACfnj1N4ATh7cNifqQh1KIdJyV4U0Og3bfoEpB2IbGYJoJkjL pNej+njB5XU6T/3bPBLrVsDdajKX43YPuIShwYvAMgwRjEq8KnPkeu0YV9JI0urlUB/q vSRw== X-Gm-Message-State: APjAAAXt9IMV7XZTAAtMNAviLcuntbTXiWKtNCyTHfJselHvFJ5poeC3 VMDdPTAceLuR0UHNsCfPkn7YhIrO X-Google-Smtp-Source: APXvYqwfhm7llbkVctWlSDwtfdAvwLhY+YVSQI6Ko11Wl1U5THXL/MpzMgH47+N+G/aXeDPuN1xZxQ== X-Received: by 2002:a17:90a:9f46:: with SMTP id q6mr22468018pjv.110.1566255836335; Mon, 19 Aug 2019 16:03:56 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03:55 -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 v4 20/25] drm: kirin: Rename plane_init and crtc_init Date: Mon, 19 Aug 2019 23:03:16 +0000 Message-Id: <20190819230321.56480-21-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-1-john.stultz@linaro.org> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch renames ade_crtc/plane_init kirin_plane/crtc_init, as they will later be moved to kirin drm drv and shared with the kirin960 hardware support. 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 5f39249fd83e..a0cc1285512b 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -571,7 +571,7 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { .disable_vblank = ade_crtc_disable_vblank, }; -static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, +static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *plane) { struct device_node *port; @@ -892,8 +892,9 @@ 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 kirin_plane *kplane, - enum drm_plane_type type) +static int kirin_drm_plane_init(struct drm_device *dev, + struct kirin_plane *kplane, + enum drm_plane_type type) { int ret = 0; @@ -1024,13 +1025,13 @@ static int ade_drm_init(struct platform_device *pdev) else type = DRM_PLANE_TYPE_OVERLAY; - ret = ade_plane_init(dev, kplane, type); + ret = kirin_drm_plane_init(dev, kplane, type); if (ret) return ret; } /* crtc init */ - ret = ade_crtc_init(dev, &kcrtc->base, + ret = kirin_drm_crtc_init(dev, &kcrtc->base, &ade->planes[ade_driver_data.prim_plane].base); if (ret) return ret;