From patchwork Wed Feb 15 04:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 57367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6000:1283:0:0:0:0 with SMTP id f3csp27893wrx; Tue, 14 Feb 2023 20:54:02 -0800 (PST) X-Google-Smtp-Source: AK7set9Y56iW9C3ZgB/z4iLK2sUTlYs3m2kNsYfGGfiMagWRc74QTt/XHZUrqaGAlnaGrw+N50Om X-Received: by 2002:a17:906:fa99:b0:888:1f21:4429 with SMTP id lt25-20020a170906fa9900b008881f214429mr896787ejb.19.1676436842145; Tue, 14 Feb 2023 20:54:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676436842; cv=none; d=google.com; s=arc-20160816; b=xoikf0BJd8KOhfG1d+IZ9Jy96lKd67MAR1crCLYOFNI+v+SpFyGht+6RY6Q88al3Xa /5aoqvPS0WE3qwZ8R8FpqRC3r0deRM+z+P3btGn0SEBknbR+pUkuJXGcAl4SR2k2GH/u 9bBYVFowfXUVWXZMfwIMoFyWNhK1nLW1sLNWaTZAkRUPciVdz3/BtskqnoBrB4eEDfC2 uL3a3FBze/CJ8jINH/kTHbNf+dlJUMzbYYAqdSQ9paJSeed9vrDN49wlvGkj43pmBL3+ 2hJAl4HXeQTSOmaEI+pbd7McBGP++G0ZR1dkcq3wBQbSuq+K+Mm6R+lPxyAQwtKH3WhO B6lA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=6haR0Gslot1UK8ZhTQ6ixtzG06W6DKkjfv7cGJc+PJ4=; b=zvx508OlXxVkfEKLg5hrtSTc5GxOCU4t1fX2pppZgZUuUr+68pA/gjktHM+Kp2t18+ 3YhZK+ZeNknXsWF1ST6P6nmwo8kd/FETOc9Arl1abu9n9nn/DCFTOTSKWTMC1a6pWKCg ccO55jZBU/i279UVpOEwVoV+6H3tHFi6Gb6UjXxeuWqRhiJroWqeSZRnsJg3mfc3x9hI 68yaPlWlybRbd+XUWaTRRGfuBk8Wxr4rn7Hf7eoT1cYudb20eAU2NAsCvsFm4iE+mMt4 LI4nwicquS4QPgZhBjaRC7P6m1jzDjsrWDMxZ8z5U8VTzaUHp45wsFHXoao5J8XEwoFL KY+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="Nf/C1CP2"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a170906225000b0086b6a3fd247si25055832ejr.557.2023.02.14.20.53.38; Tue, 14 Feb 2023 20:54:02 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b="Nf/C1CP2"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233014AbjBOEpm (ORCPT + 99 others); Tue, 14 Feb 2023 23:45:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbjBOEpk (ORCPT ); Tue, 14 Feb 2023 23:45:40 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1943923C59 for ; Tue, 14 Feb 2023 20:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=6haR0Gslot1UK8ZhTQ6ixtzG06W6DKkjfv7cGJc+PJ4=; b=Nf/C1CP2CKbdfVKEnA9yx/FqHN YMHMxRAu2f6HRtGof1DBr2KCHAuTE8XnakubiyGmhTzxLAtnpB2JxU7sg1IumBQcSqU9WwFl1RGir RVL6YAb/QN1vwM3bIULVStT7IjeYXybqDJjqQ39b7Z5wmdJ9qEiTxxf6Qdga/YtZYOv4XfmHQv9D9 GRdYer9I/xWQWv1pTULUmmsVLfI8IJLCWFYgXntEv89d9MWQfn5+n/zPaYiEV5FCc+qjsQT0ZAxgL qKyD5YOxTz7A9JJF12qbmXPXKfuDHzEd1sTIChDyVUCHO8BWjLqOA6j2tF/beEIhyK6hoPmC60nI2 o89GqZKg==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS9fh-004i4H-Ti; Wed, 15 Feb 2023 04:45:34 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Christoph Hellwig , Zhi Wang , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Zhenyu Wang , intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/i915: move a Kconfig symbol to unbreak the menu presentation Date: Tue, 14 Feb 2023 20:45:33 -0800 Message-Id: <20230215044533.4847-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757871438190685785?= X-GMAIL-MSGID: =?utf-8?q?1757871438190685785?= Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT) into a list of other symbols that do have a dependency (on DRM_I915) breaks the driver menu presentation in 'make *config'. Relocate the DRM_I915_GVT symbol so that it does not cause this problem. Fixes: 8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko") Signed-off-by: Randy Dunlap Cc: Christoph Hellwig Cc: Zhi Wang Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: Tvrtko Ursulin Cc: Zhenyu Wang Cc: intel-gfx@lists.freedesktop.org Cc: intel-gvt-dev@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Reviewed-by: Christoph Hellwig Acked-by: Zhenyu Wang --- drivers/gpu/drm/i915/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -- a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -118,9 +118,6 @@ config DRM_I915_USERPTR If in doubt, say "Y". -config DRM_I915_GVT - bool - config DRM_I915_GVT_KVMGT tristate "Enable KVM host support Intel GVT-g graphics virtualization" depends on DRM_I915 @@ -172,3 +169,6 @@ menu "drm/i915 Unstable Evolution" depends on DRM_I915 source "drivers/gpu/drm/i915/Kconfig.unstable" endmenu + +config DRM_I915_GVT + bool