Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp1172850rwi; Wed, 19 Oct 2022 07:31:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47COtVWa7OLg4autcvrwQsgZ8cIVl0fcCb9F0b1nOBpHP4ZOJ+NNKclGB2xmHXAf5gDUrh X-Received: by 2002:a17:907:74a:b0:77e:9455:b4e3 with SMTP id xc10-20020a170907074a00b0077e9455b4e3mr7115699ejb.471.1666189865762; Wed, 19 Oct 2022 07:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666189865; cv=none; d=google.com; s=arc-20160816; b=xfCfCsDpo23/Ea8L/iM7Z8+3iBJLMLipcUfFIHTWd/Mi3VZdH0BHf8qWNSTsvLe41T NsXnx2zRuxBHi9KgMF5RUJ1b6f8OoFK54ZUisfxWiJil7J1SShwKs6JVLuL51sV2XMS0 IFg1Le23HlhfLAJ9EQOpQZ3O+PS7uLmPfIVP4XPkKT/lvqplmFlziNsjShTIfETnbPf6 7rpnMKpzKdbR63WjnQEGFkE/bUqJLbprwqtWuzbBw1nJwqZppennTMC5kIis+7vXbl9v fS2B86aV+eej+RuA5F1NWGuqv8R+cFXXuqxvMQlw6aNZ3LJ9iIvquIOVBA5ExEfyFgSS 9b2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rHs9slV/GImFoBtRd71/vNDhv5IKg65k+hcXfdsWq20=; b=MEr1YwOa62Oxg+vWIncf21zn22Kmuig/vGzXiXCAoS0I9jNpzINA6tMypITqyA3Tzi Ib+JN7DA6HObqlN/LuxWklgnxAzLVhDTca3KfGm4BMAl1VxkNrSeZku+9kx04T5WkDXv Rryb94+iJwwHr22Ro5p5hmArhV7PSBvEvPAEMwpD/pcrbpYpYHOAE6+YQ2deNkRlHpDW zp+pRu5hM27AHvdVnl0t3VxN3D7UoCbscbwVm4qFGELirvM1aPTl2WA95b/hUb7ODZWN yarzJUqhq5rcrSSvoOZkJmzAVPZsjXfcXVG4+bTG7x0gMTLt2O/+WH9o5OavxN2EMFqE CAVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YjGzP9x5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402510d00b0045d9ceae669si8666814edd.404.2022.10.19.07.30.37; Wed, 19 Oct 2022 07:31:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YjGzP9x5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232351AbiJSN5T (ORCPT + 99 others); Wed, 19 Oct 2022 09:57:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233860AbiJSNyN (ORCPT ); Wed, 19 Oct 2022 09:54:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8DC816551B; Wed, 19 Oct 2022 06:36:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EC667B82419; Wed, 19 Oct 2022 08:56:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45A82C433B5; Wed, 19 Oct 2022 08:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169805; bh=nvtaYVSKFDDYUb6/1fBbU9SEqDqsjhxHoNRXYfa+jfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YjGzP9x5i0SA3Opuad1SSF0HeGbI50iuAMAftq9MRJRLNmz7GK7FQbxqPPEDA55Au rkzbhyzIIDsYLxj0lTecpc+YyKUiBTejPm4CymSg8DQ+i1nr0Rj79zOAlghN8Mnae9 TUEmZfwDZNjFDiwZdy/R21bmu4ZbfaPuOTyL2P8Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shao-Chuan Lee , Chia-I Wu , Gerd Hoffmann , Sasha Levin Subject: [PATCH 6.0 383/862] drm/virtio: set fb_modifiers_not_supported Date: Wed, 19 Oct 2022 10:27:50 +0200 Message-Id: <20221019083306.878330786@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chia-I Wu [ Upstream commit 85faca8ca0f659263b5fb2385e4c231cc075bd84 ] Without this, the drm core advertises LINEAR modifier which is incorrect. Also userspace virgl does not support modifiers. For example, it causes chrome on ozone/drm to fail with "Failed to create scanout buffer". Fixes: 2af104290da5 ("drm: introduce fb_modifiers_not_supported flag in mode_config") Suggested-by: Shao-Chuan Lee Signed-off-by: Chia-I Wu Link: http://patchwork.freedesktop.org/patch/msgid/20220831190601.1295129-1-olvaffe@gmail.com Signed-off-by: Gerd Hoffmann Signed-off-by: Sasha Levin --- drivers/gpu/drm/virtio/virtgpu_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index 5c7f198c0712..9ea7611a9e0f 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -349,6 +349,8 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev) vgdev->ddev->mode_config.max_width = XRES_MAX; vgdev->ddev->mode_config.max_height = YRES_MAX; + vgdev->ddev->mode_config.fb_modifiers_not_supported = true; + for (i = 0 ; i < vgdev->num_scanouts; ++i) vgdev_output_init(vgdev, i); -- 2.35.1