From patchwork Thu Aug 1 03:44:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170292 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836272ile; Wed, 31 Jul 2019 20:45:07 -0700 (PDT) X-Received: by 2002:a17:90a:c588:: with SMTP id l8mr6221982pjt.16.1564631107872; Wed, 31 Jul 2019 20:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631107; cv=none; d=google.com; s=arc-20160816; b=Lbt5xAaGOHnMgIhw4q6ebPWFHuEIcUF1XiAChFEDH4P1ylq1ZxcEd1O7IK6pGPaAES 9Qo5nL9OqDN8G89Ct9Fw9Qeqv8ygTV59E8irP6U2XSo+v/rOM+b+9/8AcCI54uV1/ASw V6Xw+NHdstERFIOSdLF1juwaFjFpWeFr49lCerb1l/t57FOJ/z6CEbFtZTXr95YY/n0j wioiu76KRndHryEvo0vOpb5gcFdkh3x1aVbUOPZv+swcb0NSUERlQYCqP1H0gSh5ZkeX asxE04i8NCuNP3XKde6ZMIFMoDioqRvhi+vJqjmJECUe3WKDGnoE/pcXuFeij6I5xaPy LW1g== 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=sPsp2eqITZnw2b8QC7bn0VV3MJP+delfGQJVfFYbiRk=; b=sJ3TyJCO6SA2ZUT/WeEe4wgriLOs1zfSM8spczLNSC7oeNqLZtk+UAnvSf2pn/Lnbc cs6uKWooqdLKaHu/foa5ftnYDYMRBX31LuoNImAYnLNRM7w+lI2YRWBD5JWQckg24rbX ir8VibIy+X0e9AkPV11TfpXScTaN937U+zgOPjbsdecqJ0gxHiY7L6WjxHCztbFEZPDp JDwkL4wFxl/h+1J5XKohuX9dLlElUopb3M49XHW+3x8OrDcVujxbNjMcDVeE3hreD2Ud LGNaH9+fP6kmsph71CYly1yIi3iBu9qTtxivt4IKPzBPn4zXS/k5uxBdEfSrn1HPaZNm u04Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dc3g+ccV; 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 q4sor52308312pfh.9.2019.07.31.20.45.07 for (Google Transport Security); Wed, 31 Jul 2019 20:45:07 -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=dc3g+ccV; 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=sPsp2eqITZnw2b8QC7bn0VV3MJP+delfGQJVfFYbiRk=; b=dc3g+ccVISsD+XlJfNn6R+VKW6AYYAiONlIwe8IU3AI6iT5eUtwLhaCJbpLJzy4AmG JOLlaIB3eOSsJgUD2NpkU5i6OprDNKMJsnqPjgnhA5SzrHyNmul1V63b2JlhqtKgjaBy MeKUEwl22xTMvmP6z3Zb/x4Uv3k0S90nDT1h5sAnjEOY1Nn6jCZm3lZcNd/FBKJLoqI2 Erbb7yS7qNkSo/m2YvpQ2vjqbVOIiLch05MzYqUN8WKeevWeK6P7FTuO5T6xJ6q/bK4H ac3vpQXKQaUmJf++/N6I04Sbo1rCscRkHBoFaWkSrOkbuwVtKqYWwLmhO/tprDj2HQ5Q BHUw== 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=sPsp2eqITZnw2b8QC7bn0VV3MJP+delfGQJVfFYbiRk=; b=WSKdl/abjVACnlqcPjITl53hge3g6P7+4BxBlV95FlwUXqiD0BnjWHmEolS1wvQXhn RR6JIRctWNLRs1mIaE07deymwLr7AsaIORlm7Ziyejx0h2Qg8UJWfO0IWxBedUBBHGWN NQGPeeTwSPURHPOTqKuvjDNYGq/p+1XfWsZunKxIrOrEPYV+61MAFK33tLPXvD2EZ7G2 m7SsRtOKQ1c930NYzuuUw6vBk/RtFswknB/mF1QCrBwlrgu2rvL3uBYGE6uR8OmbjTnR zvGMiU+PEVXjpoCn8EuJalvfUrnghqIwBEIxLKILeIdNyktjDxytJ9hPjJkCN4f2wdRo coUQ== X-Gm-Message-State: APjAAAWrZdsTK5dvc+bg6d7LY/H+2CTZLuJm1tt55D185PuouyK0FKWM ooGw3lpPOPGemtDwV8xP/zROOs5F X-Google-Smtp-Source: APXvYqz9J417rd70yrAxKPQ3YRSZltq4+t8BRMIPsxRjNDEPI645+q4kTkFqUGRKHPTAlVKDPrfaxQ== X-Received: by 2002:aa7:81d9:: with SMTP id c25mr51766726pfn.255.1564631107496; Wed, 31 Jul 2019 20:45:07 -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.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:06 -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 14/26] drm: kirin: Move ade crtc/plane help functions to driver_data Date: Thu, 1 Aug 2019 03:44:27 +0000 Message-Id: <20190801034439.98227-15-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 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: 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 | 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 acae2815eded..029733864aa8 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); };