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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9D01CA9EB7 for ; Wed, 23 Oct 2019 06:25:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9BB9C21906 for ; Wed, 23 Oct 2019 06:25:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UvFcKRGd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388780AbfJWGZt (ORCPT ); Wed, 23 Oct 2019 02:25:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:47867 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725947AbfJWGZt (ORCPT ); Wed, 23 Oct 2019 02:25:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571811948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2rJJiMpAk3KTFb/8+6jAIUN/X+McNBs+lfMw6ea3i+w=; b=UvFcKRGdjiLQyztjzQVYsTmN20NzV2ZjpKj9HCGfcsiyBKZuBXe6tiKl1u2DAaUIv/cyqo sRfmQEVUvbnuYMVH3k+LC8HYH4FaYi0gmAtLAhy4IZaIj6IBJrCrSsZthySvBoVptbGrtz yg9XTWrrKnVaLS0Mw/5nhp66f/mcK/A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-3S4sJz8-Pe6gMCGzRnyvDA-1; Wed, 23 Oct 2019 02:25:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADE7D1005509; Wed, 23 Oct 2019 06:25:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-43.ams2.redhat.com [10.36.116.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDF715DA8D; Wed, 23 Oct 2019 06:25:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 27FE49D31; Wed, 23 Oct 2019 08:25:40 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gurchetan Singh , Gerd Hoffmann , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:VIRTIO GPU DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 3/3] drm/virtio: factor out virtio_gpu_update_dumb_bo Date: Wed, 23 Oct 2019 08:25:39 +0200 Message-Id: <20191023062539.11728-4-kraxel@redhat.com> In-Reply-To: <20191023062539.11728-1-kraxel@redhat.com> References: <20191023062539.11728-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 3S4sJz8-Pe6gMCGzRnyvDA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No functional change. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/virtio/virtgpu_plane.c | 36 +++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virti= o/virtgpu_plane.c index 0b5a760bc293..bc4bc4475a8c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -102,6 +102,25 @@ static int virtio_gpu_plane_atomic_check(struct drm_pl= ane *plane, =09return ret; } =20 +static void virtio_gpu_update_dumb_bo(struct virtio_gpu_device *vgdev, +=09=09=09=09 struct virtio_gpu_object *bo, +=09=09=09=09 struct drm_plane_state *state) +{ +=09struct virtio_gpu_object_array *objs; + +=09objs =3D virtio_gpu_array_alloc(1); +=09if (!objs) +=09=09return; +=09virtio_gpu_array_add_obj(objs, &bo->base.base); +=09virtio_gpu_cmd_transfer_to_host_2d +=09=09(vgdev, 0, +=09=09 state->src_w >> 16, +=09=09 state->src_h >> 16, +=09=09 state->src_x >> 16, +=09=09 state->src_y >> 16, +=09=09 objs, NULL); +} + static void virtio_gpu_primary_plane_update(struct drm_plane *plane, =09=09=09=09=09 struct drm_plane_state *old_state) { @@ -129,21 +148,8 @@ static void virtio_gpu_primary_plane_update(struct drm= _plane *plane, =20 =09vgfb =3D to_virtio_gpu_framebuffer(plane->state->fb); =09bo =3D gem_to_virtio_gpu_obj(vgfb->base.obj[0]); -=09if (bo->dumb) { -=09=09struct virtio_gpu_object_array *objs; - -=09=09objs =3D virtio_gpu_array_alloc(1); -=09=09if (!objs) -=09=09=09return; -=09=09virtio_gpu_array_add_obj(objs, vgfb->base.obj[0]); -=09=09virtio_gpu_cmd_transfer_to_host_2d -=09=09=09(vgdev, 0, -=09=09=09 plane->state->src_w >> 16, -=09=09=09 plane->state->src_h >> 16, -=09=09=09 plane->state->src_x >> 16, -=09=09=09 plane->state->src_y >> 16, -=09=09=09 objs, NULL); -=09} +=09if (bo->dumb) +=09=09virtio_gpu_update_dumb_bo(vgdev, bo, plane->state); =20 =09DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", =09=09 bo->hw_res_handle, --=20 2.18.1