From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KUOQb-0000AC-DM for qemu-devel@nongnu.org; Sat, 16 Aug 2008 12:14:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KUOQa-00009b-4O for qemu-devel@nongnu.org; Sat, 16 Aug 2008 12:14:57 -0400 Received: from [199.232.76.173] (port=43400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KUOQZ-00009Y-RW for qemu-devel@nongnu.org; Sat, 16 Aug 2008 12:14:55 -0400 Received: from smtp1-g19.free.fr ([212.27.42.27]:53803) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KUOQZ-0006vX-9p for qemu-devel@nongnu.org; Sat, 16 Aug 2008 12:14:55 -0400 Received: from smtp1-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp1-g19.free.fr (Postfix) with ESMTP id EF0021AB2E7 for ; Sat, 16 Aug 2008 18:14:53 +0200 (CEST) Received: from [127.0.0.1] (rob92-10-88-171-126-33.fbx.proxad.net [88.171.126.33]) by smtp1-g19.free.fr (Postfix) with ESMTP id A88AD1AB2B1 for ; Sat, 16 Aug 2008 18:14:53 +0200 (CEST) Message-ID: <48A6FCFC.2090001@reactos.org> Date: Sat, 16 Aug 2008 18:14:52 +0200 From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010708060105090101050302" Subject: [Qemu-devel] [PATCH] Fix g364fb video emulation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------010708060105090101050302 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, Attached patches fixes screen resolution handling for g364 graphic card. It removes last_scr_width/last_scr_height whose role was not very clear, and uses qemu_console_resize(), added in r4812. Herv=E9 --------------010708060105090101050302 Content-Type: text/plain; name="g364fb.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="g364fb.diff" SW5kZXg6IGh3L2czNjRmYi5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gaHcvZzM2NGZiLmMJKHJl dmlzaW9uIDUwMTMpDQorKysgaHcvZzM2NGZiLmMJKHdvcmtpbmcgY29weSkNCkBAIC0zNiw3 ICszNiw2IEBADQogICAgIFFFTVVDb25zb2xlICpjb25zb2xlOwogICAgIGludCBncmFwaGlj X21vZGU7CiAgICAgdWludDMyX3Qgc2NyX3dpZHRoLCBzY3JfaGVpZ2h0OyAvKiBpbiBwaXhl bHMgKi8KLSAgICB1aW50MzJfdCBsYXN0X3Njcl93aWR0aCwgbGFzdF9zY3JfaGVpZ2h0OyAv KiBpbiBwaXhlbHMgKi8KIH0gRzM2NFN0YXRlOwogCiAvKgpAQCAtNzMsOSArNzIsNiBAQA0K IAogc3RhdGljIHZvaWQgZzM2NGZiX2RyYXdfZ3JhcGhpYyhHMzY0U3RhdGUgKnMsIGludCBm dWxsX3VwZGF0ZSkKIHsKLSAgICBpZiAocy0+c2NyX3dpZHRoID09IDAgfHwgcy0+c2NyX2hl aWdodCA9PSAwKQotICAgICAgICByZXR1cm47Ci0KICAgICBzd2l0Y2ggKHMtPmRzLT5kZXB0 aCkgewogICAgICAgICBjYXNlIDg6CiAgICAgICAgICAgICBnMzY0ZmJfZHJhd19ncmFwaGlj OChzLCBmdWxsX3VwZGF0ZSk7CkBAIC05NCw3ICs5MCw3IEBADQogICAgICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIGRweV91cGRhdGUocy0+ZHMsIDAsIDAsIHMtPmxhc3Rfc2Ny X3dpZHRoLCBzLT5sYXN0X3Njcl9oZWlnaHQpOworICAgIGRweV91cGRhdGUocy0+ZHMsIDAs IDAsIHMtPnNjcl93aWR0aCwgcy0+c2NyX2hlaWdodCk7CiB9CiAKIHN0YXRpYyB2b2lkIGcz NjRmYl9kcmF3X2JsYW5rKEczNjRTdGF0ZSAqcywgaW50IGZ1bGxfdXBkYXRlKQpAQCAtMTA0 LDE3ICsxMDAsMTUgQEANCiAKICAgICBpZiAoIWZ1bGxfdXBkYXRlKQogICAgICAgICByZXR1 cm47Ci0gICAgaWYgKHMtPmxhc3Rfc2NyX3dpZHRoIDw9IDAgfHwgcy0+bGFzdF9zY3JfaGVp Z2h0IDw9IDApCi0gICAgICAgIHJldHVybjsKIAotICAgIHcgPSBzLT5sYXN0X3Njcl93aWR0 aCAqICgocy0+ZHMtPmRlcHRoICsgNykgPj4gMyk7CisgICAgdyA9IHMtPnNjcl93aWR0aCAq ICgocy0+ZHMtPmRlcHRoICsgNykgPj4gMyk7CiAgICAgZCA9IHMtPmRzLT5kYXRhOwotICAg IGZvcihpID0gMDsgaSA8IHMtPmxhc3Rfc2NyX2hlaWdodDsgaSsrKSB7CisgICAgZm9yKGkg PSAwOyBpIDwgcy0+c2NyX2hlaWdodDsgaSsrKSB7CiAgICAgICAgIG1lbXNldChkLCAwLCB3 KTsKICAgICAgICAgZCArPSBzLT5kcy0+bGluZXNpemU7CiAgICAgfQotICAgIGRweV91cGRh dGUocy0+ZHMsIDAsIDAsCi0gICAgICAgICAgICAgICBzLT5sYXN0X3Njcl93aWR0aCwgcy0+ bGFzdF9zY3JfaGVpZ2h0KTsKKworICAgIGRweV91cGRhdGUocy0+ZHMsIDAsIDAsIHMtPnNj cl93aWR0aCwgcy0+c2NyX2hlaWdodCk7CiB9CiAKICNkZWZpbmUgR01PREVfR1JBUEggMApA QCAtMTI1LDYgKzExOSw5IEBADQogICAgIEczNjRTdGF0ZSAqcyA9IG9wYXF1ZTsKICAgICBp bnQgZnVsbF91cGRhdGUsIGdyYXBoaWNfbW9kZTsKIAorICAgIGlmIChzLT5zY3Jfd2lkdGgg PT0gMCB8fCBzLT5zY3JfaGVpZ2h0ID09IDApCisgICAgICAgIHJldHVybjsKKwogICAgIGlm IChzLT5jdGxhICYgQ1RMQV9GT1JDRV9CTEFOSykKICAgICAgICAgZ3JhcGhpY19tb2RlID0g R01PREVfQkxBTks7CiAgICAgZWxzZQpAQCAtMTM0LDYgKzEzMSwxMCBAQA0KICAgICAgICAg cy0+Z3JhcGhpY19tb2RlID0gZ3JhcGhpY19tb2RlOwogICAgICAgICBmdWxsX3VwZGF0ZSA9 IDE7CiAgICAgfQorICAgIGlmIChzLT5zY3Jfd2lkdGggIT0gcy0+ZHMtPndpZHRoIHx8IHMt PnNjcl9oZWlnaHQgIT0gcy0+ZHMtPmhlaWdodCkgeworICAgICAgICBxZW11X2NvbnNvbGVf cmVzaXplKHMtPmNvbnNvbGUsIHMtPnNjcl93aWR0aCwgcy0+c2NyX2hlaWdodCk7CisgICAg ICAgIGZ1bGxfdXBkYXRlID0gMTsKKyAgICB9CiAgICAgc3dpdGNoKGdyYXBoaWNfbW9kZSkg ewogICAgICAgICBjYXNlIEdNT0RFX0dSQVBIOgogICAgICAgICAgICAgZzM2NGZiX2RyYXdf Z3JhcGhpYyhzLCBmdWxsX3VwZGF0ZSk7CkBAIC0xNTgsNyArMTU5LDYgQEANCiAKICAgICBt ZW1zZXQocy0+cGFsZXR0ZSwgMCwgc2l6ZW9mKHMtPnBhbGV0dGUpKTsKICAgICBzLT5zY3Jf d2lkdGggPSBzLT5zY3JfaGVpZ2h0ID0gMDsKLSAgICBzLT5sYXN0X3Njcl93aWR0aCA9IHMt Pmxhc3Rfc2NyX2hlaWdodCA9IDA7CiAgICAgbWVtc2V0KHMtPnZyYW1fYnVmZmVyLCAwLCBz LT52cmFtX3NpemUpOwogICAgIHMtPmdyYXBoaWNfbW9kZSA9IC0xOyAvKiBmb3JjZSBmdWxs IHVwZGF0ZSAqLwogfQpAQCAtMjY2LDggKzI2Niw2IEBADQogI2VuZGlmCiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKHMtPnNjcl93aWR0aCAmJiBz LT5zY3JfaGVpZ2h0KQotICAgICAgICAgICAgcWVtdV9jb25zb2xlX3Jlc2l6ZShzLT5jb25z b2xlLCBzLT5zY3Jfd2lkdGgsIHMtPnNjcl9oZWlnaHQpOwogICAgIH0KICAgICBzLT5ncmFw aGljX21vZGUgPSAtMTsgLyogZm9yY2UgZnVsbCB1cGRhdGUgKi8KIH0KSW5kZXg6IGh3L2cz NjRmYl90ZW1wbGF0ZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gaHcvZzM2NGZiX3RlbXBsYXRl LmgJKHJldmlzaW9uIDUwMTMpDQorKysgaHcvZzM2NGZiX3RlbXBsYXRlLmgJKHdvcmtpbmcg Y29weSkNCkBAIC0yNywxMSArMjcsMTEgQEANCiAgICAgdWludDhfdCAqZGF0YV9kaXNwbGF5 LCAqZGQ7CiAKICAgICBkYXRhX2J1ZmZlciA9IHMtPnZyYW1fYnVmZmVyOwotICAgIHdfZGlz cGxheSA9IHMtPmxhc3Rfc2NyX3dpZHRoICogUElYRUxfV0lEVEggLyA4OworICAgIHdfZGlz cGxheSA9IHMtPnNjcl93aWR0aCAqIFBJWEVMX1dJRFRIIC8gODsKICAgICBkYXRhX2Rpc3Bs YXkgPSBzLT5kcy0+ZGF0YTsKLSAgICBmb3IoaSA9IDA7IGkgPCBzLT5sYXN0X3Njcl9oZWln aHQ7IGkrKykgeworICAgIGZvcihpID0gMDsgaSA8IHMtPnNjcl9oZWlnaHQ7IGkrKykgewog ICAgICAgICBkZCA9IGRhdGFfZGlzcGxheTsKLSAgICAgICAgZm9yIChqID0gMDsgaiA8IHMt Pmxhc3Rfc2NyX3dpZHRoOyBqKyssIGRkICs9IFBJWEVMX1dJRFRIIC8gOCwgZGF0YV9idWZm ZXIrKykgeworICAgICAgICBmb3IgKGogPSAwOyBqIDwgcy0+c2NyX3dpZHRoOyBqKyssIGRk ICs9IFBJWEVMX1dJRFRIIC8gOCwgZGF0YV9idWZmZXIrKykgewogICAgICAgICAgICAgdWlu dDhfdCBpbmRleCA9ICpkYXRhX2J1ZmZlcjsKICAgICAgICAgICAgICooKGdsdWUoZ2x1ZSh1 aW50LCBQSVhFTF9XSURUSCksIF90KSAqKWRkKSA9IGdsdWUocmdiX3RvX3BpeGVsLCBCUFAp KAogICAgICAgICAgICAgICAgIHMtPnBhbGV0dGVbaW5kZXhdWzBdLAo= --------------010708060105090101050302--