From patchwork Fri Feb 19 21:20:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1442454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dj4Hk0dZcz9sW3; Sat, 20 Feb 2021 08:20:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lDDCf-0007yf-4U; Fri, 19 Feb 2021 21:20:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCd-0007yB-0U for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:43 +0000 Received: from mail-qk1-f199.google.com ([209.85.222.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCc-0006EZ-Mo for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:42 +0000 Received: by mail-qk1-f199.google.com with SMTP id v184so3629003qkd.22 for ; Fri, 19 Feb 2021 13:20:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HTH7/nsuACmPLGRSWjDTjtKkgE4yxRgM1iKS80H8QCA=; b=dCq2WiZlt7q4XvsWU4SxwlVXUP/+0E1PuhTJ0p1iqn0rQPSGrt83kahVVIreLIYLC1 WNvu3AIWY2jckNjdBnqdqv9Zvy5ZxqW11j6A0zR65I8YID/b/44wNVlPI+xA1Zhm014Q ai/bgDO6PZYHS2t85vgmo+9/i2QqlxQ4gWC37qpKKFb13sWVHagkY5pinIsjXzcZZEzM FoC3NM1YLqsUMfZLKCjkVeAbTfeOxuKZ8/jX1D8uCt0tEycMqugKyKlHRyW9rJV6PW8O 190SxGezOTyyZ2nC5VX1w91vCYRFTfjdJqkSnePVvQhgRJ95niexbdFAbhzUELzKpFh4 bVnw== X-Gm-Message-State: AOAM532XxAnghLSI9ZbyISGctHgZRbOcpV1/hr7of4mlBX7iCt54XO27 iUxuxsBlE3GzwQUoE4W0+44Pm5xYQhDKNWOdCrXM2Dxld2Gtn/BX9PkrvuDo3dGYSJGS34tpHyw uUQtcbrpRUgGap7Lna0JQPSCYpLKHd5skuXb5emYw X-Received: by 2002:a05:620a:48c:: with SMTP id 12mr11105844qkr.290.1613769641440; Fri, 19 Feb 2021 13:20:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJx9TzZ02ic3PO7yJ1S4P09AfFtGbp8m8+VyT5hFpsk4UX67X+CaM8ggftZQlk92Jxlkd4Q3PA== X-Received: by 2002:a05:620a:48c:: with SMTP id 12mr11105831qkr.290.1613769641206; Fri, 19 Feb 2021 13:20:41 -0800 (PST) Received: from gallifrey.lan ([187.57.108.234]) by smtp.gmail.com with ESMTPSA id m7sm6363535qti.33.2021.02.19.13.20.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 13:20:40 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic:linux][PATCH 1/1] UBUNTU: [Config] Enforce CONFIG_DRM_BOCHS=m Date: Fri, 19 Feb 2021 18:20:33 -0300 Message-Id: <20210219212035.3088189-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210219212035.3088189-1-marcelo.cerri@canonical.com> References: <20210219212035.3088189-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1916290 BugLink: https://bugs.launchpad.net/bugs/1872863 In LP:#1872863 we started to build and ship the bochs-drm.ko driver again, however this config wasn't enforced and because of that derivatives didn't inherit. Enforce CONFIG_DRM_BOCHS=m and let the derivatives update their configuration to include it or not. Signed-off-by: Marcelo Henrique Cerri --- debian.master/config/annotations | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 52fa132d2063..cc7b3fcae781 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1774,6 +1774,7 @@ CONFIG_DRM_TVE200 policy<{'armhf': 'm'}> CONFIG_DRM_MGAG200 note CONFIG_DRM_STI note CONFIG_DRM_HISI_HIBMC note +CONFIG_DRM_BOCHS mark note note # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU CONFIG_DRM_AMDGPU policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> From patchwork Fri Feb 19 21:20:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1442456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dj4Hk4BKYz9sWF; Sat, 20 Feb 2021 08:20:50 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lDDCf-0007yr-B3; Fri, 19 Feb 2021 21:20:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCe-0007yU-Fc for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:44 +0000 Received: from mail-qt1-f198.google.com ([209.85.160.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCe-0006Ei-53 for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:44 +0000 Received: by mail-qt1-f198.google.com with SMTP id x14so1409080qtv.1 for ; Fri, 19 Feb 2021 13:20:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UIN4BFCGu7LqQVoPx2r5kcJEXwR+2XOG0hYArzZ82Lk=; b=uRtnV2bAILbtyUPC0AKCUUvq6bbqVq6Nn14Fu0/h64i5lPbg+QRr9ZESTesHwn3K+X a5e9l2/WdappVWuXegR6AxVJvMD4BF0j8AM5NjIS8Njxz31Vja5+l/ypUjIZ3t/HCzi0 CRVHQFVicbeWKMW3mw9D8z8dapFQZp1FiaNWh76u/MHYhNqwzMV0g00qMJso6DxRnSxA uKaiPzIYJVH4VYu218VJKMk9C5Zmy3vxWteLoaL2dflrmoNm5ArZlHN+gj0Xd9Y5Xun/ y19aYWybt5+NKKuooVS+cwJmL0tcfZxSx32qlDrIExDRdOCo8ot5UwKLwKfSEkow6IPu 2vbQ== X-Gm-Message-State: AOAM533AznNN+9wMZNcAmg1SRe37vWXtHlfwQUUw5+nyNL7YPSP70yrH d6CEoIZzamoSOqmnzte4bRQnLNTP1f/7+tNqjMTCEd+eO0KWlPi2cJ1DcoUyB+1zfcHwjUUpsS8 o19x8+NpkX+8/p3stiilleKpxsc10fiildX0Y/9Fb X-Received: by 2002:a37:8c6:: with SMTP id 189mr11348945qki.470.1613769642945; Fri, 19 Feb 2021 13:20:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyc1EeJfDSvHPUnau27gjM09N1GHAweBlc6j0UMMWgQtLesNOt8h7NeM0fIVdV1A/lNLp5Ihg== X-Received: by 2002:a37:8c6:: with SMTP id 189mr11348925qki.470.1613769642677; Fri, 19 Feb 2021 13:20:42 -0800 (PST) Received: from gallifrey.lan ([187.57.108.234]) by smtp.gmail.com with ESMTPSA id m7sm6363535qti.33.2021.02.19.13.20.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 13:20:42 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [focal:linux][PATCH 2/2] UBUNTU: [Config] Enforce CONFIG_DRM_BOCHS=m Date: Fri, 19 Feb 2021 18:20:34 -0300 Message-Id: <20210219212035.3088189-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210219212035.3088189-1-marcelo.cerri@canonical.com> References: <20210219212035.3088189-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1916290 BugLink: https://bugs.launchpad.net/bugs/1872863 In LP:#1872863 we started to build and ship the bochs-drm.ko driver again, however this config wasn't enforced and because of that derivatives didn't inherit. Enforce CONFIG_DRM_BOCHS=m and let the derivatives update their configuration to include it or not. Signed-off-by: Marcelo Henrique Cerri --- debian.master/config/annotations | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 072160d246d8..f32887f29a8b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1893,6 +1893,7 @@ CONFIG_DRM_MGAG200 note CONFIG_DRM_STI note CONFIG_DRM_VBOXVIDEO note flag CONFIG_DRM_HISI_HIBMC mark note +CONFIG_DRM_BOCHS mark note note # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU CONFIG_DRM_AMDGPU policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}> From patchwork Fri Feb 19 21:20:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1442457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dj4Hl2tlvz9sWS; Sat, 20 Feb 2021 08:20:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lDDCh-0007zn-Ll; Fri, 19 Feb 2021 21:20:47 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCg-0007zW-1U for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:46 +0000 Received: from mail-qv1-f71.google.com ([209.85.219.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lDDCf-0006Eo-LJ for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2021 21:20:45 +0000 Received: by mail-qv1-f71.google.com with SMTP id i17so715220qvb.1 for ; Fri, 19 Feb 2021 13:20:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2uluOktXob1ZO3ctDQVQCW1f/M0xud30Dp383kIeeA=; b=WmG+bXBiiIuzBKul7xKmEhVQb4K6xCT7Qs5sb0zmEsdtODG760Tn7QhmVVgKNBG90B Ehj3UACqDC1bFRtxQGgqq55iYIuKrB3YdQ712W5nFF8gEEYJCZ41MUSanGrV+fSjcPey hkAmclt8hcLKajczZrcXxCjN27Srocmt7U0iv4Vu111K2dJIThjXU715/SGrnl7LnnS1 oekBt/L2FwBnUQ5/ZQIDrMBhf8PVjWvA3QstmKlvmPkE8nt0q+EBDclnNZmFJDX4W1H9 A4db7GAC+X5WlyxLcvUg/dYXeCDoFI3P5fSSa+5jrjyI9xx/9FZESVocyETONgR1aQx0 qLPw== X-Gm-Message-State: AOAM533vQ9AgABfwMHyvDoOSQlVEwJEq1BMtMb8zkW2AcC23kG107Jdx VVrFkuoPzwbfhSE5184UAtn39d4q7BABW++Zolo5HEeE3Cl5p87Aga4BA5ne9CiYs4agXScJpjF x34xYwnC6e+bPUgrKmS2oszV8eoc/sKC1t2vnRmxA X-Received: by 2002:a05:620a:12d6:: with SMTP id e22mr7740245qkl.278.1613769644443; Fri, 19 Feb 2021 13:20:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5gO4u1k45HpPsAfwNxrkApbTRQsEvPcl52nTmD1l23496eIVAIyAvZ26YDG4/MDDh4249nw== X-Received: by 2002:a05:620a:12d6:: with SMTP id e22mr7740234qkl.278.1613769644215; Fri, 19 Feb 2021 13:20:44 -0800 (PST) Received: from gallifrey.lan ([187.57.108.234]) by smtp.gmail.com with ESMTPSA id m7sm6363535qti.33.2021.02.19.13.20.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 13:20:43 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [groovy:linux][PATCH 3/3] UBUNTU: [Config] Enforce CONFIG_DRM_BOCHS=m Date: Fri, 19 Feb 2021 18:20:35 -0300 Message-Id: <20210219212035.3088189-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210219212035.3088189-1-marcelo.cerri@canonical.com> References: <20210219212035.3088189-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1916290 BugLink: https://bugs.launchpad.net/bugs/1872863 In LP:#1872863 we started to build and ship the bochs-drm.ko driver again, however this config wasn't enforced and because of that derivatives didn't inherit. Enforce CONFIG_DRM_BOCHS=m and let the derivatives update their configuration to include it or not. Signed-off-by: Marcelo Henrique Cerri --- debian.master/config/annotations | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 7cce122fbfd2..4a46f6f1084a 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1887,6 +1887,7 @@ CONFIG_DRM_MGAG200 note CONFIG_DRM_STI note CONFIG_DRM_VBOXVIDEO note flag CONFIG_DRM_HISI_HIBMC mark note +CONFIG_DRM_BOCHS mark note note # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU CONFIG_DRM_AMDGPU policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>