From patchwork Tue Apr 23 23:20:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162750 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354756jan; Tue, 23 Apr 2019 16:21:19 -0700 (PDT) X-Received: by 2002:a62:e80f:: with SMTP id c15mr29500448pfi.93.1556061679345; Tue, 23 Apr 2019 16:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061679; cv=none; d=google.com; s=arc-20160816; b=Oh5/QiPchrVq9ihMBsJNRTbuq5ouwlRiUZD/0e5k2vXFhheFfLX5x2qqW2K+nbI3XG yqQXyT5riwVEStRWFsIcnVkpLQ60yTUiZSZZDYQgd3MU/rbRYLIHbDRgFLByl/zCBgjO 2pQCsrDAhW9PprTX7zGq7N/b6kbp59dz+x40gLtZ49SEy8C+dWmqYNCE3OPBx7K6BCX8 SHHlreXQOiVjGHz8tVVf+0tXSuRr1U0moTSrC++td1nzR0zziqmzpTsommVWNYWVA6zM x60gX9EaafrdsZS332E/oX3y08X9uDxQmTKkqctA2f9b3PL2fWJp0IpWBOzdAgH1Tdqq voDQ== 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=nanMR9WGZAGOt8W9FCJsIT2NdvldMFJeYO2gST1GNm0=; b=PZxOtbk68gYgP1OgZGfVmcniUmP23NdwC6/qOkxz6XenZ2chJeiAfzm1EFhmC2vdoT 91WExVZEEENiofMtaqdFWaxQyGCI8brJQ9/Pr8AnOVdH+hPL9ltkMjijBUJStMjVKsSB oeyr53DLMxGbS8h0xmCANU/6aOWOs3RAQQJASNVcBEe2Fmv2w+WrCoiH+kVn34nt08Yb iI2H7BkKszSTLWN5BP4XnrWFnkRsMhT79pSo/Es+iiuZZE4kDLI8X5JzVv9+SpXTPL3D zeDdIUyZVKqPJbOm1hnERklrDCPlYRp71lDTfz8TWK9O2GHFnlJgz6noOqVgZbG0yLyj CMTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aaCMAzKK; 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 f4sor15077038plb.21.2019.04.23.16.21.19 for (Google Transport Security); Tue, 23 Apr 2019 16:21:19 -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=aaCMAzKK; 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=nanMR9WGZAGOt8W9FCJsIT2NdvldMFJeYO2gST1GNm0=; b=aaCMAzKK87Q6UwN6wPqpfWKm4r5h4W2daAKhhs0a/xCwkqMd1/t7RzCSkZgdGoC5JE VS9i7z2Ar4OSACfCAcsHuYKZHPdyhV8p0ipQakZUFPC1Gc7BboDmYHjLbsIIOBOFEC/7 I0o6VV0Vi/JJ7HwoCvocaunOnRsFyrXffVeqj6abGZ4fFc0/lvJXULVa1WL3Mj9bLxb8 G8SMg6onZZKW+7CQlUMuYU18/cH4NFd3Dad6t9Ia9wPOls+G0PpLzAWGwrMUcWO6jSE0 wHyAM9jM7qDS8Ll7wmv7jzwMwSFV12Lg+vw1/LyDzXw2KirEp/cWHudNU9TcvoSnbE8J n76Q== 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=nanMR9WGZAGOt8W9FCJsIT2NdvldMFJeYO2gST1GNm0=; b=VLJ4servbxW1sRkqrBTcHMpBEHf9eK5smUuhCUQqsLzeo66CU2qh4nHrxzQ+Up97YN xnR/BbPwRqIB7xNskKtq+rDPb7kxu/4e7aNc+EoZIXVZqR+yL68R+ZMOH7HRB3o42zki SdhO/touNsTiepDQE4R0yYiSO6pUXKTs4rJWXdoIZ5/7ENtsymf7jHLT2eknEAA70kQ8 IeTcsY1t+6CdjJ9W4i0tdcergzNcc6WgwGDVW3F3/vsjASs+sUaY+7R6GFd4tnvSKv/i d/wkhqyS65YP1uYC39OLubXWMmWaBKonFsaqWPu1Gyw+4GSgyfK9yaAJwnLEn33p9pG9 M2fQ== X-Gm-Message-State: APjAAAXr7v4bd0sEzByIbGtrAUbns//2X3LOMbn27gT7Sp8bVRQJd33o kzxZctIuPHly9zD08EqWOtmpPoYZZFFACg== X-Google-Smtp-Source: APXvYqyALxw5aburaoX8Cho1JkZDKW/0Bhym/vqMYkT0zsTkkFhaiQrNR0Zl20E/oAv3pySG0Kta6g== X-Received: by 2002:a17:902:8a8b:: with SMTP id p11mr28494162plo.227.1556061678919; Tue, 23 Apr 2019 16:21:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:18 -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 13/25] drm: kirin: Move ade crtc/plane help functions to driver_data Date: Tue, 23 Apr 2019 16:20:44 -0700 Message-Id: <1556061656-1733-14-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 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: 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 | 15 ++++++++++----- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +++++ 2 files changed, 15 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 221bfbb..6aa529f 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 276b159..05161ff 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -39,6 +39,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); };