From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72F24C4151A for ; Tue, 19 Jan 2021 18:27:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54F6223359 for ; Tue, 19 Jan 2021 18:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391547AbhASQKB (ORCPT ); Tue, 19 Jan 2021 11:10:01 -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 ); 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 ; 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 , CC: Martin Peres , Jeremy Cline , Simon Ser , , Ben Skeggs , David Airlie , Daniel Vetter , =?UTF-8?Q?Christian_K=c3=b6nig?= , Thomas Zimmermann , "Nirmoy Das" , "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , open list References: <20210119015415.2511028-1-lyude@redhat.com> X-Nvconfidentiality: public From: James Jones 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: X-Mailing-List: stable@vger.kernel.org Gah, yes, good catch. Reviewed-by: James Jones 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 > Cc: Martin Peres > Cc: Jeremy Cline > Cc: Simon Ser > Cc: # v5.8+ > Signed-off-by: Lyude Paul > --- > 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; >