From: Gerd Hoffmann <kraxel@redhat.com>
To: dri-devel@lists.freedesktop.org
Cc: spice-devel@redhat.com, Gerd Hoffmann <kraxel@redhat.com>,
Dave Airlie <airlied@redhat.com>, David Airlie <airlied@linux.ie>,
virtualization@lists.linux-foundation.org (open list:DRM DRIVER
FOR QXL VIRTUAL GPU),
spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL
VIRTUAL GPU), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 11/18] drm/qxl: drop unused offset parameter from qxl_io_create_primary()
Date: Wed, 12 Dec 2018 14:21:02 +0100 [thread overview]
Message-ID: <20181212132109.8126-12-kraxel@redhat.com> (raw)
In-Reply-To: <20181212132109.8126-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/qxl/qxl_drv.h | 1 -
drivers/gpu/drm/qxl/qxl_cmd.c | 7 +++----
drivers/gpu/drm/qxl/qxl_display.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 27e0a3fc08..cb767aaef6 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -385,7 +385,6 @@ void qxl_update_screen(struct qxl_device *qxl);
/* qxl io operations (qxl_cmd.c) */
void qxl_io_create_primary(struct qxl_device *qdev,
- unsigned int offset,
struct qxl_bo *bo);
void qxl_io_destroy_primary(struct qxl_device *qdev);
void qxl_io_memslot_add(struct qxl_device *qdev, uint8_t id);
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 73ef41ac5f..626e803f60 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -375,8 +375,7 @@ void qxl_io_destroy_primary(struct qxl_device *qdev)
qdev->primary_created = false;
}
-void qxl_io_create_primary(struct qxl_device *qdev,
- unsigned int offset, struct qxl_bo *bo)
+void qxl_io_create_primary(struct qxl_device *qdev, struct qxl_bo *bo)
{
struct qxl_surface_create *create;
@@ -387,9 +386,9 @@ void qxl_io_create_primary(struct qxl_device *qdev,
create->height = bo->surf.height;
create->stride = bo->surf.stride;
if (bo->shadow) {
- create->mem = qxl_bo_physical_address(qdev, bo->shadow, offset);
+ create->mem = qxl_bo_physical_address(qdev, bo->shadow, 0);
} else {
- create->mem = qxl_bo_physical_address(qdev, bo, offset);
+ create->mem = qxl_bo_physical_address(qdev, bo, 0);
}
DRM_DEBUG_DRIVER("mem = %llx, from %p\n", create->mem, bo->kptr);
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index a4bdcca715..79dc8a1fa3 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -557,7 +557,7 @@ static void qxl_primary_atomic_update(struct drm_plane *plane,
if (!bo->is_primary) {
if (!same_shadow) {
- qxl_io_create_primary(qdev, 0, bo);
+ qxl_io_create_primary(qdev, bo);
qxl_primary_apply_cursor(plane);
}
bo->is_primary = true;
--
2.9.3
next prev parent reply other threads:[~2018-12-12 13:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181212132109.8126-1-kraxel@redhat.com>
2018-12-12 13:20 ` [PATCH v2 01/18] drm/qxl: drop ttm_mem_reg arg from qxl_hw_surface_alloc() Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 02/18] drm/qxl: drop unused qxl_fb_virtual_address Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 03/18] drm/qxl: simplify slot management Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 04/18] drm/qxl: change the way slot is detected Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 05/18] drm/qxl: drop unused fields from struct qxl_device Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 06/18] drm/qxl: use separate offset spaces for the two slots / ttm memory types Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 07/18] drm/qxl: allow both PRIV and VRAM placement for QXL_GEM_DOMAIN_SURFACE Gerd Hoffmann
2018-12-12 13:20 ` [PATCH v2 08/18] drm/qxl: use QXL_GEM_DOMAIN_SURFACE for shadow bo Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 09/18] drm/qxl: use QXL_GEM_DOMAIN_SURFACE for dumb gem objects Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 10/18] drm/qxl: move qxl_primary_apply_cursor to correct place Gerd Hoffmann
2018-12-12 13:21 ` Gerd Hoffmann [this message]
2018-12-12 13:21 ` [PATCH v2 12/18] drm/qxl: track primary bo Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 13/18] drm/qxl: use shadow bo directly Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 14/18] drm/qxl: cover all crtcs in shadow bo Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 15/18] drm/qxl: use qxl_num_crtc directly Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 16/18] drm/qxl: implement prime kmap/kunmap Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 17/18] drm/qxl: use generic fbdev emulation Gerd Hoffmann
2018-12-12 13:21 ` [PATCH v2 18/18] drm/qxl: remove dead qxl fbdev emulation code 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=20181212132109.8126-12-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=spice-devel@redhat.com \
--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).