From patchwork Thu Sep 1 13:36:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 12962675 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57753C0502C for ; Thu, 1 Sep 2022 13:37:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D939110E710; Thu, 1 Sep 2022 13:37:30 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B7D510E710 for ; Thu, 1 Sep 2022 13:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662039447; x=1693575447; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=QbKgOqONOs31kIwm2z1V2vDM6fGmIlyn1NQgRVDcd8c=; b=WPmWpKgH5vYuiul8tUKSa4zKydlE4+4nfY/AsmF5MLLxGZgdiyTccUjB RNVYWSfZR2DdSsB/IezCZT8wddNWWpol84GC14uGJ37En5B1cPUTQnwCI /jIFb4HzblkJIMPu53nraV1gcGlhSo5UL27d4Z5oBLTIBkIm4UjOI4bDx mPbreZwq/25Umz08OfbgVjws5q2xaf2d0fmacMIuys9/uNVzlXJewvNXO QZWCPD4J2TUmTWMoUQccNBNy+7qJ+s+9YHGSURl5/oR54vMFHxfHDCoHc MlMj86JzPI0a2WyHCD1d5ko0OcWfS/AJnK3J0DVi6R49CxdtCM77wEpch g==; X-IronPort-AV: E=McAfee;i="6500,9779,10457"; a="278731922" X-IronPort-AV: E=Sophos;i="5.93,280,1654585200"; d="scan'208";a="278731922" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2022 06:37:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,280,1654585200"; d="scan'208";a="645655762" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga001.jf.intel.com with ESMTP; 01 Sep 2022 06:37:21 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 1 Sep 2022 06:37:21 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Thu, 1 Sep 2022 06:37:21 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.175) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 1 Sep 2022 06:37:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j4HVnBlNL1RjhszoNxND6i/DGA1xpM254/2LgUk01xffzCYYXjxadnzZxNBPLRn2pE6OhAdUkvzuxgS7pWPrrGAzYI2oExpDGWv+SZBIp3k9TIWjiG6wRdc8Ilt+ptmzlsElQBupvTyCpiuAFV9pzhjsTLIikhtIGyyGuAE3Yf0WcM0giP5PwSlWzo8cR1ey1zLJQFJCOkRED7/twcSehhH3uRo8wm7jooJPEFhaFptIp+q/G1s5UNxUW3merDmc8xL5jJD3BPrWWSurHW5hIY3zbppm4OGlVTfOPrMdEwgPmuJXwe3K1f+MpXe0U5EP/77saT8Q9liKwIa9Gn3EMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DmNuE9o9FyblXfqbdb5e3nIOPWul0lvi6dgKR6Qd2Fc=; b=bF5koSiGm80t84oLw9Ap65Gd4FPfIA0RbJJwSFD4RbPyq5FpircKFARIqX1uDOpiNMBXkbTC9468ZWWuX/qfg2w5Flclh3a8xUeBdN6heN9e+HcUOkifsCXOjLGTQzndSR8DNWOuc9cKQm20JHm+fyVWIl+rm7FlagmnU4uhBsY0JqbRN0S08h5fIPXpdpf9NZhD4gZ6EZuM1FGD25Buj4Rc6FSfSi04ByXwMPXMoQvXqfVjGIpD7Wzgt6CQpeZbTBUgkZGZntTuXL7umhkZGUWK0csCC7a0cSJ1omPjgbGHz6JJ09Qnkgga54sbDBe0dfgd26DGY634pQhk+oX0jA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by BN6PR11MB1682.namprd11.prod.outlook.com (2603:10b6:404:3e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Thu, 1 Sep 2022 13:37:19 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::b04c:807c:4ea0:c62e]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::b04c:807c:4ea0:c62e%9]) with mapi id 15.20.5588.011; Thu, 1 Sep 2022 13:37:19 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , 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> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: FR3P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::17) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ea75e2b-e369-41e1-8fd4-08da8c1f174d X-MS-TrafficTypeDiagnostic: BN6PR11MB1682:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pqw33bElAbHi94xVY/FfcEvqTPigb0UbVkR79f5o2ymlMJUQJw7J/FvTz8AuUP2RELJHKXhUukJ+zctR7GaJtSNiGfY9+2ohFXe/urFA4gRw6P2ik/4kkW1mx1jl+XgiRBdKLSdBCcuZ63jqWp+le63ZMfD2bG3Fh9uivdFLH3UX2DwmfxhfG+3V7klW/jeCZSIPIpLoVI8gdP+tDQJl4YgpbpSwChYi65IDFiKyBDqtMsOkhY3+JpQY0bgyCLlVUsCbM/V6l0HUdKZ5wBKu7dsVXpm0BMK7Gvk14CtlYQ7tDetMXg0Yaslw1l++bD+on80vBTvyGdQ/AwmLFvOvtdbLQHEsVJXUxargU04E2bEmjCciUTAszfLoe2sKhWr9W/llQr43covVVOV/nyYaCImOkcNC0osXC/t+0Im0GrbDnTB2L8T+jgUAO0FGKjpkBeD8Kb/EMz+Y4TECLN2HfP/SIpSGyY0X0Fr1+/A/miPzN+lT/MriKOAmvD2XTxk3jsopYJ++NSWbWF3JwfAmr7oDwg+uHnHe3rU1+PoqgbJbKFFJbZLstT5D/75hjg2ZPN/8ckRXCEsfTednOVFWGvpHit3A6EdFaYHa0JLDPjsEVkXoOtQuzTxp7TgJJAFFJFLE5n719YuN1appx/6baW0gM3KbZ3rRyrTn50A6cjINeLji5NMnp0z6aERLxVS0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(136003)(39860400002)(396003)(346002)(376002)(366004)(83380400001)(6666004)(86362001)(41300700001)(6506007)(186003)(2616005)(1076003)(26005)(6512007)(82960400001)(38100700002)(8936002)(54906003)(7416002)(316002)(5660300002)(36756003)(4326008)(8676002)(66476007)(66556008)(66946007)(478600001)(6486002)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?M0ohTJBBp05Ps2HtU39xS0htkhEY?= =?utf-8?q?J5/NQylOtEAu+vhpapmnQrYPGrlljquzzThBedddPUSy/FUeDuN2kej5Dupq5ucLu?= =?utf-8?q?mY9a6MqklVAiCbMMUADIYUTEwScxOdbjqVoDpZ3b1M60xpTwE7hPXRhZvYTRLUXlo?= =?utf-8?q?tUWsjRZvGmRXhVcxCDzeic+75o9g7preQK+gY4Ha33JXQg7Cns0wieapPOh9ZUXhk?= =?utf-8?q?Fh8NdaJyH4HisvHQqqMUhY0o8m1fIIHgOdSA8/bPxkGYRsR5M8Zl41akGFnLNpRzW?= =?utf-8?q?2xuuP41dvwlj3QpNTaVa20QirlIX3o1jxxwYEeqRKnHDjp4EhVSHHa3edf4F5BB1J?= =?utf-8?q?l7QmoNjRG6+ElahmqeCAjdM50DX5aGBdfNfIDPaf+LBGHgiuSaXZ7x+Xy4HDfzUES?= =?utf-8?q?uKpHWUkqrFZTQO8ESuE0CMVbC/gh1HsOYEjnkaHwCBoT1GTAJkFodR/0B6PTAOz3/?= =?utf-8?q?D+fqv2oJXXZZYGqrtzNqWNSvwSCr5ogVKZjQ+ubom5iuypC5XTYTK1rV6PNDxOgmW?= =?utf-8?q?l08+Yw7Zm0/oak6O1frvRwjbZuc73O3IIZ31OczmNH2KJ2dcm0a1Pl9BTI4OP0NuS?= =?utf-8?q?oE2f5nHmKXlmK40LT3LEZFBd0GSeptzmvuKfWxEKtyFbnKt/Hg0wL2NTJYI49Lwf3?= =?utf-8?q?TYDTJinFZwv+TmSdKAyhaYsUlW0/hJgWmceFzk73SKq+EZdzkTbZpJ2ruynVHPAwS?= =?utf-8?q?MOHclVykvX07Iz0Ezt7oifCuqXFSrIGYxLKIvQrGgtkPDucasxBPmNkiWb7p1Oeiz?= =?utf-8?q?Hh2ckbp7XhHRN8p3su2Z42McCqkFSsfycb5lvu5vdRPBruCLUTWNZGauNRm43nHdB?= =?utf-8?q?3QXYOazuqcjYUgnJZHU83mO123hu3X6xfdvHpfsoCD7ccv71Q2cwhgJ9JZJmOMy+I?= =?utf-8?q?DvznzH/Qh/gpnEEC/dkaa7yHycryWCqh9igpTMprPomO8C8RPG9obRrN4b+UV6Q0a?= =?utf-8?q?VR3Zk/RcLf7mQ1lRuWhjiwY/XEWpbWOdCqRcGHIcGXrDg1tLvpewvLYlXGq586o41?= =?utf-8?q?de1VjuOj831xtPmhy4/n2pCvH0BmBOmU/xAbtSjGaE30v5lnIknsbSIzp2aDD66Mz?= =?utf-8?q?qgzT+FEwbjdcToBOsZ6z4TVO3sW/Cm5Gey5evUCuui6rpvMzsmgTcaXsMswKzGNke?= =?utf-8?q?FH10JXl6gw8S+J1b4Wm1+RNO5S5wvzZJrzwBy2odZKg16lQReCwkd0PS8lF3c5CbV?= =?utf-8?q?LZw9GpxO0cYmwvKvuwl6p0eL4N5+4RleCJ8iXNe/6BkY4sOygrVBuyy139zFaZHva?= =?utf-8?q?EJyQ1ibZXAbEgqG6kfU+yvha+YQSRvq7tVp4lfZu1467XLnqulVK0rzodgexfeVBq?= =?utf-8?q?EF++MUsUXsoxG/y7Ry27mCAfr9cMileoRRg+qZHAdHgzOZwJFrwxeMeiSSia03e3i?= =?utf-8?q?022HmxQkJAEXJIH5mIA9wDh1ETvNmLtf9JRuflScPQTccH19sn0Ga4Jw6uykfbQX+?= =?utf-8?q?HX48HHyRlbEmmTMzoawudRmammHASV4KFtO6XaRvdXxJbVhNzHP7TT5d9mLwgZrE4?= =?utf-8?q?HSgcTjMvCi7Z12GlRBap4EweHY08Z0uWPw=3D=3D?= 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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Micha=C5=82_Winiarski?= , Jonathan Corbet , David Airlie , Thomas Zimmermann , Helge Deller , Javier Martinez Canillas , David Gow , =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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