From nobody Fri Dec 19 19:06:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619536821; cv=none; d=zohomail.com; s=zohoarc; b=ULLb0AUPiTm1uT4V6rQYBdYmKMbfzhrxeFAjQGcvnwsWRuCGeYPO9bQSfXlcBqtV96C5ysQ9c11rKNNEQhHi8npNm1PgY0WGYOWT1rFOdYTClkajF54PKselzcf0xAGjSWbEw2CJylPdSBJl6Ok5Qt5NXQFuZeJSlXi8jG8xp04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619536821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1Jcr9CfhX/9s+5yw5pAE9q1R2xnwTgkF74x4TRYJjd8=; b=B47dUKOPBhSqGife1UotzJ/yA0Y8i/WJg9hFYnJMEoEEztO7ijo4GprVcuWzLaaIgJlDqT1XPHE/NsaEzT5A/GgkncSdJOp0xqdYW2ZeNL0SiwZBHeVrf4NsalFoy0U7SWFGmj6yA/ic+BT479yJ7DbicuhA5ybiJeGcPWkkTnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619536821547420.5256989527195; Tue, 27 Apr 2021 08:20:21 -0700 (PDT) Received: from localhost ([::1]:45988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbPVc-00061b-6s for importer@patchew.org; Tue, 27 Apr 2021 11:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbPKZ-0003ys-Pe for qemu-devel@nongnu.org; Tue, 27 Apr 2021 11:08:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbPKX-0002J2-WD for qemu-devel@nongnu.org; Tue, 27 Apr 2021 11:08:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-q9cQvNp3N4enGoN_njS4WA-1; Tue, 27 Apr 2021 11:08:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBDED501E9; Tue, 27 Apr 2021 15:08:46 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-203.ams2.redhat.com [10.36.112.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39A441042A90; Tue, 27 Apr 2021 15:08:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2BADF18007A5; Tue, 27 Apr 2021 17:08:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619536133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Jcr9CfhX/9s+5yw5pAE9q1R2xnwTgkF74x4TRYJjd8=; b=E+2uEFG7SiLSMO5x01jyTOdvQkeJqUhuLvOL6ElKNE827YJJHc5BN96WH5kfLNcLdHPVih C3V/XXPxtIwRoICZhqCDokVN3Jo3Fgmxo9swel8L/1qNzriz44fpgvNM9IGpDboJXwwark XxuXb5F0D4Ecm/Ei/7CRt+F0J47tnvE= X-MC-Unique: q9cQvNp3N4enGoN_njS4WA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 5/8] edid: Make refresh rate configurable Date: Tue, 27 Apr 2021 17:08:21 +0200 Message-Id: <20210427150824.638359-6-kraxel@redhat.com> In-Reply-To: <20210427150824.638359-1-kraxel@redhat.com> References: <20210427150824.638359-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.218, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Akihiko Odaki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki Signed-off-by: Akihiko Odaki Signed-off-by: Gerd Hoffmann --- 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; =20 void qemu_edid_generate(uint8_t *edid, size_t size, @@ -21,10 +22,11 @@ void qemu_edid_region_io(MemoryRegion *region, Object *= owner, =20 uint32_t qemu_edid_dpi_to_mm(uint32_t dpi, uint32_t res); =20 -#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) =20 #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); } =20 -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 =3D yres * 5 / 1000; uint32_t yblank =3D yres * 35 / 1000; =20 - uint32_t clock =3D 75 * (xres + xblank) * (yres + yblank); + uint64_t clock =3D (uint64_t)refresh_rate * (xres + xblank) * (yres += yblank); =20 - stl_le_p(desc, clock / 10000); + stl_le_p(desc, clock / 10000000); =20 desc[2] =3D xres & 0xff; desc[3] =3D xblank & 0xff; @@ -323,6 +323,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size, uint8_t *xtra3 =3D NULL; uint8_t *dta =3D NULL; uint32_t width_mm, height_mm; + uint32_t refresh_rate =3D info->refresh_rate ? info->refresh_rate : 75= 000; uint32_t dpi =3D 100; /* if no width_mm/height_mm */ =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D set defaults =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ @@ -420,7 +421,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size, =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D descriptor blocks =3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 - edid_desc_timing(desc, info->prefx, info->prefy, + edid_desc_timing(desc, refresh_rate, info->prefx, info->prefy, width_mm, height_mm); desc =3D edid_desc_next(edid, dta, desc); =20 --=20 2.30.2