Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2880619pxb;
        Tue, 19 Jan 2021 08:15:39 -0800 (PST)
X-Google-Smtp-Source: ABdhPJyNgasLUiEeGIg8hTLaPVg0X2spRhYSAkjxbrV3gIy7QLfpqmjcIeWj2ZoQBbKKyPZL2BD3
X-Received: by 2002:a05:6402:b88:: with SMTP id cf8mr4239432edb.140.1611072939466;
        Tue, 19 Jan 2021 08:15:39 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1611072939; cv=none;
        d=google.com; s=arc-20160816;
        b=0dxUXihZQreBIlXMu+fTlLjTzJzXvHizl9mYv6lEOregkoCjAAQJQ5nxjgaUHc9B15
         PYt79nrY4bgT9Qi/vPwADajYfyEMKxC9itCt7gr54WL2ZOlwMUlDeYJE/KdSPVvG1oMD
         fTp9XRuDp7us4mjqPe6uryrGVXJIK+XZ8Bms7gFwdMJb6FihI4hRUGUBsckdCw8OomkB
         tZm7pbgpZ2ViITjiS3Q7qx8qzc1eGuwKic6m86riKCBl7zIo5DSRv/ZxyAg/IsLqQsPH
         1wI9kI0EfNr/Y177DNjP9cQwLRHLskk269JIo+8CCfL6VLC04u1ZN6Woh0E3XhnAsj74
         x0yg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:dkim-signature:content-transfer-encoding
         :content-language:in-reply-to:mime-version:user-agent:date
         :message-id:from:references:cc:to:subject;
        bh=tQD7OEZUyDNkeJOYKrKuZ5zUmlJB5oM1e1SlcLNGXxA=;
        b=AK/yATZaudISCsumpvJCMUv4CZlgFLgiYn4XDOwNyX2V5zQF2Vnss5r1fJ85LxDh/P
         1EglHmmP4KvpJcMRrSmY5L06EzbMv4+HHf2g5Y45ewtpgETtCcASgF6WaPpe1srIHUwa
         ZK6TeJyKpUBMQycuOpM7Yi4kJ4Tq22caoIiEF7tq/FhrA7j959kMid7Ei4J+ZWqu2Vda
         cS0RArp06HvLPpK1kSD5inHaalRSY0Mp9zRXO33iyE5oRuleOka1q27xw32SfQ9tnGL/
         +d5xUeVILYcHCqrBc+ZHUo93VMSNfQI0FFyr/C8/b+taxScynaPZaznSHUDXrKbQCQ4P
         b3BA==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=As3l2i5t;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id b13si3574972eds.375.2021.01.19.08.15.11;
        Tue, 19 Jan 2021 08:15:39 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=As3l2i5t;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2391819AbhASQLP (ORCPT <rfc822;lkmldmj@gmail.com> + 99 others);
        Tue, 19 Jan 2021 11:11:15 -0500
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:14371 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2391404AbhASPwe (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 19 Jan 2021 10:52:34 -0500
Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA)
        id <B600700080001>; Tue, 19 Jan 2021 07:51:36 -0800
Received: from [172.20.40.72] (172.20.145.6) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 19 Jan
 2021 15:51:32 +0000
Subject: Re: [PATCH 1/3] drivers/nouveau/kms/nv50-: Reject format modifiers
 for cursor planes
To:     Lyude Paul <lyude@redhat.com>, <nouveau@lists.freedesktop.org>
CC:     Martin Peres <martin.peres@free.fr>,
        Jeremy Cline <jcline@redhat.com>,
        Simon Ser <contact@emersion.fr>, <stable@vger.kernel.org>,
        Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        "Nirmoy Das" <nirmoy.aiemd@gmail.com>,
        "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" 
        <dri-devel@lists.freedesktop.org>,
        open list <linux-kernel@vger.kernel.org>
References: <20210119015415.2511028-1-lyude@redhat.com>
X-Nvconfidentiality: public
From:   James Jones <jajones@nvidia.com>
Message-ID: <65703839-5eca-4a82-d13a-7d1a68ec9bc2@nvidia.com>
Date:   Tue, 19 Jan 2021 07:52:48 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20210119015415.2511028-1-lyude@redhat.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Originating-IP: [172.20.145.6]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
 HQMAIL107.nvidia.com (172.20.187.13)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1611071496; bh=tQD7OEZUyDNkeJOYKrKuZ5zUmlJB5oM1e1SlcLNGXxA=;
        h=Subject:To:CC:References:X-Nvconfidentiality:From:Message-ID:Date:
         User-Agent:MIME-Version:In-Reply-To:Content-Type:Content-Language:
         Content-Transfer-Encoding:X-Originating-IP:X-ClientProxiedBy;
        b=As3l2i5totSVra/HUe0wHaODZ9prvkub6QNpNkm91St2BJw4yDN1lUjNgLddQaCDm
         fLVoj9J9r8eUoQv7bZLU0045kIa7bmKckF8kVXYsFmanXK6ZD0D5uNBBABdWUYgdkU
         TMUoa68zztbnafKdeRkkajZfQVPqAVdG6CAeVNRlfQ70te7D3mEC6qjkaRsfKPR7Ll
         1VY+6nhClXQnEMNSW5sNayp0OPyOXK1jJyw4TQz5uB62oXqRDVrT5SZw1D9I0gOOAR
         DG7DSHgpuE/1L3DPujxBZzIKwtjy7mwrRtlka/+1sPdjL+fSubvSUr6r0ywSVjqTiQ
         A2CFWPTJIkuQQ==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Gah, yes, good catch.

Reviewed-by: James Jones <jajones@nvidia.com>

On 1/18/21 5:54 PM, Lyude Paul wrote:
> Nvidia hardware doesn't actually support using tiling formats with the
> cursor plane, only linear is allowed. In the future, we should write a
> testcase for this.
> 
> Fixes: c586f30bf74c ("drm/nouveau/kms: Add format mod prop to base/ovly/nvdisp")
> Cc: James Jones <jajones@nvidia.com>
> Cc: Martin Peres <martin.peres@free.fr>
> Cc: Jeremy Cline <jcline@redhat.com>
> Cc: Simon Ser <contact@emersion.fr>
> Cc: <stable@vger.kernel.org> # v5.8+
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> ---
>   drivers/gpu/drm/nouveau/dispnv50/wndw.c | 17 +++++++++++++----
>   1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
> index ce451242f79e..271de3a63f21 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
> @@ -702,6 +702,11 @@ nv50_wndw_init(struct nv50_wndw *wndw)
>   	nvif_notify_get(&wndw->notify);
>   }
>   
> +static const u64 nv50_cursor_format_modifiers[] = {
> +	DRM_FORMAT_MOD_LINEAR,
> +	DRM_FORMAT_MOD_INVALID,
> +};
> +
>   int
>   nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,
>   	       enum drm_plane_type type, const char *name, int index,
> @@ -713,6 +718,7 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,
>   	struct nvif_mmu *mmu = &drm->client.mmu;
>   	struct nv50_disp *disp = nv50_disp(dev);
>   	struct nv50_wndw *wndw;
> +	const u64 *format_modifiers;
>   	int nformat;
>   	int ret;
>   
> @@ -728,10 +734,13 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,
>   
>   	for (nformat = 0; format[nformat]; nformat++);
>   
> -	ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw,
> -				       format, nformat,
> -				       nouveau_display(dev)->format_modifiers,
> -				       type, "%s-%d", name, index);
> +	if (type == DRM_PLANE_TYPE_CURSOR)
> +		format_modifiers = nv50_cursor_format_modifiers;
> +	else
> +		format_modifiers = nouveau_display(dev)->format_modifiers;
> +
> +	ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw, format, nformat,
> +				       format_modifiers, type, "%s-%d", name, index);
>   	if (ret) {
>   		kfree(*pwndw);
>   		*pwndw = NULL;
>