From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
David Airlie <airlied@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Gurchetan Singh <gurchetansingh@chromium.org>,
Chia-I Wu <olvaffe@gmail.com>,
virtualization@lists.linux.dev
Subject: [PATCH 12/15] drm/virtio: switch to struct drm_edid
Date: Tue, 16 Apr 2024 16:22:26 +0300 [thread overview]
Message-ID: <086654def37e8d45ea110e3a228fc42f2066e123.1713273659.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1713273659.git.jani.nikula@intel.com>
Prefer struct drm_edid based functions over struct edid.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Cc: David Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Chia-I Wu <olvaffe@gmail.com>
Cc: virtualization@lists.linux.dev
---
drivers/gpu/drm/virtio/virtgpu_display.c | 10 ++++------
drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +-
drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index ad924a8502e9..64baf2f22d9f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -164,11 +164,9 @@ static int virtio_gpu_conn_get_modes(struct drm_connector *connector)
struct drm_display_mode *mode = NULL;
int count, width, height;
- if (output->edid) {
- count = drm_add_edid_modes(connector, output->edid);
- if (count)
- return count;
- }
+ count = drm_edid_connector_add_modes(connector);
+ if (count)
+ return count;
width = le32_to_cpu(output->info.r.width);
height = le32_to_cpu(output->info.r.height);
@@ -369,5 +367,5 @@ void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
return;
for (i = 0 ; i < vgdev->num_scanouts; ++i)
- kfree(vgdev->outputs[i].edid);
+ drm_edid_free(vgdev->outputs[i].drm_edid);
}
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index bb7d86a0c6a1..64c236169db8 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -179,7 +179,7 @@ struct virtio_gpu_output {
struct drm_encoder enc;
struct virtio_gpu_display_one info;
struct virtio_gpu_update_cursor cursor;
- struct edid *edid;
+ const struct drm_edid *drm_edid;
int cur_x;
int cur_y;
bool needs_modeset;
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index b1a00c0c25a7..0d3d0d09f39b 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -741,21 +741,21 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev,
(struct virtio_gpu_resp_edid *)vbuf->resp_buf;
uint32_t scanout = le32_to_cpu(cmd->scanout);
struct virtio_gpu_output *output;
- struct edid *new_edid, *old_edid;
+ const struct drm_edid *new_edid, *old_edid;
if (scanout >= vgdev->num_scanouts)
return;
output = vgdev->outputs + scanout;
- new_edid = drm_do_get_edid(&output->conn, virtio_get_edid_block, resp);
- drm_connector_update_edid_property(&output->conn, new_edid);
+ new_edid = drm_edid_read_custom(&output->conn, virtio_get_edid_block, resp);
+ drm_edid_connector_update(&output->conn, new_edid);
spin_lock(&vgdev->display_info_lock);
- old_edid = output->edid;
- output->edid = new_edid;
+ old_edid = output->drm_edid;
+ output->drm_edid = new_edid;
spin_unlock(&vgdev->display_info_lock);
- kfree(old_edid);
+ drm_edid_free(old_edid);
wake_up(&vgdev->resp_wq);
}
--
2.39.2
next prev parent reply other threads:[~2024-04-16 13:23 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 13:22 [PATCH 00/15] drm: struct drm_edid conversions Jani Nikula
2024-04-16 13:22 ` [PATCH 01/15] drm/panel: simple: switch to struct drm_edid Jani Nikula
2024-04-16 17:41 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 02/15] drm/panel-samsung-atna33xc20: " Jani Nikula
2024-04-16 17:41 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 03/15] drm/panel-edp: " Jani Nikula
2024-04-16 17:43 ` Neil Armstrong
2024-04-16 13:22 ` [PATCH 04/15] drm/bridge/analogix/anx6345: " Jani Nikula
2024-04-16 13:22 ` [PATCH 05/15] drm/bridge/analogix/anx78xx: " Jani Nikula
2024-04-16 13:22 ` [PATCH 06/15] drm/sun4i: hdmi: " Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-18 11:51 ` Maxime Ripard
2024-04-18 11:51 ` Maxime Ripard
2024-04-16 13:22 ` [PATCH 07/15] drm/vc4: " Jani Nikula
2024-04-18 11:51 ` Maxime Ripard
2024-04-16 13:22 ` [PATCH 08/15] drm/bridge: anx7625: use struct drm_edid more Jani Nikula
2024-04-16 13:22 ` [PATCH 09/15] drm/gud: switch to struct drm_edid Jani Nikula
2024-04-17 15:26 ` Noralf Trønnes
2024-04-16 13:22 ` [PATCH 10/15] drm/i2c: tda998x: " Jani Nikula
2024-04-16 13:22 ` [PATCH 11/15] drm/bochs: " Jani Nikula
2024-04-16 13:22 ` Jani Nikula [this message]
2024-04-16 13:22 ` [PATCH 13/15] drm/rockchip: cdn-dp: " Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
2024-04-16 13:22 ` [PATCH 14/15] drm/rockchip: inno_hdmi: " Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
2024-04-16 13:22 ` [PATCH 15/15] drm/rockchip: rk3066_hdmi: " Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-16 13:22 ` Jani Nikula
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
2024-04-19 10:58 ` Heiko Stuebner
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=086654def37e8d45ea110e3a228fc42f2066e123.1713273659.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gurchetansingh@chromium.org \
--cc=kraxel@redhat.com \
--cc=olvaffe@gmail.com \
--cc=virtualization@lists.linux.dev \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.