Message-ID: <55af4c7a-b56f-73ae-3bab-537785d5d218@wolfvision.net>
Date:   Fri, 27 Jan 2023 10:53:26 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: [PATCH v3 5/6] drm/rockchip: vop2: add support for the rgb output
 block
Content-Language: en-US
To:     devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
        dri-devel@lists.freedesktop.org
Cc:     Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Heiko Stuebner <heiko@sntech.de>,
        Sandy Huang <hjc@rock-chips.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Sascha Hauer <sha@pengutronix.de>
References: <20230124054706.3921383-1-michael.riesch@wolfvision.net>
 <20230124054706.3921383-6-michael.riesch@wolfvision.net>
From:   Michael Riesch <michael.riesch@wolfvision.net>
In-Reply-To: <20230124054706.3921383-6-michael.riesch@wolfvision.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dEEwTUluQTFVUWtRejJPWEtJZjhEUFhaTGE2M1hvVlAyODJvL1BoalJTZjZS?=
 =?utf-8?B?ZnpaU3VtR1JsMGo1OVBxMnZvamorWUF0aXJFbWc4Yys3YTR3UWVhYXNOOXkr?=
 =?utf-8?B?TGxxM1pVS01sbDExVHVXNlZDUTFGcmFISlpTVDZlTXhDelhKbjRIMGdEYytt?=
 =?utf-8?B?ZnBFWThGRjBUbTFVMlFxOVlDVGJJbWUyKzR2Vnd6RlJpZGlLNy9Wd1pmNEJR?=
 =?utf-8?B?K0cyay8ra04xcEwzTjhXWTYxbXBLS1hNZm5URllKL2ZQRzVkM2dZcGpId1Fi?=
 =?utf-8?B?UGFERzVyMkhkY0V4MmlHdjNpSjBSWHVJbjA3N1BSN21vZ1hCcisxRXliTVpM?=
 =?utf-8?B?bSs0c3JxQVdQbk5wQmN1blB1R292UjZwK0JwSVdDY3lDQWdONzBLSnh2bHNl?=
 =?utf-8?B?dERLR05VV1l0SnBvMUx2dmhwTGVXMHVTK3RjNlZEOE9waGxad3liYVBiMk85?=
 =?utf-8?B?QjBWRGQvaE9yaFBsSnlTS0FVa28wTm5hRkUwa09NNWpQY3R2angxUW41VTda?=
 =?utf-8?B?WGhEb1habFM2RHJoUGJGNzMyWjYzeEJpRjhRS2M3MTk2cTNVZWQ3WTdMQ0pn?=
 =?utf-8?B?b1dmY0VadjBjbHh6bDNXbW5ycjNvRDllenhidTBkenI0QVdDQlRZUVlHemlC?=
 =?utf-8?B?U0xsOWlyTUthTjlOSkZXVEQ1amRQYjZSTmdzL01RSjVncXlvcUxtUnRkWE1S?=
 =?utf-8?B?UGpOL3JlamdyRjcrS05mVGxOeFR5anNmc0xXOGhYNkl4cHFGazhLb2xKT1hZ?=
 =?utf-8?B?STd2ZC9vQVJIUlhzMXV0OVE0V2s1b0ZpelFZTFhnMWwzRjUwZyt4RjZobTFl?=
 =?utf-8?B?NlZvZjY1dHV5MjA0K2VZa3I5V2ZVN2lUTGNnRmZEdWhiRno3MFZhMStrdVQv?=
 =?utf-8?B?ditKRU9WcXhobWplTHZHMFFwZmhkTktLTUdtY3dYRjZVYmZRR3hnMmFEVWhC?=
 =?utf-8?B?a3lQak8wYis1MHAxK1laVVc3R091aFo2MTA0a1N6Q2RXTWY0dkFDOFJDUDYw?=
 =?utf-8?B?L2N5QUFwdktPdDE2dzR6SzUxV2JDMmNWZE52aVpDMjdveUNJSnlVeTMrRklI?=
 =?utf-8?B?blJMVFR1cFExVGdmSUlVQ3FQWldhNUZwblprd0ZWMlpVbEVTRXplaUk3a0JT?=
 =?utf-8?B?QkQyUWhnbmhOUGpzQnFCUWREdVRWNTdRNFZUa2dyeE1QaEcyQldiTml3K3Bh?=
 =?utf-8?B?bXJZbncrR0pKb0NPZ0p1THgwREw5NFk5RzAvMmRHVXZrWE1WY0JrZWI2MGg4?=
 =?utf-8?B?R2hmVVd3UGx4TlRBYTNqcFNoSkJ6ZllJK01tWVZqeXREUlBwU2pNUjJDeEVt?=
 =?utf-8?B?eGQraG4zQVdWQzYrdGJESVQ2UUs4Zm9rMlpybjU5V1FrSVVZUWtVdXRaUjJG?=
 =?utf-8?B?SVZYSEd2ZW1Bb0hIQUZOeGJqS0hSRDlzZm95R2xGWTNxQkhERXREU0s5QnRS?=
 =?utf-8?B?RXVjREZ6VjgzdkFaY3hpSzhtOERIM0JXUEVCdXVTTHpaSS9hOTh4QlRLbjF6?=
 =?utf-8?B?UXU0SmdjYVhvSWYveFYydDJUczZaeGxDRGNtZDdCMW9NeVYvb1lVN0RmSUx6?=
 =?utf-8?B?c2h4dEVHcnlUT1pOUTRmUG9lTkF3ajVVTFQ5clg1a0dkcUx2UTZNZlVJdnBP?=
 =?utf-8?B?ZDBlV29SV0NuYkpmTHE0UHhaVVBpL0kzZGZyY09XR3FMUTlZSFV0N0g1WFk3?=
 =?utf-8?B?RGs4Q2t5UXRVNkNOb01ZcGhlWUtvQ3QvVUd4eE5sbjlpaTNTdllLbEJTZVRN?=
 =?utf-8?B?Rzl6emxVMThVRHdYZ3NrZGxpanhWQ3VPOWtZemE3N0J6blhWSzgvUkZFVnkz?=
 =?utf-8?B?VWpqWHBZNFRtcXAyQ29aUlZOdUJJcHRpK3dvRmNsK2NaN2pXcSszS0RBS2dP?=
 =?utf-8?B?WTA4aU81cnR4UDVhT3N2QUh5S0d4V29JZlF0QmtmcVNXeUp6aTlxb1dGRXk2?=
 =?utf-8?B?SG1xbHA4TUNQSVU1OG16KzEzOVdFcXJiYTRTMnhYcURIUFlOQjJhTTc5QzAw?=
 =?utf-8?B?aUxza05Hcmp1ZkxsNDFwWG85c0tuOGdEUlNyWmVRaFJkaGk0YlNkQXZZWWZv?=
 =?utf-8?B?blkyTXBtNUpoaktlb29WejNqa3UxS1R0ck1PN3RNWWlmMXk1V3BLVE8zTitI?=
 =?utf-8?B?VzFIQTJjKzAwOVJuMlBMei9kVng5bGg5bEkvWVZHOHRJd2pFYkpjTGZiNjlK?=
 =?utf-8?B?d056akJjN05Nays2QlNXMVU5UHdSNE9NWG5wciszNGJsZGIwNjZyNEhvTlBm?=
 =?utf-8?Q?wP7AbmPPlk4V3K44+Q6v+6zPc9PhIIjwjW++a3NhaI=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: c55a0e56-0b9f-4289-ba5a-08db004c5842
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9155.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 09:53:30.2589
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AW7n/2/UJrHBbItKugJKltYBnjY96cb13ZFq/pda3yLONZ4RYBMjYgJ2k7NI/Hstgiyc3A/QUzXTyaNB9dgkU1Phrdu2TiUNAqeS/bDqews=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB8405
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 1/24/23 06:47, Michael Riesch wrote:
> The Rockchip VOP2 features an internal RGB output block, which can be
> attached any video port of the VOP2. Add support for this output block.

s/attached any/attached to any/ of course. Can this be fixed when the
patch is applied?

Michael

> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
> ---
> v3:
>  - fix commit messages (still assumed video port 2)
>  - fix condition to make 0 a valid video port
> v2:
>  - move away from wrong assumption that the RGB block is always
>    connected to video port 2 -> check devicetree to find RGB block
> 
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 44 ++++++++++++++++++++
>  1 file changed, 44 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index 06fcdfa7b885..f38ffd0ccd9f 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -39,6 +39,7 @@
>  #include "rockchip_drm_gem.h"
>  #include "rockchip_drm_fb.h"
>  #include "rockchip_drm_vop2.h"
> +#include "rockchip_rgb.h"
>  
>  /*
>   * VOP2 architecture
> @@ -212,6 +213,9 @@ struct vop2 {
>  	struct clk *hclk;
>  	struct clk *aclk;
>  
> +	/* optional internal rgb encoder */
> +	struct rockchip_rgb *rgb;
> +
>  	/* must be put at the end of the struct */
>  	struct vop2_win win[];
>  };
> @@ -2393,6 +2397,25 @@ static void vop2_destroy_crtcs(struct vop2 *vop2)
>  	}
>  }
>  
> +static int vop2_find_rgb_encoder(struct vop2 *vop2)
> +{
> +	struct device_node *node = vop2->dev->of_node;
> +	struct device_node *endpoint;
> +	int i;
> +
> +	for (i = 0; i < vop2->data->nr_vps; i++) {
> +		endpoint = of_graph_get_endpoint_by_regs(node, i,
> +							 ROCKCHIP_VOP2_EP_RGB0);
> +		if (!endpoint)
> +			continue;
> +
> +		of_node_put(endpoint);
> +		return i;
> +	}
> +
> +	return -ENOENT;
> +}
> +
>  static struct reg_field vop2_cluster_regs[VOP2_WIN_MAX_REG] = {
>  	[VOP2_WIN_ENABLE] = REG_FIELD(RK3568_CLUSTER_WIN_CTRL0, 0, 0),
>  	[VOP2_WIN_FORMAT] = REG_FIELD(RK3568_CLUSTER_WIN_CTRL0, 1, 5),
> @@ -2698,11 +2721,29 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
>  	if (ret)
>  		return ret;
>  
> +	ret = vop2_find_rgb_encoder(vop2);
> +	if (ret >= 0) {
> +		vop2->rgb = rockchip_rgb_init(dev, &vop2->vps[ret].crtc,
> +					      vop2->drm, ret);
> +		if (IS_ERR(vop2->rgb)) {
> +			if (PTR_ERR(vop2->rgb) == -EPROBE_DEFER) {
> +				ret = PTR_ERR(vop2->rgb);
> +				goto err_crtcs;
> +			}
> +			vop2->rgb = NULL;
> +		}
> +	}
> +
>  	rockchip_drm_dma_init_device(vop2->drm, vop2->dev);
>  
>  	pm_runtime_enable(&pdev->dev);
>  
>  	return 0;
> +
> +err_crtcs:
> +	vop2_destroy_crtcs(vop2);
> +
> +	return ret;
>  }
>  
>  static void vop2_unbind(struct device *dev, struct device *master, void *data)
> @@ -2711,6 +2752,9 @@ static void vop2_unbind(struct device *dev, struct device *master, void *data)
>  
>  	pm_runtime_disable(dev);
>  
> +	if (vop2->rgb)
> +		rockchip_rgb_fini(vop2->rgb);
> +
>  	vop2_destroy_crtcs(vop2);
>  }
>