From patchwork Mon Aug 19 23:03:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171744 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3596091ily; Mon, 19 Aug 2019 16:03:50 -0700 (PDT) X-Received: by 2002:a17:902:aa08:: with SMTP id be8mr25457606plb.144.1566255830025; Mon, 19 Aug 2019 16:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566255830; cv=none; d=google.com; s=arc-20160816; b=BHsLibPI//BfY0uhSUGLXwL/Hka2xW4bw9y4xinjd0Z1z3g3HSqFbLfn9o8WJRyhE3 GDID+HZvaSU9UAde4aDKWBvcO0FT7/Ekw5M7Y4fS3YTEHnb91u64Yg389EokI3jH73rm qy6h4Q8XuB87yOtd0hnMukzI2Cv7d7haWOKyppOhKzDmfrrJlOUkgOw+3xS9Hqy/uOYv z5cNw6CkK5syXYc5WytDEPTA7MV9JrYpF5eUxVPyx7WsQfQ6QTRgxN1oh9vZfxvYCDt2 945LBA38MvzW9E/m5kdS4CBiKpf8cgeStXcF1oZNIqW71BpSATKeuIBuaAgIaS4HYZNE f0Fg== 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=BGaZCHgDYd2hveQf3FIs87y4ItjrwpXVDJprgquPOWQ=; b=ZZ8y7sZMblC0b/EVwqONv7cQnpNPNoszK+fVMrggftcd1GietRmAeFdvAOpqPbszQ/ 0CHHYR1XHzqWTF2wJiGgwIvEIi+Ul/SyYFa4btfKWdxcnx1OVaoqsgBur+nX82ez+L6E f7XE6CXu4vtUKg/0zpKiVMgg3ywMS1ueRwcc8e47AM9j1fg7wqFXJNapFfCnOWkgKC+H MVGX3sQwYA/035YWmEs5+u5/8l6fdAh5p6U5+qQHLP+zo5S2HCh3G8/+q4jbdtg1Zj8I icudvNA5RoOUqdSSvhYbbAlN/HVIGTcH699h/n42clyNey8gUbIP7VJ7pLcRnUqvkIdj iHJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PBubEr9V; 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 h7sor2561676plr.26.2019.08.19.16.03.49 for (Google Transport Security); Mon, 19 Aug 2019 16:03:50 -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=PBubEr9V; 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=BGaZCHgDYd2hveQf3FIs87y4ItjrwpXVDJprgquPOWQ=; b=PBubEr9VLwe1O9i3u/1JpUbVWWVRe1sxgiti5t0bnIge4DbaYL+kNfFfr3IABo14vj Ncm9oya3aCG/2Y3Ey3oeC9b/qL8vZmHf8ia/uSGf57tOM6njQfvPd6r9duKDKQ3D3pqH rWidoMoYtbrsmy0PsZWEPMlTynETHD2DplN8jFwztf/vFyYlPEYFe3t9SuTcTCW0G1ic 094wbNixvL8via6KTKj5jJFwHa9ktPlmrWCXOT2RwqThxjXSgVg2M8WxXD1vFvACKL4W OiqlUl0/TaN8fRgAGqXjKANQz5oaahR15ABy6uRTbkvplNTXlOuT3Qbv9L7iyzjaSIDr T6Pw== 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=BGaZCHgDYd2hveQf3FIs87y4ItjrwpXVDJprgquPOWQ=; b=Ao3UE5wNkMSeL5kr0w9dYflxCR8xY2Rj5X8RBivUMKpAACaFi5KifhTSifcsY6Q48p FxKhYr1VslWX8ylCDDEbb7OlQlMQlvRqoku//kK50KEYB1f44DoZS2xAG7IjKkucYxID BNO2ANZeAvTmyzGTW9mikpJEtvEtdX1w/N+xRbFIlXvlkcAkg8hO5PGLDay/Mkc8nxTH hkX7GAFyiRRzbNuf6adIsK+mYpBHt2dIpNf5h7sYtoeWyC3F98gQH5lIDE+Kxw+AwPKw oKUt8VnfZnb4ieEkvn33d8XDzph8ngZUNfZUsMIIJ415hNwkHxaGfBk/gEea8c6JTPfW 1xCw== X-Gm-Message-State: APjAAAWaGCflUnQRbAQcyuUYqQe5Dl76M4SKLt9yIKdcuMmsxedICl2T hgZBOj9j4/HPDfy5xCGf/VUm3QgpJbsE7w== X-Google-Smtp-Source: APXvYqz71dgcZoZ4RdSSvpDEAXlxbSAJ9jAS4G7wNm+chbPz8rUdCZt5PGcwWvgDU8KRYoVLnakEBQ== X-Received: by 2002:a17:902:24c:: with SMTP id 70mr16581568plc.331.1566255829603; Mon, 19 Aug 2019 16:03:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03:48 -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 v4 16/25] drm: kirin: Move plane number and primay plane in driver data Date: Mon, 19 Aug 2019 23:03:12 +0000 Message-Id: <20190819230321.56480-17-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-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 --- .../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 4001f060e580..8b1f3580cbd6 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;