From patchwork Tue Aug 20 23:06:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171875 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp180297ily; Tue, 20 Aug 2019 16:06:53 -0700 (PDT) X-Received: by 2002:a17:902:28c9:: with SMTP id f67mr31112298plb.19.1566342413888; Tue, 20 Aug 2019 16:06:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342413; cv=none; d=google.com; s=arc-20160816; b=iSfvorEts9SaD231Q6Dv84jeFsIxoXwoBgVfF+7UNjt+t/EBSR2jct6vJFwYHUrl/C VI15Ertkyn6h/Vom6dC6TGIxlcscjNqr+6vEW5DY0ikYF6NgFZMEN7vFJzXHbG3XIF5Q hr+A8QZ9iTTU/dkd1Nmtysn4DprVaZCXpVSylW0dpI9j9m8yGaddROBBEGF83sd/WCDz anVAF1lAEuqAqcuvU1R6Wsrj7wz9uISHsu8IWin1TAYZ6aD1nCEPxzFV5766BZqFsFNG Qs3wylsYPwwbMGwpxA21/6rZ9ru+9eZrHuphddQwj+HHr7LPCWqZhnQywmOLZrIucGzD oTqA== 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=9wPcbIoBPT/8L74pQuiXRIt1kMA2rrNdraftIyGCKRU=; b=O9Xx/LGb6uO+5hr6Wi4zgUosZCjK786vTLGopEYpGLezhouZc3GIH07BMfVBlo7xQy OE7xkqEiM+DQlx/GXqQNVqVlnnAz277K/CXkUa+72xnlN6D9cgAybEDVjVi2xOE3m1Np oCTHkhCmpciaiLRy3FZsfMY4yoPtJ2AFa72CGN4uVT+NB0wgrjlu61a6p+nhgXArnfrV CW32WSh8+Uc4/ZUp+zJDxk8EeFx8DttbwLzhzSqidnprhAsBuGKDMBt70nyqE1StXzFX a6GKvyLpio6fKMNsGw7sWSJfsYy9wIOPQsnTCBS+gT6dyrbcAkgLoaO5U3/y5GVUU8Y1 99wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YIPSVYup; 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 bt15sor1777756pjb.26.2019.08.20.16.06.53 for (Google Transport Security); Tue, 20 Aug 2019 16:06:53 -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=YIPSVYup; 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=9wPcbIoBPT/8L74pQuiXRIt1kMA2rrNdraftIyGCKRU=; b=YIPSVYupeR5GBL+4iP8KgubrHAAyoTX6x00LkJOHx1jvD0oh7M/xQwqeVwTMOWIXSl dZcTZfD+t1RJWSjCmcaq32LJsCbNAz/AqoyzNmpk+vyQiRgfQkMZNLDg2cuk5CE06kYu gYaP/UrYI8prOQAmd6gyd4g9yr2xhR+zAdWTUb9nVzmOmDJ0LkolQ+a5a/HMfu2ZK4le LLbj8fT2Fqx18tTcdS7M6kKWkE0+PH7N5+7UP7ckP0124Fwr2yfo3HnUIcxcSbkCAxo0 /ZdKrXBTUkj5c01ATSf05PQAQ4u3sZbsirGuxw3zR8kDDFrChpxxLeJflZz9FcGzERAy yFrQ== 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=9wPcbIoBPT/8L74pQuiXRIt1kMA2rrNdraftIyGCKRU=; b=Yu0g57jh1l8Kz35dCXbSeOwcFTdAfklcGM36QwrSJ5Suk3ELRbOGgdctjAi9Rzv7ZX RU/7Uk/HoqZzKXhW1cFGGqbzT/+IGUMvE1MyZInCofmiK9i23/cNBP41d10QxnhFHpYR N0hrmZnCx1NuIY9EUrHkcP764odP/F3ZBcG1TPF8sKQUrf8OpD41H2Pvjow+ViGGOkOu Wyo5gv5pwC9SFU32jFitWCCO1ffJF7OvWOB1vOdomwN3qiXntacRdCuXxHXykcmCrd+y QaJDmNMKRcfDMZWCjClgKKznBKXHtntaNTTIgbtUjBJYgwDLph6+Y7CPRS+4won4kq5X xRGQ== X-Gm-Message-State: APjAAAUWItiGE2loDR7hXgd3YWsA1N731eaJRcQB0OeemuceQZuBTll2 Bx3DOe42POMwDwvQtATUATrIEicm X-Google-Smtp-Source: APXvYqwA2vG86Xa3XTeAfvmUNiasYaGiBQjfDhnTGPdGcYyITx4aN+Pjv6qz3iMqskAQpDZRDQcpYQ== X-Received: by 2002:a17:90a:6581:: with SMTP id k1mr2350909pjj.47.1566342413486; Tue, 20 Aug 2019 16:06:53 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:52 -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 16/25] drm: kirin: Move plane number and primay plane in driver data Date: Tue, 20 Aug 2019 23:06:17 +0000 Message-Id: <20190820230626.23253-17-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 number of planes and the primary plane value to the kirin_drm_data structure 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 Signed-off-by: John Stultz --- v5: checkpatch --strict whitespace fixups noticed by Sam --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 ++++++++++++------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 ++ 2 files changed, 15 insertions(+), 8 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 94d74c467a81..a74b2623dbbb 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -35,7 +35,6 @@ #include "kirin_drm_drv.h" #include "kirin_ade_reg.h" -#define PRIMARY_CH ADE_CH1 /* primary plane */ #define OUT_OVLY ADE_OVLY2 /* output overlay compositor */ #define ADE_DEBUG 1 @@ -991,7 +990,7 @@ static int ade_drm_init(struct platform_device *pdev) struct kirin_plane *kplane; enum drm_plane_type type; int ret; - int i; + u32 ch; ade = devm_kzalloc(dev->dev, sizeof(*ade), GFP_KERNEL); if (!ade) { @@ -1015,12 +1014,15 @@ static int ade_drm_init(struct platform_device *pdev) * TODO: Now only support primary plane, overlay planes * need to do. */ - for (i = 0; i < ADE_CH_NUM; i++) { - kplane = &ade->planes[i]; - kplane->ch = i; + for (ch = 0; ch < ade_driver_data.num_planes; ch++) { + kplane = &ade->planes[ch]; + kplane->ch = ch; kplane->hw_ctx = ctx; - type = i == PRIMARY_CH ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; + + if (ch == ade_driver_data.prim_plane) + type = DRM_PLANE_TYPE_PRIMARY; + else + type = DRM_PLANE_TYPE_OVERLAY; ret = ade_plane_init(dev, kplane, type); if (ret) @@ -1028,7 +1030,8 @@ static int ade_drm_init(struct platform_device *pdev) } /* crtc init */ - ret = ade_crtc_init(dev, &kcrtc->base, &ade->planes[PRIMARY_CH].base); + ret = ade_crtc_init(dev, &kcrtc->base, + &ade->planes[ade_driver_data.prim_plane].base); if (ret) return ret; @@ -1047,6 +1050,8 @@ static const struct drm_mode_config_funcs ade_mode_config_funcs = { }; struct kirin_drm_data ade_driver_data = { + .num_planes = ADE_CH_NUM, + .prim_plane = ADE_CH1, .channel_formats = channel_formats, .channel_formats_cnt = ARRAY_SIZE(channel_formats), .crtc_helper_funcs = &ade_crtc_helper_funcs, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index ce9ddccc67a8..2b660df60293 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -37,6 +37,8 @@ struct kirin_plane { struct kirin_drm_data { const u32 *channel_formats; u32 channel_formats_cnt; + u32 num_planes; + u32 prim_plane; const struct drm_crtc_helper_funcs *crtc_helper_funcs; const struct drm_crtc_funcs *crtc_funcs;