From patchwork Tue Aug 20 23:06:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171871 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp180195ily; Tue, 20 Aug 2019 16:06:49 -0700 (PDT) X-Received: by 2002:a17:902:5a5:: with SMTP id f34mr30161068plf.178.1566342409020; Tue, 20 Aug 2019 16:06:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342409; cv=none; d=google.com; s=arc-20160816; b=NxYmeReGqYB0aBS6N2wFDhloVVGfzG+oMJe3iHK2tQ0K5vSPc6gmpzwhyI6myMWI3r ZChyVeRsCGXgcC90zBZ0MIARLDdfIvJkCg+5C9EfhjL8lDyyg6srZKBggXtocaSi7sZx ZeW4BCVAhM9uYA+X0c+aMVj/Kfe0e2dd2Dl8BEupBlxWvESq3n3oURW/x/gpX6N0fR1l ftRcX/Fx6eWvx8UdfC89vNmpHNFkscqFdRQW5BSNOAQ5wcdsV4NxB9NRzwARmnnkYi8c Sf5kE1o3LJ26A1I+8uT+H7ldWnM8gLOvAmgy7qfrSA3GFIdhYeiqiUNXGGOg+hwFng9h TvfQ== 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=OE/knvVfD1cUvaltFYKP0JvLLCHD/efyGm+69Rc7xlw=; b=i5LtGqDwJEF2fWFwXLttksF4iGvoQfR+XEF19YoQuykGDyY4FthHSFE319t3LRtNPt s9SLe9w1LNDeVlydFUiEE1tu8OIwE+2Y3nIZ0dibz55t8B0lxiAJnDfrwa19xdfi+3Bf 8mnZNWyRyghmh8RwiRSJW5w8G38qQP7MQFAF9tjxKOKpHvzynP3vU65fy4IQ1F2z+hvd gAtUlAWyU6gJQv3Dyb9dN/0t+bFuMFfyXtcrquUwHIW7eECux5OmjmgSA6bTih9zybbi xORQQAqGaH2bDVjaletAJGnvg1FJZfaMYz7+We4iyGC6glYLtx7k5CHyCrr1wiyxP0Ni beOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="t/W5hPjc"; 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 v11sor1847254pju.18.2019.08.20.16.06.48 for (Google Transport Security); Tue, 20 Aug 2019 16:06:49 -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="t/W5hPjc"; 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=OE/knvVfD1cUvaltFYKP0JvLLCHD/efyGm+69Rc7xlw=; b=t/W5hPjchDYa6sGZVIGnHO6x84ep6oMs8OQM95dG6M/wiomHPHQuiTvqt+n3CZLObc O+QoVXcBg9FH5iWKGRWKWGKakOXamJ+A1YDSsmZ/eag5qxWoPNbpY0T/FrWTQM4fA4bA 7a1CU2ujUC1Hcu2DpQygzwwEUXYz4SMH1LjAz7Lb/0cvZJQLByjhD8cu7uD48j0rDG8w OZig/Hnis2947iEqf9wJicr4akz0qfd58VRw9QeXmO0++iIIMihvCQLa+rg4497A7OlH dzqJVhg3Y7TS+g635mQguEl93U9enx9o+UtlHWnQjbKEsdI1sMNWx53aFsDToV8F/taD Yvzg== 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=OE/knvVfD1cUvaltFYKP0JvLLCHD/efyGm+69Rc7xlw=; b=Zpe+eCB624cQBXegjHup19KtAFShbHInVYb0gBpxx7cpshTcLHHUi6GGKefrPzArC7 ugb47KHHYKiblajijU7lYgxppf2eCHvYNg7I93gEzkgqTKO/AbXe0ksv/d8vSbwzEY4a KaXKiSzelt0bnaBDDbqPbSQGNlHX/ZKvPuEeVBBPhZPyklPV3Dr2l4H8hJei1AEmSnpR X8qEVXtnGAmFkOTQzgYqJ/+LRh5mzC1LDYjPQCu4FNo05/EdbPL/urfjVxTM7Os/yiUq 6PoqEasxJTHOi1fmafCoHy1f3GCdXDgpbR8CBgcpOY+g4KnhaB65gAJSxMiMyBRHTLjF uPKA== X-Gm-Message-State: APjAAAXNMarFbD7F1HdA42lHj6RxQ4Gr1mBL1TJ5XwFDJ9zcpHIPSTeM J8SFD+/ItsJt1qzS2Y9NDrOmZHYa4tWKuw== X-Google-Smtp-Source: APXvYqy8NWxr4UsxAfs4ZFu3Qa6r1PCDzR/mO6PksK93ygC0/2OPDBqgbMjUaZPdEPsuXPjL9mXzYw== X-Received: by 2002:a17:90a:9a90:: with SMTP id e16mr2401477pjp.71.1566342408627; Tue, 20 Aug 2019 16:06:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q4sm27564747pff.183.2019.08.20.16.06.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:47 -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 v5 13/25] drm: kirin: Move ade crtc/plane help functions to driver_data Date: Tue, 20 Aug 2019 23:06:14 +0000 Message-Id: <20190820230626.23253-14-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org> References: <20190820230626.23253-1-john.stultz@linaro.org> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch moves the crtc and plane funcs/helper_funcs to the struct kirin_drm_data. This will make it easier to add support for new devices via a new kirin_drm_data structure. 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 --- v5: checkpatch --strict whitespace fixups noticed by Sam --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 15 ++++++++++----- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +++++ 2 files changed, 15 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 4c6646dfc465..a1a79f372bcd 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -602,13 +602,13 @@ static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->port = port; ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, - &ade_crtc_funcs, NULL); + ade_driver_data.crtc_funcs, NULL); if (ret) { DRM_ERROR("failed to init crtc.\n"); return ret; } - drm_crtc_helper_add(crtc, &ade_crtc_helper_funcs); + drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); return 0; } @@ -917,14 +917,15 @@ static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, if (ret) return ret; - ret = drm_universal_plane_init(dev, &kplane->base, 1, &ade_plane_funcs, - fmts, fmts_cnt, NULL, type, NULL); + ret = drm_universal_plane_init(dev, &kplane->base, 1, + ade_driver_data.plane_funcs, fmts, + fmts_cnt, NULL, type, NULL); if (ret) { DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch); return ret; } - drm_plane_helper_add(&kplane->base, &ade_plane_helper_funcs); + drm_plane_helper_add(&kplane->base, ade_driver_data.plane_helper_funcs); return 0; } @@ -1056,6 +1057,10 @@ static void ade_drm_cleanup(struct platform_device *pdev) } struct kirin_drm_data ade_driver_data = { + .crtc_helper_funcs = &ade_crtc_helper_funcs, + .crtc_funcs = &ade_crtc_funcs, + .plane_helper_funcs = &ade_plane_helper_funcs, + .plane_funcs = &ade_plane_funcs, .init = ade_drm_init, .cleanup = ade_drm_cleanup }; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index cd2eaa653db7..70b04e65789c 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -35,6 +35,11 @@ struct kirin_plane { /* display controller init/cleanup ops */ struct kirin_drm_data { + const struct drm_crtc_helper_funcs *crtc_helper_funcs; + const struct drm_crtc_funcs *crtc_funcs; + const struct drm_plane_helper_funcs *plane_helper_funcs; + const struct drm_plane_funcs *plane_funcs; + int (*init)(struct platform_device *pdev); void (*cleanup)(struct platform_device *pdev); };