From patchwork Wed Apr 1 22:30:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 11469661 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F353081 for ; Wed, 1 Apr 2020 22:30:48 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CFCE72071A for ; Wed, 1 Apr 2020 22:30:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="eAhofONI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFCE72071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FA086E998; Wed, 1 Apr 2020 22:30:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A8886E998 for ; Wed, 1 Apr 2020 22:30:42 +0000 (UTC) Received: by mail-pj1-x1044.google.com with SMTP id ng8so702431pjb.2 for ; Wed, 01 Apr 2020 15:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1FpEmpyvHXdFRHZjmutAbnfg5IkHeyNnd1rOKAuAT4E=; b=eAhofONIHO5bL14mH6hapVDB9yvBv+0Nq1pubCNBsVNQVoOzFfL7cO5t7UFhcvvIb3 Faa4c62FZxw2RRZ9n0czhNWMfKV4velrCOo0k3KTOUTYse/KNSJTsC2QssAPj0nVV5AM 2EkQ7blAI5hj2XqIkMaFlFJR5FxKH3/AO0Qnw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1FpEmpyvHXdFRHZjmutAbnfg5IkHeyNnd1rOKAuAT4E=; b=Kh7ovXcm8Vr6KJRff6wR/t7U1DpHgqA2utMSNlNjSbNo37ixGizBkVDVJDGPrEMaBz kI5+DnKVc6t6cWK/GgcwNW45KP8AeCAVcHs5Wub9ZrDRzUe57erduM5+4t0K8LnFWsMy EW0lcAEoVdVEaMJqb3Bc8Fg/PZ50QkInkmWvRpWOFEd0TNbjGdv5XWmqQOLhpkiXKXkH DH/w77qnmeRKd2DGfXf1Z4lmBtrYMmI7ax7fcRTmQNKD6gkTi0rJwYdmPfZ4vs7kaJ88 SCS4fdTPMs5EjP4XOW+9fwKTuhT2//sNXUwPsQRPZ3SIsrlTNzqagHfSsUYApZd7+OXD lFJg== X-Gm-Message-State: AGi0PuY29yRr4hPZSu3vRYbNYkD5r9IBasra6xf0uWaAn8bRJeKXe8f2 0BMx+SXi9YW2fSvE1wXMb0HPLrXNlgs= X-Google-Smtp-Source: APiQypLqngtDnw9XPMZn9NaiVIkINTZtWHAyBd8a+bIpK1dV2NZNdRtd3kDpi/bRuJMxRLmdU5WVgg== X-Received: by 2002:a17:90a:368f:: with SMTP id t15mr265703pjb.23.1585780241685; Wed, 01 Apr 2020 15:30:41 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:202:201:bc97:5740:52a7:6875]) by smtp.gmail.com with ESMTPSA id w29sm2167311pge.25.2020.04.01.15.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2020 15:30:41 -0700 (PDT) From: Gurchetan Singh To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/5] drm/virtio: random virtgpu_drv.h cleanups Date: Wed, 1 Apr 2020 15:30:35 -0700 Message-Id: <20200401223039.2860-1-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 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: kraxel@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" - Static-ify virtio_gpu_gem_create - Delete unused prototypes - Point to current implementation files Signed-off-by: Gurchetan Singh Reviewed-by: Chia-I Wu --- drivers/gpu/drm/virtio/virtgpu_drv.h | 26 +++++++++----------------- drivers/gpu/drm/virtio/virtgpu_gem.c | 10 +++++----- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 824f9f15926cf..79ad176aca5a8 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -218,26 +218,18 @@ struct virtio_gpu_fpriv { struct mutex context_lock; }; -/* virtio_ioctl.c */ +/* virtgpu_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10 extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS]; -/* virtio_kms.c */ +/* virtgpu_kms.c */ int virtio_gpu_init(struct drm_device *dev); void virtio_gpu_deinit(struct drm_device *dev); void virtio_gpu_release(struct drm_device *dev); int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file); void virtio_gpu_driver_postclose(struct drm_device *dev, struct drm_file *file); -/* virtio_gem.c */ -void virtio_gpu_gem_free_object(struct drm_gem_object *gem_obj); -int virtio_gpu_gem_init(struct virtio_gpu_device *vgdev); -void virtio_gpu_gem_fini(struct virtio_gpu_device *vgdev); -int virtio_gpu_gem_create(struct drm_file *file, - struct drm_device *dev, - struct virtio_gpu_object_params *params, - struct drm_gem_object **obj_p, - uint32_t *handle_p); +/* virtgpu_gem.c */ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file); void virtio_gpu_gem_object_close(struct drm_gem_object *obj, @@ -263,7 +255,7 @@ void virtio_gpu_array_put_free_delayed(struct virtio_gpu_device *vgdev, struct virtio_gpu_object_array *objs); void virtio_gpu_array_put_free_work(struct work_struct *work); -/* virtio vg */ +/* virtgpu_vq.c */ int virtio_gpu_alloc_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, @@ -343,17 +335,17 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work); void virtio_gpu_notify(struct virtio_gpu_device *vgdev); -/* virtio_gpu_display.c */ +/* virtgpu_display.c */ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); -/* virtio_gpu_plane.c */ +/* virtgpu_plane.c */ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc); struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, enum drm_plane_type type, int index); -/* virtio_gpu_fence.c */ +/* virtgpu_fence.c */ struct virtio_gpu_fence *virtio_gpu_fence_alloc( struct virtio_gpu_device *vgdev); void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, @@ -362,7 +354,7 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, u64 last_seq); -/* virtio_gpu_object */ +/* virtgpu_object.c */ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo); struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev, size_t size); @@ -378,7 +370,7 @@ struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -/* virgl debugfs */ +/* virtgpu_debugfs.c */ void virtio_gpu_debugfs_init(struct drm_minor *minor); #endif diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 0d6152c99a271..90c0a8ea1708c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -28,11 +28,11 @@ #include "virtgpu_drv.h" -int virtio_gpu_gem_create(struct drm_file *file, - struct drm_device *dev, - struct virtio_gpu_object_params *params, - struct drm_gem_object **obj_p, - uint32_t *handle_p) +static int virtio_gpu_gem_create(struct drm_file *file, + struct drm_device *dev, + struct virtio_gpu_object_params *params, + struct drm_gem_object **obj_p, + uint32_t *handle_p) { struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_object *obj; From patchwork Wed Apr 1 22:30:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 11469663 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE89181 for ; Wed, 1 Apr 2020 22:30:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AD30C2071A for ; Wed, 1 Apr 2020 22:30:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Lm+XZ2oK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD30C2071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CF436E9B1; Wed, 1 Apr 2020 22:30:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by gabe.freedesktop.org (Postfix) with ESMTPS id 296C06E998 for ; Wed, 1 Apr 2020 22:30:43 +0000 (UTC) Received: by mail-pj1-x1041.google.com with SMTP id z3so682488pjr.4 for ; Wed, 01 Apr 2020 15:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vvIln4ea2cKUuBRn/jGt0NGfa231I0yrBgDkEYXyLHk=; b=Lm+XZ2oKaXCg38hsFMY5vwzyvt2VNSIySpErJWlob/U6vfnS6VurSGvzM+7kBocZI/ GLdLot/x5aJbjajSMD7Da2hfD3Qth7zTCWouJqve+o1sDzRSvHVoSLmZ20bl2WPuzzAD Q9dlf9c+/GhxfXF0zgRuWULmC/+wtdVxGcSf4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vvIln4ea2cKUuBRn/jGt0NGfa231I0yrBgDkEYXyLHk=; b=HFm4EyLSeoJRCt9nmttTz3KOcgY0s+7JKOIjbfzn73dPTUJUS+HL5tbEWhNz5tquO5 RC1gcW1DRvYL1Dx6Jt+dazfbCbaPbPAI2Uuyp7ZcMAjSLd3KJfUMQiIyrXh/rB/AI7tl D8NRm17Z0YIkbE4jHyYPmi1dNIT5y1xei60ppXxsZp+fcNBooMzHPKmm/Vl/GLhlyNK4 kOijz8/b+II4hLpA60v/Tx7mwgS3othdY+hP3biNNY3da/Rx8mNrK71iy/STiu7JE153 0gKKW3CDQSi9afeyqg6PJr+pWKHvRQAmCungospmoZLaCu94T21gBsbOclPIBa46y8u5 j5Mw== X-Gm-Message-State: AGi0Puar25dLoLRo4zXRyEnX+giE70/lq++oAeY93+cePeuid32NHteM /TyKvKMfWzbFC8YWGsTqvDFASsobDi4= X-Google-Smtp-Source: APiQypKcmm+LndDytd1AuEqylfrSjsG++4e+s/jnD0nUQxGLPKYIkqxZoX8aMJW2V0wnzHgY/K/P7Q== X-Received: by 2002:a17:902:ba8e:: with SMTP id k14mr68814pls.103.1585780242520; Wed, 01 Apr 2020 15:30:42 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:202:201:bc97:5740:52a7:6875]) by smtp.gmail.com with ESMTPSA id w29sm2167311pge.25.2020.04.01.15.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2020 15:30:42 -0700 (PDT) From: Gurchetan Singh To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/5] drm/virtio: delete notify after virtio_gpu_cmd_context_create Date: Wed, 1 Apr 2020 15:30:36 -0700 Message-Id: <20200401223039.2860-2-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200401223039.2860-1-gurchetansingh@chromium.org> References: <20200401223039.2860-1-gurchetansingh@chromium.org> MIME-Version: 1.0 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: kraxel@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The first 3D ioctl will take care of notification. Signed-off-by: Gurchetan Singh Reviewed-by: Chia-I Wu --- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 336cc9143205d..867c5e239d553 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -47,7 +47,6 @@ static void virtio_gpu_create_context(struct drm_device *dev, get_task_comm(dbgname, current); virtio_gpu_cmd_context_create(vgdev, vfpriv->ctx_id, strlen(dbgname), dbgname); - virtio_gpu_notify(vgdev); vfpriv->context_created = true; out_unlock: From patchwork Wed Apr 1 22:30:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 11469665 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 070581805 for ; Wed, 1 Apr 2020 22:30:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D563B2071A for ; Wed, 1 Apr 2020 22:30:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="LVJhJof6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D563B2071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BFF656E9B3; Wed, 1 Apr 2020 22:30:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21C576E9B1 for ; Wed, 1 Apr 2020 22:30:44 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id x1so559354plm.4 for ; Wed, 01 Apr 2020 15:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+UHZr1S+fMBNzXGIHOSytKqVQfIbVK86FNZw2xQd4Xs=; b=LVJhJof6AoBPjSmf7zZoXWLZmrdSlhLf56OQMc6Y1/CLwjjS/elN7u5tUoRD8bBKuE IEIlvOp4/L4IqYhkk3zf+HrG1LfLFJeoELd4IToKggOhV7v9e8CgolsAwYUbD9IbyyRj Uc4mFd58EiNqOI2pQkROX7DeFUKnn1aSGGoew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+UHZr1S+fMBNzXGIHOSytKqVQfIbVK86FNZw2xQd4Xs=; b=MTh5NhFWbo9PeNeJsNxq8lbt+YXUNAGZIEYQ0yIlYBUi2mi6nzevjNMJdeUZx8TC+K BIfOTyAy/WCu7+Wk7qNxDtY4AcxgyenI1tQ/uYTmslmEx0w7RO0UNEX7Atjw9aWtTEFz 4vZDhucl8ZRnnnLdx3Ir+ZNj55dZHGSut4tjsL7l7WCW4bkWd1IrLXEkhQS7N4JbLaLo 6ZeY8k5BQfCDwbqHmWrZ1I/QeBbUfhdsw/jy5X206bnDk1y2PL7LBizTBDUVVOdBe31T yYshbr5LERyhL9f3562KbBS6+GiriYRiO4dgVoIBHd0ajvuA3tJ8J7dQQqbxlU3iTl64 wmkQ== X-Gm-Message-State: AGi0PuYKTS+e3sBAf3z8drnB3GcCUD5SC5SUt6weOE5G5gsIwK6WpESn UY5qz7B4gwFpd3mzOjMNTT3myjkQSB8= X-Google-Smtp-Source: APiQypJWoNgD7b/tMvLGBUpmY/QXewjzjlztnCExcYOerpPSdA6RgTVe+cMTI6jO6Pco2qGMEtwHzg== X-Received: by 2002:a17:90b:24c:: with SMTP id fz12mr232075pjb.85.1585780243432; Wed, 01 Apr 2020 15:30:43 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:202:201:bc97:5740:52a7:6875]) by smtp.gmail.com with ESMTPSA id w29sm2167311pge.25.2020.04.01.15.30.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2020 15:30:42 -0700 (PDT) From: Gurchetan Singh To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/5] drm/virtio: delete notify in virtio_gpu_object_create Date: Wed, 1 Apr 2020 15:30:37 -0700 Message-Id: <20200401223039.2860-3-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200401223039.2860-1-gurchetansingh@chromium.org> References: <20200401223039.2860-1-gurchetansingh@chromium.org> MIME-Version: 1.0 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: kraxel@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" For 3D buffers, virtio_gpu_gem_object_open notifies. We can have the same behavior for dumb buffer. v2: virtio_gpu_gem_object_open always notifies v3: avoid boolean variable Signed-off-by: Gurchetan Singh Reviewed-by: Chia-I Wu --- drivers/gpu/drm/virtio/virtgpu_gem.c | 3 ++- drivers/gpu/drm/virtio/virtgpu_object.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 90c0a8ea1708c..1025658be4df2 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -114,7 +114,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct virtio_gpu_object_array *objs; if (!vgdev->has_virgl_3d) - return 0; + goto out_notify; objs = virtio_gpu_array_alloc(1); if (!objs) @@ -123,6 +123,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id, objs); +out_notify: virtio_gpu_notify(vgdev); return 0; } diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index d9039bb7c5e37..51a8da7d5ef3b 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -241,7 +241,6 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, return ret; } - virtio_gpu_notify(vgdev); *bo_ptr = bo; return 0; From patchwork Wed Apr 1 22:30:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 11469667 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C57E914B4 for ; Wed, 1 Apr 2020 22:30:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A3F0D2071A for ; Wed, 1 Apr 2020 22:30:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UpfwS3uX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F0D2071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48F756E9B2; Wed, 1 Apr 2020 22:30:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A7236E9B5 for ; Wed, 1 Apr 2020 22:30:45 +0000 (UTC) Received: by mail-pj1-x102f.google.com with SMTP id np9so695178pjb.4 for ; Wed, 01 Apr 2020 15:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nylkiPKo5WUctc3Vw6/X59zIkxdB/2xhIqHvvfzv2CM=; b=UpfwS3uXdKQ5+zN9pI1LOXL4r5WODfz11VuFEZVkcyumVOhcaYEy8bA1UpmhX2rEzt a+xTxMuKp9rNSa6ra2e55krpkd7EJS4C4lbcoiui3v9vQnI2QH/bVh8V2r6oHBbz2dEY cxfZZ2RIaq4HPsNSKVTqw3KuWabECHxuhq2HU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nylkiPKo5WUctc3Vw6/X59zIkxdB/2xhIqHvvfzv2CM=; b=iSO7bpwraknW0w4wwEeJdq4/EBm7B0BDG5z39+C6RBU7eX/cUrZxcMb4friauk9dig XZZheqb2PYrpvPsRSd8ssm3hX/o1XckFw2WzGjzVZiqElvDO5q7fUtMXIjuOunRh8c+o PnPtQojtq+M3QeOQIkKxZDV8K9PENIsPWUV6d9purpIyoBz4dDEeqvVlNqb2fgv5xDlJ 5zVdGX1lEK1g01vQ5+JEJ30gcp5DWBsALFiv+Jzqp+YETon+eV2vDsJtBbZFY39jDmPV YztC+hlnWvZ9R6bDy+KwqmHsymB2Jl5V85P8t9H/9XtCSmUIQWN4vgn2a4Lkez7KRIPl 2V/Q== X-Gm-Message-State: AGi0PuZELFt0V1SgTrCTml6Cln3d6ZVe6Dl0EvQYg5sC5zyRRUtMJQg6 wVciKG+l/nQWtT7cfDHvk9ICEXws/1w= X-Google-Smtp-Source: APiQypJHedTo3CS8M7d3oNquTH9RSTe3AWM5bqqafvPgriqZfCmgG/8M0JKhqG02x6OLleJYbYzZRA== X-Received: by 2002:a17:90a:5d10:: with SMTP id s16mr296353pji.4.1585780244339; Wed, 01 Apr 2020 15:30:44 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:202:201:bc97:5740:52a7:6875]) by smtp.gmail.com with ESMTPSA id w29sm2167311pge.25.2020.04.01.15.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2020 15:30:43 -0700 (PDT) From: Gurchetan Singh To: dri-devel@lists.freedesktop.org Subject: [PATCH 4/5] drm/virtio: make virtio_gpu_object_attach void Date: Wed, 1 Apr 2020 15:30:38 -0700 Message-Id: <20200401223039.2860-4-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200401223039.2860-1-gurchetansingh@chromium.org> References: <20200401223039.2860-1-gurchetansingh@chromium.org> MIME-Version: 1.0 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: kraxel@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It always returns zero. Signed-off-by: Gurchetan Singh --- drivers/gpu/drm/virtio/virtgpu_drv.h | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_object.c | 6 +----- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 ++++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 79ad176aca5a8..49bebdee6d91e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -279,10 +279,10 @@ void virtio_gpu_cmd_set_scanout(struct virtio_gpu_device *vgdev, uint32_t scanout_id, uint32_t resource_id, uint32_t width, uint32_t height, uint32_t x, uint32_t y); -int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, - struct virtio_gpu_object *obj, - struct virtio_gpu_mem_entry *ents, - unsigned int nents); +void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, + struct virtio_gpu_object *obj, + struct virtio_gpu_mem_entry *ents, + unsigned int nents); int virtio_gpu_attach_status_page(struct virtio_gpu_device *vgdev); int virtio_gpu_detach_status_page(struct virtio_gpu_device *vgdev); void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev, diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 51a8da7d5ef3b..6ccbd01cd888c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -235,11 +235,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, return ret; } - ret = virtio_gpu_object_attach(vgdev, bo, ents, nents); - if (ret != 0) { - virtio_gpu_free_object(&shmem_obj->base); - return ret; - } + virtio_gpu_object_attach(vgdev, bo, ents, nents); *bo_ptr = bo; return 0; diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 73854915ec349..9e663a5d99526 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -1087,14 +1087,13 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence); } -int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, - struct virtio_gpu_object *obj, - struct virtio_gpu_mem_entry *ents, - unsigned int nents) +void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, + struct virtio_gpu_object *obj, + struct virtio_gpu_mem_entry *ents, + unsigned int nents) { virtio_gpu_cmd_resource_attach_backing(vgdev, obj->hw_res_handle, ents, nents, NULL); - return 0; } void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev, From patchwork Wed Apr 1 22:30:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 11469669 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F08A1805 for ; Wed, 1 Apr 2020 22:30:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5D9852071A for ; Wed, 1 Apr 2020 22:30:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="cGP+6uVm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D9852071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 837E96E9B5; Wed, 1 Apr 2020 22:30:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by gabe.freedesktop.org (Postfix) with ESMTPS id E05DB6E9B2 for ; Wed, 1 Apr 2020 22:30:45 +0000 (UTC) Received: by mail-pj1-x1044.google.com with SMTP id fh8so691106pjb.5 for ; Wed, 01 Apr 2020 15:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qKoeubHaEw5IDaekDlWwxnGlDEKb8AemSOiVG9SSdzM=; b=cGP+6uVmZBxE9r82Dr8+1CEhBq0o4CfabcFODfq/68NC0xeaGT7QXDwe+dA4eFf8eA lARpjxVAtUA078ZiPaNU0syHOekChmy82xXHVUnuGGZk6t6c16k8lQ0R1L/NcMBJNn4I sgTr2XbTRua5GlR4hvDso8PLACsYMpdCA2tdA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qKoeubHaEw5IDaekDlWwxnGlDEKb8AemSOiVG9SSdzM=; b=VkgMMG0E0wUhcZ88OJoGhoE0moGUPkTyGJqWMKSA/6DiGxE5wG1jrsdsRxCMYxAdk+ J6lWnno8fPmeIstWQxSCvQY23Uk59b9gozliGTl40y/ZAHr1Mf5q3nJ4v5dkv1gMZn2W 8Oo0zg9TkT7Bi2yGQLeqT+MueLHocr2c7ktfKZy6MXGfG7O8KF7Gsv+MA4XTPRomEREC GEH7H0VKtohZNFzeqRFmVW63rpzWPpb6AET6fDrWMoJPdpq/0exdUZcVsCj1LyB+UmvC 5ezAbJE5MZwB5gY74wsuIqIyqaAULvi6YBe5VgcVg0QcTmmz/5qQO9+tVN+3+9xaRl/W qhog== X-Gm-Message-State: AGi0PubPQpvbE8IrL9vR/Rhnhxc4uG/tiXLaY923FdXmE06hzEfmrZ0Y G1dHfXeEEZQAti2bXQObYa/RmN+1x8Q= X-Google-Smtp-Source: APiQypLLTrLltTRyVm+eZLu40s9hHR+eoJA6AlVdujTqwqZxoutgMMjbAxhzltvLtAwV2nzG7JPaZg== X-Received: by 2002:a17:90a:2147:: with SMTP id a65mr257136pje.176.1585780245265; Wed, 01 Apr 2020 15:30:45 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:202:201:bc97:5740:52a7:6875]) by smtp.gmail.com with ESMTPSA id w29sm2167311pge.25.2020.04.01.15.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2020 15:30:44 -0700 (PDT) From: Gurchetan Singh To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/5] drm/virtio: only call virtio_gpu_cmd_create_resource for dumb resources Date: Wed, 1 Apr 2020 15:30:39 -0700 Message-Id: <20200401223039.2860-5-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200401223039.2860-1-gurchetansingh@chromium.org> References: <20200401223039.2860-1-gurchetansingh@chromium.org> MIME-Version: 1.0 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: kraxel@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We want to avoid this path for upcoming blob resources. Signed-off-by: Gurchetan Singh --- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 6ccbd01cd888c..82df066ac0552 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -224,7 +224,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, if (params->virgl) { virtio_gpu_cmd_resource_create_3d(vgdev, bo, params, objs, fence); - } else { + } else if (params->dumb) { virtio_gpu_cmd_create_resource(vgdev, bo, params, objs, fence); }