From patchwork Tue Apr 23 23:20:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162757 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354936jan; Tue, 23 Apr 2019 16:21:29 -0700 (PDT) X-Received: by 2002:a62:6504:: with SMTP id z4mr29438361pfb.202.1556061689384; Tue, 23 Apr 2019 16:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061689; cv=none; d=google.com; s=arc-20160816; b=mzYhWB/o8E4Lg07BqZhrxyG5QXuayGrJJHO/TtfHmNGD/o5nhAFelATCH4S8jHL2l/ R7KH9aj2sxVjnbxpFuV7NO3cPNeium+uwDCdks18k4hBm6oLTIMbK6Eyx3LZMe3EJQkX jYCT9iJ4JQSg94sB33ATqhWZ8I2SigUSwkTrcR2Xa4kByATylmzqWQq57RIPc04OoGf6 fh37LfX2XpNrairL+ZecYFOF2UqjnPsIdzrZ+gqeVF8sik00G2Th2XQbgCjmDUPrpP75 T1qtscCWEAFLNLwhJBUZ+3yxF9qKTEwqPD9TeMjY0X7xANRCaC7yhkilVGqtd62ed6Om d86Q== 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=l/4HxndEudHwbox8bYtalM+RzpPcrsQmywphYVO0zYc=; b=paKDOua4tLVPb9PRFVePWVvUjJvh4hjnvcth2s3jX/CCaURnwUf5xXnS+SPBXCfQkE 1HyDo1bI6lnvolMlpK+NpWs7/9tgSPyII5ZhAejQ5n3yP3/kTOMLQMgIb14ZU27X9jCh bdYJfMbUNvbgs5LNS7Qhbj0L06uqVvfQDoTiaE5OjqmZVyBwJP7WftGwNbbTjinPpnzi h/wMsQURtW54/71ntMBgiZZXX9+Qv3GRhgcnPr7uHaRdHNdkqVhp/p5zPGPqQZosFVTG kLwTpMcBCFPLV9EwmRx8fPUn5tc8OGOpseGPTEtPYIwXmHp3AM+1ka+dRj9n6+ddahjy aDdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wrbjvLIo; 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 bf8sor2181501plb.68.2019.04.23.16.21.29 for (Google Transport Security); Tue, 23 Apr 2019 16:21:29 -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=wrbjvLIo; 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=l/4HxndEudHwbox8bYtalM+RzpPcrsQmywphYVO0zYc=; b=wrbjvLIo7S8yefWAy6S+t5N9WVIMTHNi7nErLNj2JKhJMJl251rGYiIplpc1EiXgNM Cm8XYxORSs0TYxOCaR2AWcCv0fIBZy/FXBxGbysMh1iDK/LxOOHFbzsVWfxEq0GbMIk7 GIG3qZDuYuMgTYYPlRATA2pucx+HITzMYtk5WQWPyTDUaQcSqeL37Om9XOS1jjNrFZT2 ikZoyF1PFPXRmNB7xyMmZg7N95Yi0A5MS9w1+RqUKHQYLnNSvpJHsCfRrRJQ2VDLqF6r i7umYS2xIC9MeFswCLO7ecu4e4plaJruFjQwwVxSDXBhpFrgwqO5eVLpfQw78byznb7X f4dA== 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=l/4HxndEudHwbox8bYtalM+RzpPcrsQmywphYVO0zYc=; b=nNgBw98dU/dBN5+QCvHNw9enodSxZkGjXMtpfBYkcnBuMPX47isBDdDjReFKfBkjRR 9u8d9cwjZPeKyI83Ako8vPRBQ6vDRCF1hzbafJP6Nv5uwMCzcLUW+o5tVlqPWNDjM9OD K4kLQj41AQPsP3ch8CdYGiFllI8V0nKIyXmTjcsA/6q2oDJ/1/Wz3/+jqATkdkTuxhY7 jrYy1+Xad2tQnzCJxqkX+4gHATIEvDXRe2unq/85inepFaY56GJLqTBH0tlYSGnB8ePE IZtDNDIGMP98tsG36YcGiaPwWsFFMMlM1QvrtY1kx2NkUoCYlMMqrwNxyOggLBa4Ylpb hC9g== X-Gm-Message-State: APjAAAVU645zdq06THmwNgFbA7+QYwlkMOiihFLRJYeWp6mpjyvwmgk/ kqtSD1akfBwKKMBsqdLyc9a4kxY3 X-Google-Smtp-Source: APXvYqznrvpDjtreESEdxVrYCapvLp99vt28Wwa/eBLgzR4YMg+4MxUeBU80XpmD1fo4NGrxwhOEHA== X-Received: by 2002:a17:902:d701:: with SMTP id w1mr27423947ply.124.1556061688981; Tue, 23 Apr 2019 16:21:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:28 -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 20/25] drm: kirin: Rename plane_init and crtc_init Date: Tue, 23 Apr 2019 16:20:51 -0700 Message-Id: <1556061656-1733-21-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 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: 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 fcc01c2..21965ee 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;