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;
From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <dri-devel@lists.freedesktop.org>, <linux-doc@vger.kernel.org>,
        <linux-fbdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC:     David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
        "Maxime Ripard" <mripard@kernel.org>,
        David Gow <davidgow@google.com>,
        "Javier Martinez Canillas" <javierm@redhat.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Jonathan Corbet <corbet@lwn.net>, Helge Deller <deller@gmx.de>,
        =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jose.exposito89@gmail.com>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH] drm: Simplify testing on UML with kunit.py
Date:   Thu, 1 Sep 2022 15:36:21 +0200
Message-ID: <20220901133621.353270-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TTBvaFRKQkJwMDVQczJIdFUzOXhTMGh0a2hFWUo1L05ReWxPdEVBdSt2aHBh?=
 =?utf-8?B?cG1uUXJZUEdybGxqcXV6elRoQmVkZGRQVVN5L0ZVZUR1TjJrZWo1RHVwcTV1?=
 =?utf-8?B?Y0x1bVk5YTZNcWtsVkFpQ2JNTVVBRElZVVRFd1NjeE9kYmpxVm9EcFozYjFN?=
 =?utf-8?B?NjB4cFR3RTdoUFhSaFp2WVRSTFVYbG90VVdzalJadkdtUlhoVmN4Q0R6ZWlj?=
 =?utf-8?B?Kzc1bzlnN3ByZVFLK2dZNEhhMzNKWFFnN0NuczB3aWVhcFBPaDlaVVhoa0Zo?=
 =?utf-8?B?OE5kYUp5SDRIaXN2SFFxcU1VaFkwbzhtMWZJSUhnT2RTQTgvYlB4a0dZUnNS?=
 =?utf-8?B?NU04Wmw0MWFrR0ZuTE5wUnpXMnh1dVA0MWR2d2xqM1FwTlRhVmEyMFFpcmxJ?=
 =?utf-8?B?WDNvMWp4eHdZRWVxUktuSERqcDRFaFZTSEhhM2VkZjRGNUJCMUpsN1Ftb05q?=
 =?utf-8?B?Ukc2K0VsYWhtcWVDQWpkTTUwRFg1YUdCZGZOZklEUGFmK0xCR0hnaXVTYVha?=
 =?utf-8?B?N3grWHk0SERmelVFU3VLcEhXVWtxckZaVFFPOEVTdUUwQ01WYkMvZ2gxSHNP?=
 =?utf-8?B?WUVqbmthSHdDQm9UMUdUQUprRm9kUi8wQjZQVEFPejMvRCtmcXYyb0pYWFpa?=
 =?utf-8?B?WUdxcnR6TnFXTlN2d1NDcjVvZ1ZLWmpRK3Vib201aXV5cEM1WFRZVEsxclY2?=
 =?utf-8?B?UE5EeE9nbVdsMDgrWXc3Wm0wL29hazZPMWZydlJ3amJadWM3M08zSUlaMzFP?=
 =?utf-8?B?Y3ptTkgyS0oyZGNtMGExUGw5QlRJNE9QME51U29FMmY1bkhtS1hsbUs0MExU?=
 =?utf-8?B?M0xFWkZCZDBHU2VwdHptdnVLZld4RUt0eUZibkt0L0hnMHdMMk5USllJNDlM?=
 =?utf-8?B?d2YzVFlEVEppbkZad3YrVG1TZEtBeWhhWXNVbFcwL2hKZ1dtY2VGems3M1NL?=
 =?utf-8?B?cStFWmR6a1RiWnBKMnJ1eW5WSFBBd1NNT0hjbFZ5a3ZYMDdJejBFenQ3b2lm?=
 =?utf-8?B?Q3VxWEZTcklHWXhMS0l2UXJHZ3RrUER1Y2FzeEJQbU5raVdiN3AxT2Vpekho?=
 =?utf-8?B?MmNrYnA3WGhIUk44cDNzdTJaNDJNY0Nxa0ZTc2Z5Y2I1bHZ1NXZkUlBCcnVD?=
 =?utf-8?B?TFVUV05aR2F1TlJtNDNuSGRCM1FYWU9henVxY2pZVWduSlpIVTgzbU8xMjNo?=
 =?utf-8?B?dTNYNnhmZHZIcGZzb0NEN2NjdjcxUTJjd2hnSjlKWkptT015K0lEdnpuekgv?=
 =?utf-8?B?UWgvZ3BuRUVDL2RrYWE3eUh5Y3J5V0NxaDlpZ3BUTXByUG9tTzhDOFJQRzlv?=
 =?utf-8?B?YlJyTjRiK1VWNlEwYVZSM1prL1JjTGY3bVExbFJ1V2hqaXdZL1hFV3BiV09k?=
 =?utf-8?B?Q3FSY0dISWNHWHJEZzF0THZwZXd2TFlsWEdxNTg2bzQxZGUxVmp1T2o4MzF4?=
 =?utf-8?B?dFBtaHk0L24ycEN2SDBCbUJPbVUveEFidFNqR2FFMzB2NWxuSWtuc2JTSXpw?=
 =?utf-8?B?MmFERDY2TXpxZ3pUK0ZFd2JqZGNUb0JPc1o2ejRUVk8zc1cvQ201R2V5NWV2?=
 =?utf-8?B?VUN1dWk2cnB2TXpzbWdUY2FYc01zd0t6R05rZUZIMTBKWGw2Z3c4UytKMWI0?=
 =?utf-8?B?V20xK1JOTzVTNXd2elpKcnp3Qnkyb2RaS2cxNmxRUmVDd2tkMFBTOGxGM2M1?=
 =?utf-8?B?Q2JWTFp3OUdweE8wY1ltd3ZLdnV3bDZwMGVMNE41KzRSbGVDSjhpWE5lLzZC?=
 =?utf-8?B?a1k0c095Z3JWQnV5eTEzOXpGYVpIdmFFSnlRMWliWlhBYkVncUc2a2ZVK3l2?=
 =?utf-8?B?aGErWVFTUnZxN3RWcDRsZlp1MTQ2N1hMbnF1bFZLMHJ6b2RnZXhmZVZCcUVG?=
 =?utf-8?B?KytNVXNVWHNveEcveTdSeTI3bUNBZnI5Y01pbGVvUlJnK3FaSEFkSGd6T1p3?=
 =?utf-8?B?SkZyd3hlTWVpU1NpYTAzZTNpMDIySG14UWtKQUVYSklINW1JQTl3RGgxRVR2?=
 =?utf-8?B?Tm1MdGY5SlJ1ZmxTY1BRVGNjSDE5c24wR2E0Snc2dXlrZmJRWCtIWDQ4SEh5?=
 =?utf-8?B?UmxiRW1tVE16b2F3dWRSbWFtbUhBU1Y0S0Z0TzZYYVJ2ZFh4SmJWaE56SFA3?=
 =?utf-8?B?VFQ1ZDltTHdnWnJFNEhTZ2NUak12Q2k3WjEyR2xSQmFwNEV3ZUhZMDhaMHVX?=
 =?utf-8?B?UHc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5ea75e2b-e369-41e1-8fd4-08da8c1f174d
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 13:37:19.2773
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YVNuagLHSXiokL0ByUV64wQNjRCY+zjK4/A9UQ9ajZV49YUbq1PRnN83F5v6hSqanTGcWdvKKLPXErEYkzBv/GLCFsek2/a/nlyPoQ1gLRg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1682
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

DRM depends on IOMEM and DMA, introduce an additional Kconfig to pull in
IOMEM and DMA emulation on UML.
Since --kconfig_add usage is no longer needed, remove it from
documentation.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 Documentation/gpu/drm-internals.rst | 7 +------
 drivers/video/Kconfig               | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
index 5fd20a306718..c264a9587d21 100644
--- a/Documentation/gpu/drm-internals.rst
+++ b/Documentation/gpu/drm-internals.rst
@@ -228,16 +228,11 @@ follows:
 
 .. code-block:: bash
 
-	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests \
-		--kconfig_add CONFIG_VIRTIO_UML=y \
-		--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=y
+	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests
 
 .. note::
 	The configuration included in ``.kunitconfig`` should be as generic as
 	possible.
-	``CONFIG_VIRTIO_UML`` and ``CONFIG_UML_PCI_OVER_VIRTIO`` are not
-	included in it because they are only required for User Mode Linux.
-
 
 Legacy Support Code
 ===================
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0587e21abad9..f3266c9fa8a6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -52,5 +52,9 @@ if FB || SGI_NEWPORT_CONSOLE
 
 endif
 
+config DRM_UML_IO_EMULATION
+	def_bool y if UML && KUNIT
+	select UML_DMA_EMULATION
+	select UML_IOMEM_EMULATION
 
 endmenu
-- 
2.37.3