From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD1A4C64ED6 for ; Mon, 27 Feb 2023 16:16:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230116AbjB0QQz (ORCPT ); Mon, 27 Feb 2023 11:16:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbjB0QQv (ORCPT ); Mon, 27 Feb 2023 11:16:51 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF7F523644 for ; Mon, 27 Feb 2023 08:16:45 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id d30so28039393eda.4 for ; Mon, 27 Feb 2023 08:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=wFyoSbv6lM2ZYA0XKND1Vd4lvACB9TtZGPdAO/DFomU=; b=BBsBrhRnL9S4IyIxzC9dVFIbwDl5CXusloqIF01eKfx3uC+NIWBgm3oU9AWbXeFgPB q+hm1cn2KJK78ZEWn1cp9Ngi2g4e4tPo4WaQ3GE4Mdhxv3uoW3/dNshBFOLlYVQ5yaJK Pbk5CABrmaIlVmbQa8KjvZXPG0IbInaU/QOb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wFyoSbv6lM2ZYA0XKND1Vd4lvACB9TtZGPdAO/DFomU=; b=oAWog3I8QQLNZpuZ/V/Pb9mCQh7IUFQQIskEem4bDkl+BeSxGbs/LWKb4bbTtyMfza 2GTTYTDVB+LfST9ufYbhDRPWYwd8RPFwslNdH/MUfEV5friUxtjSqyVKO2/kLexO1w9H DUsVG1ce5+QwFDRwhKMAPUUGekhrJlp+RC0EdQ8mUWcgEmw3FOR+WsrRsFJtH7q2qhPa R/mhG4uBHaKr1UpytZU97dQHT1/up+TZBsfhQbTkujr+lI16V0ufIYqjEN24Z6R6gi8Z 8qnHZpTHMX7WmEbV1I9u6lEv1GQe2mbgq3GjdBISNSII51fnIB+K1xp5is9sxDi37fCh EFeg== X-Gm-Message-State: AO0yUKVXntRl30o2AwoxPhw/nLiqmxpylYM9NqteW9ASRqI2+p9lGAg4 Ha/i2ZdCc2oK8P9V8bVVXEftcrSiSnt9lJ1b X-Google-Smtp-Source: AK7set9kqeABoH7vQQMqktjGPSGxHqBdJjj+AUz9bhnFiRdnxBnmtt8faLs94MbyQT6LGQXBl3UxTw== X-Received: by 2002:a17:906:530b:b0:878:5946:c0ac with SMTP id h11-20020a170906530b00b008785946c0acmr30853558ejo.3.1677514604406; Mon, 27 Feb 2023 08:16:44 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-33.fiber7.init7.net. [212.51.149.33]) by smtp.gmail.com with ESMTPSA id rk20-20020a170907215400b008b9d2da5343sm3377765ejb.210.2023.02.27.08.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 08:16:43 -0800 (PST) Date: Mon, 27 Feb 2023 17:16:41 +0100 From: Daniel Vetter To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Chia-I Wu , Ryan Neph , Dmitry Osipenko , Gerd Hoffmann , Rob Clark , David Airlie , Gurchetan Singh , Daniel Vetter , "open list:VIRTIO GPU DRIVER" , open list Subject: Re: [PATCH v2] drm/virtio: Add option to disable KMS support Message-ID: Mail-Followup-To: Rob Clark , dri-devel@lists.freedesktop.org, Chia-I Wu , Ryan Neph , Dmitry Osipenko , Gerd Hoffmann , Rob Clark , David Airlie , Gurchetan Singh , "open list:VIRTIO GPU DRIVER" , open list References: <20230227160114.2799001-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230227160114.2799001-1-robdclark@gmail.com> X-Operating-System: Linux phenom 6.0.0-6-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 27, 2023 at 08:01:13AM -0800, Rob Clark wrote: > From: Rob Clark > > Add a build option to disable modesetting support. This is useful in > cases where the guest only needs to use the GPU in a headless mode, or > (such as in the CrOS usage) window surfaces are proxied to a host > compositor. > > v2: Use more if (IS_ENABLED(...)) > > Signed-off-by: Rob Clark This feels a bit much like a worksforus solution. Not objecting to landing this, but would some kind of feature bit on the virtio hw and autodetection in the guest driver side work? Especially if people ever want to get this to a Just Works model with standard distros. Usually the argument for compile option is "binary size", but you're leaving most of the kms stuff in there so that's clearly not it :-) -Daniel > --- > drivers/gpu/drm/virtio/Kconfig | 11 +++++++++ > drivers/gpu/drm/virtio/Makefile | 5 +++- > drivers/gpu/drm/virtio/virtgpu_drv.c | 6 ++++- > drivers/gpu/drm/virtio/virtgpu_drv.h | 10 ++++++++ > drivers/gpu/drm/virtio/virtgpu_kms.c | 35 ++++++++++++++++------------ > 5 files changed, 50 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/Kconfig b/drivers/gpu/drm/virtio/Kconfig > index 51ec7c3240c9..ea06ff2aa4b4 100644 > --- a/drivers/gpu/drm/virtio/Kconfig > +++ b/drivers/gpu/drm/virtio/Kconfig > @@ -11,3 +11,14 @@ config DRM_VIRTIO_GPU > QEMU based VMMs (like KVM or Xen). > > If unsure say M. > + > +config DRM_VIRTIO_GPU_KMS > + bool "Virtio GPU driver modesetting support" > + depends on DRM_VIRTIO_GPU > + default y > + help > + Enable modesetting support for virtio GPU driver. This can be > + disabled in cases where only "headless" usage of the GPU is > + required. > + > + If unsure, say Y. > diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile > index b99fa4a73b68..24c7ebe87032 100644 > --- a/drivers/gpu/drm/virtio/Makefile > +++ b/drivers/gpu/drm/virtio/Makefile > @@ -4,8 +4,11 @@ > # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. > > virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o virtgpu_vram.o \ > - virtgpu_display.o virtgpu_vq.o \ > + virtgpu_vq.o \ > virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ > virtgpu_ioctl.o virtgpu_prime.o virtgpu_trace_points.o > > +virtio-gpu-$(CONFIG_DRM_VIRTIO_GPU_KMS) += \ > + virtgpu_display.o > + > obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio-gpu.o > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c > index ae97b98750b6..9cb7d6dd3da6 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -172,7 +172,11 @@ MODULE_AUTHOR("Alon Levy"); > DEFINE_DRM_GEM_FOPS(virtio_gpu_driver_fops); > > static const struct drm_driver driver = { > - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC, > + .driver_features = > +#if defined(CONFIG_DRM_VIRTIO_GPU_KMS) > + DRIVER_MODESET | DRIVER_ATOMIC | > +#endif > + DRIVER_GEM | DRIVER_RENDER, > .open = virtio_gpu_driver_open, > .postclose = virtio_gpu_driver_postclose, > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index af6ffb696086..ffe8faf67247 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -426,8 +426,18 @@ virtio_gpu_cmd_set_scanout_blob(struct virtio_gpu_device *vgdev, > uint32_t x, uint32_t y); > > /* virtgpu_display.c */ > +#if defined(CONFIG_DRM_VIRTIO_GPU_KMS) > int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > +#else > +static inline int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev) > +{ > + return 0; > +} > +static inline void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev) > +{ > +} > +#endif > > /* virtgpu_plane.c */ > uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc); > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c > index 27b7f14dae89..70d87e653d07 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c > @@ -161,7 +161,8 @@ int virtio_gpu_init(struct virtio_device *vdev, struct drm_device *dev) > if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_VIRGL)) > vgdev->has_virgl_3d = true; > #endif > - if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_EDID)) { > + if (IS_ENABLED(CONFIG_DRM_VIRTIO_GPU_KMS) && > + virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_EDID)) { > vgdev->has_edid = true; > } > if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) { > @@ -218,17 +219,19 @@ int virtio_gpu_init(struct virtio_device *vdev, struct drm_device *dev) > goto err_vbufs; > } > > - /* get display info */ > - virtio_cread_le(vgdev->vdev, struct virtio_gpu_config, > - num_scanouts, &num_scanouts); > - vgdev->num_scanouts = min_t(uint32_t, num_scanouts, > - VIRTIO_GPU_MAX_SCANOUTS); > - if (!vgdev->num_scanouts) { > - DRM_ERROR("num_scanouts is zero\n"); > - ret = -EINVAL; > - goto err_scanouts; > + if (IS_ENABLED(CONFIG_DRM_VIRTIO_GPU_KMS)) { > + /* get display info */ > + virtio_cread_le(vgdev->vdev, struct virtio_gpu_config, > + num_scanouts, &num_scanouts); > + vgdev->num_scanouts = min_t(uint32_t, num_scanouts, > + VIRTIO_GPU_MAX_SCANOUTS); > + if (!vgdev->num_scanouts) { > + DRM_ERROR("num_scanouts is zero\n"); > + ret = -EINVAL; > + goto err_scanouts; > + } > + DRM_INFO("number of scanouts: %d\n", num_scanouts); > } > - DRM_INFO("number of scanouts: %d\n", num_scanouts); > > virtio_cread_le(vgdev->vdev, struct virtio_gpu_config, > num_capsets, &num_capsets); > @@ -246,10 +249,12 @@ int virtio_gpu_init(struct virtio_device *vdev, struct drm_device *dev) > virtio_gpu_get_capsets(vgdev, num_capsets); > if (vgdev->has_edid) > virtio_gpu_cmd_get_edids(vgdev); > - virtio_gpu_cmd_get_display_info(vgdev); > - virtio_gpu_notify(vgdev); > - wait_event_timeout(vgdev->resp_wq, !vgdev->display_info_pending, > - 5 * HZ); > + if (IS_ENABLED(CONFIG_DRM_VIRTIO_GPU_KMS)) { > + virtio_gpu_cmd_get_display_info(vgdev); > + virtio_gpu_notify(vgdev); > + wait_event_timeout(vgdev->resp_wq, !vgdev->display_info_pending, > + 5 * HZ); > + } > return 0; > > err_scanouts: > -- > 2.39.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch