From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>
Subject: [PATCH v2 5/8] edid: Make refresh rate configurable
Date: Tue, 27 Apr 2021 17:08:21 +0200 [thread overview]
Message-ID: <20210427150824.638359-6-kraxel@redhat.com> (raw)
In-Reply-To: <20210427150824.638359-1-kraxel@redhat.com>
From: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/display/edid.h | 12 +++++++-----
hw/display/edid-generate.c | 9 +++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h
index 1f8fc9b37500..520f8ec20279 100644
--- a/include/hw/display/edid.h
+++ b/include/hw/display/edid.h
@@ -11,6 +11,7 @@ typedef struct qemu_edid_info {
uint32_t prefy;
uint32_t maxx;
uint32_t maxy;
+ uint32_t refresh_rate;
} qemu_edid_info;
void qemu_edid_generate(uint8_t *edid, size_t size,
@@ -21,10 +22,11 @@ void qemu_edid_region_io(MemoryRegion *region, Object *owner,
uint32_t qemu_edid_dpi_to_mm(uint32_t dpi, uint32_t res);
-#define DEFINE_EDID_PROPERTIES(_state, _edid_info) \
- DEFINE_PROP_UINT32("xres", _state, _edid_info.prefx, 0), \
- DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0), \
- DEFINE_PROP_UINT32("xmax", _state, _edid_info.maxx, 0), \
- DEFINE_PROP_UINT32("ymax", _state, _edid_info.maxy, 0)
+#define DEFINE_EDID_PROPERTIES(_state, _edid_info) \
+ DEFINE_PROP_UINT32("xres", _state, _edid_info.prefx, 0), \
+ DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0), \
+ DEFINE_PROP_UINT32("xmax", _state, _edid_info.maxx, 0), \
+ DEFINE_PROP_UINT32("ymax", _state, _edid_info.maxy, 0), \
+ DEFINE_PROP_UINT32("refresh_rate", _state, _edid_info.refresh_rate, 0)
#endif /* EDID_H */
diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c
index 42a130f0ff5c..8662218822f6 100644
--- a/hw/display/edid-generate.c
+++ b/hw/display/edid-generate.c
@@ -223,7 +223,7 @@ static void edid_desc_dummy(uint8_t *desc)
edid_desc_type(desc, 0x10);
}
-static void edid_desc_timing(uint8_t *desc,
+static void edid_desc_timing(uint8_t *desc, uint32_t refresh_rate,
uint32_t xres, uint32_t yres,
uint32_t xmm, uint32_t ymm)
{
@@ -236,9 +236,9 @@ static void edid_desc_timing(uint8_t *desc,
uint32_t ysync = yres * 5 / 1000;
uint32_t yblank = yres * 35 / 1000;
- uint32_t clock = 75 * (xres + xblank) * (yres + yblank);
+ uint64_t clock = (uint64_t)refresh_rate * (xres + xblank) * (yres + yblank);
- stl_le_p(desc, clock / 10000);
+ stl_le_p(desc, clock / 10000000);
desc[2] = xres & 0xff;
desc[3] = xblank & 0xff;
@@ -323,6 +323,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size,
uint8_t *xtra3 = NULL;
uint8_t *dta = NULL;
uint32_t width_mm, height_mm;
+ uint32_t refresh_rate = info->refresh_rate ? info->refresh_rate : 75000;
uint32_t dpi = 100; /* if no width_mm/height_mm */
/* =============== set defaults =============== */
@@ -420,7 +421,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size,
/* =============== descriptor blocks =============== */
- edid_desc_timing(desc, info->prefx, info->prefy,
+ edid_desc_timing(desc, refresh_rate, info->prefx, info->prefy,
width_mm, height_mm);
desc = edid_desc_next(edid, dta, desc);
--
2.30.2
next prev parent reply other threads:[~2021-04-27 15:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 15:08 [PATCH v2 0/8] edid: windows fixes Gerd Hoffmann
2021-04-27 15:08 ` [PATCH v2 1/8] qemu-edid: use qemu_edid_size() Gerd Hoffmann
2021-04-27 15:53 ` Marc-André Lureau
2021-04-27 15:08 ` [PATCH v2 2/8] edid: edid_desc_next Gerd Hoffmann
2021-04-27 15:53 ` Marc-André Lureau
2021-04-27 15:08 ` [PATCH v2 3/8] edid: move xtra3 descriptor Gerd Hoffmann
2021-04-27 15:54 ` Marc-André Lureau
2021-04-27 15:08 ` [PATCH v2 4/8] edid: use dta extension block descriptors Gerd Hoffmann
2021-04-27 15:59 ` Marc-André Lureau
2021-04-27 15:08 ` Gerd Hoffmann [this message]
2021-04-27 15:08 ` [PATCH v2 6/8] edid: move timing generation into a separate function Gerd Hoffmann
2021-04-27 15:08 ` [PATCH v2 7/8] edid: allow arbitrary-length checksums Gerd Hoffmann
2021-04-27 15:08 ` [PATCH v2 8/8] edid: add support for DisplayID extension (5k resolution) Gerd Hoffmann
2021-04-27 15:27 ` [PATCH v2 0/8] edid: windows fixes no-reply
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=20210427150824.638359-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=akihiko.odaki@gmail.com \
--cc=qemu-devel@nongnu.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).