From patchwork Thu Aug 1 03:44:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170299 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836495ile; Wed, 31 Jul 2019 20:45:18 -0700 (PDT) X-Received: by 2002:a17:90a:710c:: with SMTP id h12mr6128387pjk.36.1564631118747; Wed, 31 Jul 2019 20:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631118; cv=none; d=google.com; s=arc-20160816; b=dyuD98Bt8242CfQeu33vXAgRN9iE1b7kIYe8qEgbe2OpVgsNo0VMa66b/5Ju+W2D9K LdPxwQkED73kvZJ8up++4oADouyAaQT9oc02NWMc8Mh1pEaQfK7YwIWAYs8QGsLWtXHd g/6jgikTJmkTEd8A64aHyzCEFxZklV5kPZHolkoTOldckuu85R+GuOV8qCo9O+NqBBwZ DlQwXwd7qkFYAA1F78LfA7rmUALIvDnRtqUSX+dk3ABcErdfMAdougsArrCUNwGHBPqj FAWW5SzDjcMhs+akusWdiRdE8uduINYJiqPlsXu/45BbVlB9VdMLEJCycxFQO0lqCRmx WguA== 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=WjHqeb4FH0iNPLGVjtm/IuQE2HpCUqPIHkrvBOle06A=; b=Cwp9I8WqDvUgPdzkyPqpyBaFRiXG1vc2QzIMWy9l3Q8cqc1R7++2V8y7HNicQNhheY USbwINVstYi6KGHgSVw5AyFbeIWVwmKwsf7+m3rdCV+MK6YonUW+ednATat94w5x3d5F puiffdxQoepwVWVW7aQatwXzwi6GiZ/aDWIvCLCiPqDr9lNaVBIyY79YjWVq5LqTnAFu nKbFKI+TtOhAlsNQoTerN5X2I0B4ijC7E+MCD2KifNcn9PtGuNsM35jukGjyUu1Htv0V ztrGwes17yr4L0ulZKbm+14hlWH32H+lHN59QX0hs/6Oz2OytjKFC1KwR09OeSZK+ECZ tsWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="zr0/ngFt"; 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 c2sor47159909pge.58.2019.07.31.20.45.18 for (Google Transport Security); Wed, 31 Jul 2019 20:45:18 -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="zr0/ngFt"; 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=WjHqeb4FH0iNPLGVjtm/IuQE2HpCUqPIHkrvBOle06A=; b=zr0/ngFt5h5LHU72dl+EtYw2C13wCz8o1t7dZMhdyUVncveQH7+C+i5FhpQD7uH03n /jIlvAzXiSVskXqndgi4tjf0TksEDwJJOzk44IMe27eMSWRiMfMyHSZpJYs8kKSFL23X OdcQh+IUi+060D487nmTDlDzz6iXtLb6P63tMjbSjzkEQ34dKDLpR3jtDFz4ty7UU79d zecB7/VA0b4oc7whmXb37/mD7m+1gRLLZPMrOXCzXl9dow5nM/qZ0As6xg3KNddln4pa kpSqieLfnQ4DCgTXp+dzk1BxOVGqkYHfWxeLfV8QnOWJBbMHU1Y3NPzDwakC48jNrn3I 9CUg== 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=WjHqeb4FH0iNPLGVjtm/IuQE2HpCUqPIHkrvBOle06A=; b=lTz+ccKhgWuEABoE6qghlo2JH+6P3r5lNGjN3nKGDhs8b+agFZToohisbg3Z0to9Qn 6LE0BRuB6SLDc8eOgXSwhGk8Lzm0wDDRMlNG7S+sLWKqtxTkxHsBx9CIsgjOZbPPbM4e QwmcinuTJzwTfFxk6RcEGMHyLw5Q0CNxgV0n4jO88ik3S62Oc15bbZHxvjHA/BhZNGuS J/SW7u75uTneHk6rUn9f1l+5OWtsSC0SljtTBaIKI7KFtAQsxrF8KhecIgC6NNGUG1wT 40DxZxXKt5gTYDCPuDX0aKCo+Xhtg3ThBNxoWgVk/C/KM28/AT9QCNyFMf9oKWQqXuFz GBdg== X-Gm-Message-State: APjAAAVQflvOVuX6zTHe8oTX0I1BHwcm7waQfREYYEElYRPdW2cxD618 D/I5XPI+V5g00l6F40oWSnzbiAYD X-Google-Smtp-Source: APXvYqyVvZeMN6yRDkQ4uJom/1mFt8PdcwoWOHTKKQIAhsK+H2xzvml2+Hg38NdQbaAZeqmJIa0zMQ== X-Received: by 2002:a65:6497:: with SMTP id e23mr112657820pgv.89.1564631118292; Wed, 31 Jul 2019 20:45:18 -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.45.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:17 -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 21/26] drm: kirin: Rename plane_init and crtc_init Date: Thu, 1 Aug 2019 03:44:34 +0000 Message-Id: <20190801034439.98227-22-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 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: 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;