From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@redhat.com, airlied@linux.ie, daniel@ffwll.ch,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
noralf@tronnes.org, drawat.floss@gmail.com, kraxel@redhat.com,
hdegoede@redhat.com, sean@poorly.run,
rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com,
sam@ravnborg.org
Cc: dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH 11/11] drm/vkms: Use offset-adjusted shadow-plane mappings and output
Date: Tue, 3 Aug 2021 14:59:28 +0200 [thread overview]
Message-ID: <20210803125928.27780-12-tzimmermann@suse.de> (raw)
In-Reply-To: <20210803125928.27780-1-tzimmermann@suse.de>
For framebuffers with non-zero offset fields, shadow-plane helpers
provide a pointer to the first byte of the contained data. Use it in
vkms.
Also provide use the offset-adjusted data address for the writeback
job's output buffers. Output framebuffers with non-zero offsets now
have their content written to the correct location.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
drivers/gpu/drm/vkms/vkms_drv.h | 1 +
drivers/gpu/drm/vkms/vkms_plane.c | 2 +-
drivers/gpu/drm/vkms/vkms_writeback.c | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 49f109c3a2b3..9e8204be9a14 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -257,7 +257,7 @@ void vkms_composer_worker(struct work_struct *work)
return;
if (wb_pending)
- vaddr_out = crtc_state->active_writeback->map[0].vaddr;
+ vaddr_out = crtc_state->active_writeback->data[0].vaddr;
ret = compose_active_planes(&vaddr_out, primary_composer,
crtc_state);
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 8bc9e3f52e1f..d48c23d40ce5 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -22,6 +22,7 @@
struct vkms_writeback_job {
struct dma_buf_map map[DRM_FORMAT_MAX_PLANES];
+ struct dma_buf_map data[DRM_FORMAT_MAX_PLANES];
};
struct vkms_composer {
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
index 8a56fbf572b0..32409e15244b 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -111,7 +111,7 @@ static void vkms_plane_atomic_update(struct drm_plane *plane,
memcpy(&composer->src, &new_state->src, sizeof(struct drm_rect));
memcpy(&composer->dst, &new_state->dst, sizeof(struct drm_rect));
memcpy(&composer->fb, fb, sizeof(struct drm_framebuffer));
- memcpy(&composer->map, &shadow_plane_state->map, sizeof(composer->map));
+ memcpy(&composer->map, &shadow_plane_state->data, sizeof(composer->map));
drm_framebuffer_get(&composer->fb);
composer->offset = fb->offsets[0];
composer->pitch = fb->pitches[0];
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index 3a8e2ed93e7c..8694227f555f 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -75,7 +75,7 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector,
if (!vkmsjob)
return -ENOMEM;
- ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, NULL);
+ ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, vkmsjob->data);
if (ret) {
DRM_ERROR("vmap failed: %d\n", ret);
goto err_kfree;
--
2.32.0
next prev parent reply other threads:[~2021-08-03 12:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 12:59 [PATCH 00/11] Provide offset-adjusted framebuffer mappings Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 01/11] drm/gem: Provide offset-adjusted framebuffer BO mappings Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 02/11] drm/ast: Use offset-adjusted shadow-plane mappings Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 03/11] drm/gud: Get offset-adjusted mapping from drm_gem_fb_vmap() Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 04/11] drm/hyperv: Use offset-adjusted shadow-plane mappings Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 05/11] drm/mgag200: " Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 06/11] drm/cirrus: " Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 07/11] drm/gm12u320: " Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 08/11] drm/simpledrm: Use offset-adjusted shadow-plane mapping Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 09/11] drm/udl: " Thomas Zimmermann
2021-08-03 12:59 ` [PATCH 10/11] drm/vbox: Use offset-adjusted shadow-plane mappings Thomas Zimmermann
2021-08-03 12:59 ` Thomas Zimmermann [this message]
[not found] ` <YQls/oxklkZWqEnD@ravnborg.org>
2021-08-04 18:22 ` [PATCH 00/11] Provide offset-adjusted framebuffer mappings Thomas Zimmermann
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=20210803125928.27780-12-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=drawat.floss@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=kraxel@redhat.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=melissa.srw@gmail.com \
--cc=mripard@kernel.org \
--cc=noralf@tronnes.org \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--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).