From patchwork Wed Aug 14 18:46:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171350 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1203433ily; Wed, 14 Aug 2019 11:47:40 -0700 (PDT) X-Received: by 2002:a17:902:e002:: with SMTP id ca2mr781982plb.326.1565808459954; Wed, 14 Aug 2019 11:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565808459; cv=none; d=google.com; s=arc-20160816; b=CgBG5SQv9g4CeJ+BWpG0h3RHbHD5e35Iu9SYFKnFveVk8q7SEWbsT1Ai7xSgivVbzl tpfDaRqkDF6qApGzWHUygTND/EfcIcZF1uMUvP/DBq1xCoLmaAFtQT7/NyiCzub7M3D5 zMUSfTIpue5nti+9TnC/f69kZDIn+th0HyT9PX+uSNmHFH0gBjUZieGxGeg1u29XKCQZ n6j0wSyBpiAGzQEOO1QJLs3rhea0sM/1nmQDtwuan+v4ZTj0zZF4eadm0Zhh4GrWkzrT 49W5bL/gJKRsxKFEWb/LafRxYPMM+i8yqcACwjBnIS73cFJ+r4MgIsCPfRXrqwQaEw8q P1Rw== 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=Jr0LHNXFLRr/YgSdWt3cOqmTd6edKKK0IXkakE1rRaM=; b=ADJicLpkpOYy4Ka/tHmqbFnsTM1SCXxquZAzQeJVsgEukRnNEHK1dERm0/tMAqIATb iwjaULaRyOtwBc3xjiJ1yEaFPiNO759LTeZahkt6E0UUC15Z885WMtZPt32OcCQMCuVj Vuc2u4etb4dGkHbCAt5rpnLE4278gPtrKKs2UKY4RdLpikgbnp41jFTbZj0gLe8XEw7Z IfO4/EpCjbB8gO5M3JPp3g++iTd724YZkClwB9ye7Ply55AxiR8uvsCaOApYTHtPLk29 tSdyGSlcpfi37HKWVgC6AkdgKiSpLJ91tw+nIOKxs1n/HzPGVTUftJm3ohXsnsfPs4hX y8Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rv+Gl8eC; 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 x15sor745849pln.50.2019.08.14.11.47.39 for (Google Transport Security); Wed, 14 Aug 2019 11:47:39 -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=Rv+Gl8eC; 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=Jr0LHNXFLRr/YgSdWt3cOqmTd6edKKK0IXkakE1rRaM=; b=Rv+Gl8eCcK5oQSZmfccdJupNqiSkL5PLZeiuBMuUviSXpb018SThybZruQCixf9sc+ 5T+plvMnfu8014K2hxyhCEeEiSTQfuOG5dkABwYp4wGXGWaYhQy7FxfUsejxGvAyiJJU bNgQ9/UXRNO/cUtGhoO1Fg/xSrXtLjA6FU8Q2TVLyunHqshmY0QE5/6+/eRFgs/1A0yY 4dlbRdiymYQSL72JNwf1JCBPeXaSEGipD7/SPNiZrMZ0vIa4yBLJ1r1Y3Q0DZNYVWGZJ WiDByytAZVSJpM8gWUIT1HLUk05RwvQ/7jVEu0mbAHdj41nVdfiRd2tYCHRvJ0nrqQhw NsDg== 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=Jr0LHNXFLRr/YgSdWt3cOqmTd6edKKK0IXkakE1rRaM=; b=XduVjPpR48K0KKradHcqNrj7LkJvgEJqo8yvwvs0uC5y0itFsnS0lqYSGq5NuR1PZY wfMLGFk4ssOTyE8cLqWStW02IXSXJrXNvt/TCHreTmWdSOyRuwdg+6z5ug+VSnusX0Zy Bh1I5WkRg7fx2BmfrsiqqBFWFbRW3ZbW4IzH2ZKRReJY2Hcw0zk0y8YzzSEFtG7HmP3D UufMp6HCpVCMRMffX0uWdxIfUE/JmhCqQRbLAeLC+j/+4JVbaIxKjPJqg0gHDnozoNl7 8wNYNWDNBnfmDKA3iKRKEW3HHYqBwBCd15oy/6duWrdEOWYyF9k6MdlOfNKin1Kk9j0O i62Q== X-Gm-Message-State: APjAAAUmiu6zXjwWpiTBlDSdRdic1lSDcRgV4vfUlvVYmQqTsFOeqDmh DpAO+c/SuxVD5J0pjjf64XH6syH/ X-Google-Smtp-Source: APXvYqzo/mdKFHRoq5DJ0COo3YXh5eNMJS7NWWZWkEwSch3MmurQnHJAW/u19PUU2WoblQ7z19983Q== X-Received: by 2002:a17:902:9a8d:: with SMTP id w13mr736590plp.157.1565808459554; Wed, 14 Aug 2019 11:47:39 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id y16sm610855pfc.36.2019.08.14.11.47.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 14 Aug 2019 11:47:38 -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: [RESEND][PATCH v3 21/26] drm: kirin: Rename plane_init and crtc_init Date: Wed, 14 Aug 2019 18:46:57 +0000 Message-Id: <20190814184702.54275-22-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190814184702.54275-1-john.stultz@linaro.org> References: <20190814184702.54275-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 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 66434c0cce6e..0bdcac981d8b 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;