linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
	"open list:VIRTIO GPU DRIVER" 
	<virtualization@lists.linux-foundation.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] virtio-gpu: use src not crtc
Date: Tue, 14 Jun 2016 12:13:50 +0200	[thread overview]
Message-ID: <CAJ+F1CKQNpJ+=i3wq2JDJi8Z+tyK1=wBEmYTE=NfNJ20VKEoDA@mail.gmail.com> (raw)
In-Reply-To: <1464699172-26755-1-git-send-email-kraxel@redhat.com>

Hi

On Tue, May 31, 2016 at 2:52 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Pick up the correct source rectangle from framebuffer.
> Without this multihead setups are not working correctly.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Additionally, I had to modify the page_flip() function to take the
plane source coordinates for virgl/3d multihead to work. Feel free to
squash.

--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -68,11 +68,16 @@ static int virtio_gpu_page_flip(struct drm_crtc *crtc,
                         0, 0, NULL);
        }
        virtio_gpu_cmd_set_scanout(vgdev, output->index, handle,
-                                  crtc->mode.hdisplay,
-                                  crtc->mode.vdisplay, 0, 0);
-       virtio_gpu_cmd_resource_flush(vgdev, handle, 0, 0,
-                                     crtc->mode.hdisplay,
-                                     crtc->mode.vdisplay);
+                       plane->state->src_w >> 16,
+                       plane->state->src_h >> 16,
+                       plane->state->src_x >> 16,
+                       plane->state->src_y >> 16);
+
+       virtio_gpu_cmd_resource_flush(vgdev, handle,
+                       plane->state->src_x >> 16,
+                       plane->state->src_y >> 16,
+                       plane->state->src_w >> 16,
+                       plane->state->src_h);

> ---
>  drivers/gpu/drm/virtio/virtgpu_plane.c | 31 ++++++++++++++++++-------------
>  1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
> index b7778a7..925ca25 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_plane.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
> @@ -85,27 +85,32 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
>                 if (bo->dumb) {
>                         virtio_gpu_cmd_transfer_to_host_2d
>                                 (vgdev, handle, 0,
> -                                cpu_to_le32(plane->state->crtc_w),
> -                                cpu_to_le32(plane->state->crtc_h),
> -                                plane->state->crtc_x, plane->state->crtc_y, NULL);
> +                                cpu_to_le32(plane->state->src_w >> 16),
> +                                cpu_to_le32(plane->state->src_h >> 16),
> +                                plane->state->src_x >> 16,
> +                                plane->state->src_y >> 16, NULL);
>                 }
>         } else {
>                 handle = 0;
>         }
>
> -       DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d\n", handle,
> +       DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", handle,
>                   plane->state->crtc_w, plane->state->crtc_h,
> -                 plane->state->crtc_x, plane->state->crtc_y);
> +                 plane->state->crtc_x, plane->state->crtc_y,
> +                 plane->state->src_w >> 16,
> +                 plane->state->src_h >> 16,
> +                 plane->state->src_x >> 16,
> +                 plane->state->src_y >> 16);
>         virtio_gpu_cmd_set_scanout(vgdev, output->index, handle,
> -                                  plane->state->crtc_w,
> -                                  plane->state->crtc_h,
> -                                  plane->state->crtc_x,
> -                                  plane->state->crtc_y);
> +                                  plane->state->src_w >> 16,
> +                                  plane->state->src_h >> 16,
> +                                  plane->state->src_x >> 16,
> +                                  plane->state->src_y >> 16);
>         virtio_gpu_cmd_resource_flush(vgdev, handle,
> -                                     plane->state->crtc_x,
> -                                     plane->state->crtc_y,
> -                                     plane->state->crtc_w,
> -                                     plane->state->crtc_h);
> +                                     plane->state->src_x >> 16,
> +                                     plane->state->src_y >> 16,
> +                                     plane->state->src_w >> 16,
> +                                     plane->state->src_h >> 16);
>  }
>
>  static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
> --
> 1.8.3.1
>



-- 
Marc-André Lureau

  reply	other threads:[~2016-06-14 10:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 12:52 [PATCH] virtio-gpu: use src not crtc Gerd Hoffmann
2016-06-14 10:13 ` Marc-André Lureau [this message]
2016-06-14 12:57   ` Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJ+F1CKQNpJ+=i3wq2JDJi8Z+tyK1=wBEmYTE=NfNJ20VKEoDA@mail.gmail.com' \
    --to=marcandre.lureau@gmail.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kraxel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).