Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3046728pxf; Mon, 5 Apr 2021 01:29:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5wyXWR6ZJPKPNALNU+Th4tU/z+iMOkSlv6RJv58c2AQc8OjChv3FZEOnSuyN9GF5hcuPX X-Received: by 2002:a92:c7c5:: with SMTP id g5mr6746146ilk.122.1617611348713; Mon, 05 Apr 2021 01:29:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617611348; cv=none; d=google.com; s=arc-20160816; b=BeSovfT8UTEYx9lwiUvJvdzwOhQAEZkwPh2iVdZGHQUSgxaGxt6t3zjQLXEZZpriod MPC2PGn4J2Mdd5ZWx6UnFZPIn92pcfACODXCQ2q7ySZXtCu00BiLk/EWHS/9wF7lzTHX a9WtnhA0GAxZkuJSjpHZm6CWPXISf24YShdOh4WIqHDIzrjC4du9IuTRn2ThpY3yMP17 LtZnRshb76oJovRoZIlgWUHzKwEBoFugrXV75Tg/YoDkOsDlUamcQJonqdgc8uTB59g0 U3PKAjbTu0o9txrV2KrRwy7oYbbzz20q1Kpb7NR3MFGcptspdxj1hWAxEfgs5Orhyw1v kvfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=KnebAHcN/54k3ocGY8IQZpxhBTA+JacuxCbZLGW2F6M=; b=Yk92CONpDfreKIMWFYl57pzmAZsnj0aakGiuMNylR+diga52omva5IOXFoLHDGuJxY Ppzqja+jlVWSJo5fuxTv08YTsZXvzGqqK8g5Ke7ThZrIw0kNhfjLIMO7Iyvn79CXoAMC f9PsLpEcIkk87aQHoto3+UgxcoUi1x+KY3peYzbJvStOegenKQtH4AXUxyBVI8Uv/I6X ksQ+u17c1D19faMRK3LFw8nNYzsLYFBm5XTg7BUDQqpVgNmCh+o4z0WjOkuXeGnPSMnV XUvYWz0Zo3umdT3hUEU6cjwL9J3vZCdwUKse3OToy9rC5yIXgX0Xdgviov53v1hAdK/K rK6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ua0bVxmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w29si13409366iox.12.2021.04.05.01.28.55; Mon, 05 Apr 2021 01:29:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ua0bVxmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbhDEGQD (ORCPT + 99 others); Mon, 5 Apr 2021 02:16:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbhDEGQB (ORCPT ); Mon, 5 Apr 2021 02:16:01 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 953B8C061756 for ; Sun, 4 Apr 2021 23:15:56 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id l76so7497664pga.6 for ; Sun, 04 Apr 2021 23:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=KnebAHcN/54k3ocGY8IQZpxhBTA+JacuxCbZLGW2F6M=; b=ua0bVxmT3RlBXKcGp+t3tpgtFXIBR2pCQr7tNkEmSSyyXQ6mNb0RfV5MnaajHpchBM m98oOtqSCiiP6+XyX3hJfv3i93wfsTaeLN2qSSmgwVcdb3X3BTA5ZU1bEUX31YyS1th3 J/SNG15JiNFugT9xJdsIMJHfvbiPjh9vXqMsbj1+ZGbJEuvyHUvgVchUr+4yLHmG9yl1 yifT7xkScQzxox+dmSfJUnXiKwhHLaXxsN7uAqlPKxaDYUGwGMz0YJ/obGiUp1n7Iax2 jiHNlgasqXgAPTq0LUZc8K0BzQ790WwF/61kXAi63eP2wU72t7GKIzFGw5tKHuYxU/ja ubdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=KnebAHcN/54k3ocGY8IQZpxhBTA+JacuxCbZLGW2F6M=; b=nRlpLr3q74aDO8xeKFAQ/HH4yWQOJTTd+JaPIDDOf4g6n5Hd5sBz3oynOh+6qu+I7D 8MRuaNoWA8Or6fOVMg2zzU3Vhvg+Y3trD7W8aY15aOH7d+immVpk5g3pbEsDH295Oy3F zQfbiuS5nSgbFdwGxdXMdRJkO6hwY2nNQK+VVac7siDlH4KRowQOjsI9L9zi0j4uai1W bMkFvQfKQcppBEHP4AT6m8iLBb1B+kjMTI272O3hq/O5FODncUtaGZlvjNfs3Vb81ga6 WqDdEAz1iKxCFqMcvOMJrwJO8hEStznAmFS5aqKA21MA3aLTITDR8jDsLIjrm7wfy8OY +/nA== X-Gm-Message-State: AOAM530Xgi6OWnVfLWDbZ0sqag7V8LPZa/7QxoGXc5W9L7edp3wXrGTL 9qoxFDhauHzeQxIZf6yb4z0= X-Received: by 2002:a63:570b:: with SMTP id l11mr21862901pgb.193.1617603356215; Sun, 04 Apr 2021 23:15:56 -0700 (PDT) Received: from adolin ([49.207.194.193]) by smtp.gmail.com with ESMTPSA id a13sm13925244pgm.43.2021.04.04.23.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Apr 2021 23:15:55 -0700 (PDT) Date: Mon, 5 Apr 2021 11:45:51 +0530 From: Sumera Priyadarsini To: melissa.srw@gmail.com Cc: rodrigosiqueiramelo@gmail.com, hamohammed.sa@gmail.com, daniel@ffwll.ch, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 2/2] drm/vkms: Add support for virtual hardware mode Message-ID: <062516fb20fdd8408f10b657cb280d89d59bbc34.1617602076.git.sylphrenadin@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a virtual hardware or vblank-less mode as a module to enable VKMS to emulate virtual graphic drivers. Add a new drm_crtc_helper_funcs struct, vkms_virtual_crtc_helper_funcs() which holds the atomic helpers for virtual hardware mode. Change the existing vkms_crtc_helper_funcs struct to vkms_vblank_crtc_helper_funcs which holds atomic helpers for the vblank mode. This makes the code flow clearer and easier to test virtual hardware mode. The first patch of this patchset added the function vkms_crtc_composer() for plane composition which is used in case of vblank-less mode and is directly called in the atomic hook in vkms_crtc_atomic_begin(). However, some crc captures still use vblanks which causes the crc-based igt tests to crash. Currently, I am unsure about how to approach the one-shot implementation of crc reads so I am still working on that. This patchset has been tested with the igt tests- kms_writeback, kms_atomic, kms_lease, kms_flip, kms_pipe_get_crc and preserves results except for subtests related to crc reads and skips tests that rely on vertical blanking. This patchset must be tested after incorporating the igt-tests patch: https://lists.freedesktop.org/archives/igt-dev/2021-February/029355.html . The patch is based on Rodrigo Siqueira's patch(https://patchwork.freedesktop.org/patch/316851/?series=48469&rev=3) and the ensuing review. Signed-off-by: Sumera Priyadarsini --- Changes in V3: - Refactor patchset(Melissa) Changes in V2: - Add atomic helper functions in a separate struct for virtual hardware mode (Daniel) - Remove spinlock across 'vkms_output->lock' in vkms_crtc.c(Daniel) - Add vkms_composer_common() (Daniel) --- drivers/gpu/drm/vkms/vkms_crtc.c | 51 +++++++++++++++++++++++--------- drivers/gpu/drm/vkms/vkms_drv.c | 18 +++++++---- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 51 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 57bbd32e9beb..e6286f98d5b6 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -222,20 +222,20 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, return 0; } -static void vkms_crtc_atomic_enable(struct drm_crtc *crtc, - struct drm_atomic_state *state) +static void vkms_vblank_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_state *state) { drm_crtc_vblank_on(crtc); } -static void vkms_crtc_atomic_disable(struct drm_crtc *crtc, - struct drm_atomic_state *state) +static void vkms_vblank_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_atomic_state *state) { drm_crtc_vblank_off(crtc); } -static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, - struct drm_atomic_state *state) +static void vkms_vblank_crtc_atomic_begin(struct drm_crtc *crtc, + struct drm_atomic_state *state) { struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc); @@ -245,8 +245,8 @@ static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, spin_lock_irq(&vkms_output->lock); } -static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, - struct drm_atomic_state *state) +static void vkms_vblank_crtc_atomic_flush(struct drm_crtc *crtc, + struct drm_atomic_state *state) { struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc); @@ -268,18 +268,38 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, spin_unlock_irq(&vkms_output->lock); } -static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = { +/* + * Crtc functions for virtual hardware/vblankless mode + */ +static void vkms_virtual_crtc_atomic_flush(struct drm_crtc *crtc, + struct drm_atomic_state *state) +{ + struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc); + struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(crtc->state); + + vkms_crtc_composer(vkms_state); + + vkms_output->composer_state = to_vkms_crtc_state(crtc->state); +} + +static const struct drm_crtc_helper_funcs vkms_vblank_crtc_helper_funcs = { .atomic_check = vkms_crtc_atomic_check, - .atomic_begin = vkms_crtc_atomic_begin, - .atomic_flush = vkms_crtc_atomic_flush, - .atomic_enable = vkms_crtc_atomic_enable, - .atomic_disable = vkms_crtc_atomic_disable, + .atomic_begin = vkms_vblank_crtc_atomic_begin, + .atomic_flush = vkms_vblank_crtc_atomic_flush, + .atomic_enable = vkms_vblank_crtc_atomic_enable, + .atomic_disable = vkms_vblank_crtc_atomic_disable, +}; + +static const struct drm_crtc_helper_funcs vkms_virtual_crtc_helper_funcs = { + .atomic_check = vkms_crtc_atomic_check, + .atomic_flush = vkms_virtual_crtc_atomic_flush, }; int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor) { struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc); + struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev); int ret; ret = drm_crtc_init_with_planes(dev, crtc, primary, cursor, @@ -289,7 +309,10 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, return ret; } - drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); + if (vkmsdev->config->virtual_hw) + drm_crtc_helper_add(crtc, &vkms_virtual_crtc_helper_funcs); + else + drm_crtc_helper_add(crtc, &vkms_vblank_crtc_helper_funcs); spin_lock_init(&vkms_out->lock); spin_lock_init(&vkms_out->composer_lock); diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 2173b82606f6..945c4495d62a 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -44,6 +44,11 @@ static bool enable_writeback = true; module_param_named(enable_writeback, enable_writeback, bool, 0444); MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector support"); +static bool enable_virtual_hw = false; +module_param_named(enable_virtual_hw, enable_virtual_hw, bool, 0444); +MODULE_PARM_DESC(enable_virtual_hw, "Enable/Disable virtual hardware mode(virtual \ +hardware mode disables vblank interrupts)"); + DEFINE_DRM_GEM_FOPS(vkms_driver_fops); static void vkms_release(struct drm_device *dev) @@ -159,12 +164,14 @@ static int vkms_create(struct vkms_config *config) goto out_devres; } - vkms_device->drm.irq_enabled = true; + vkms_device->drm.irq_enabled = !vkms_device->config->virtual_hw; - ret = drm_vblank_init(&vkms_device->drm, 1); - if (ret) { - DRM_ERROR("Failed to vblank\n"); - goto out_devres; + if (!vkms_device->config->virtual_hw) { + ret = drm_vblank_init(&vkms_device->drm, 1); + if (ret) { + DRM_ERROR("Failed to vblank\n"); + goto out_devres; + } } ret = vkms_modeset_init(vkms_device); @@ -198,6 +205,7 @@ static int __init vkms_init(void) config->cursor = enable_cursor; config->writeback = enable_writeback; + config->virtual_hw = enable_virtual_hw; return vkms_create(config); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 538315140585..a44f530ffaf0 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -85,6 +85,7 @@ struct vkms_device; struct vkms_config { bool writeback; bool cursor; + bool virtual_hw; /* only set when instantiated */ struct vkms_device *dev; }; -- 2.25.1