From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7226C432C0 for ; Thu, 28 Nov 2019 07:53:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96A4C215E5 for ; Thu, 28 Nov 2019 07:53:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96A4C215E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaEcY-0001SP-IA for qemu-devel@archiver.kernel.org; Thu, 28 Nov 2019 02:53:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52380) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaEaX-0007s1-RN for qemu-devel@nongnu.org; Thu, 28 Nov 2019 02:51:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaEaW-00037d-QF for qemu-devel@nongnu.org; Thu, 28 Nov 2019 02:51:45 -0500 Received: from [2406:7400:73:186d:af79:94fc:29ef:77e6] (port=56078 helo=localhost) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iaEaW-0002k2-Dq for qemu-devel@nongnu.org; Thu, 28 Nov 2019 02:51:44 -0500 Received: by localhost (Postfix, from userid 1000) id 1FB10D41713; Mon, 25 Nov 2019 19:54:43 +0530 (IST) From: aaron.zakhrov@gmail.com To: qemu-devel@nongnu.org Subject: [RFC 6/8] Fix MC STATUS resgister Date: Mon, 25 Nov 2019 19:49:14 +0530 Message-Id: <20191125141908.5441-7-aaron.zakhrov@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191125141908.5441-1-aaron.zakhrov@gmail.com> References: <20191125141908.5441-1-aaron.zakhrov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2406:7400:73:186d:af79:94fc:29ef:77e6 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: kraxel@redhat.com, Aaron Dominick Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Aaron Dominick --- hw/display/r300.c | 15 ++++++++++++--- hw/display/r300.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/display/r300.c b/hw/display/r300.c index 94e90b7a95..653474c3aa 100644 --- a/hw/display/r300.c +++ b/hw/display/r300.c @@ -278,6 +278,10 @@ static uint64_t r300_mm_read(void *opaque, hwaddr ad= dr, unsigned int size) uint64_t val =3D 0; =20 switch (addr) { + case RADEON_MC_STATUS: + val =3D s->regs.mc_status; + break; + case RADEON_MM_INDEX: val =3D s->regs.mm_index; break; @@ -358,9 +362,9 @@ static uint64_t r300_mm_read(void *opaque, hwaddr add= r, unsigned int size) case RADEON_CONFIG_REG_APER_SIZE: val =3D memory_region_size(&s->mm); break; - case RADEON_MC_STATUS: - val =3D 5; - break; + // case RADEON_MC_STATUS: + // val =3D 5; + // break; case RADEON_RBBM_STATUS: val =3D 64; /* free CMDFIFO entries */ break; @@ -512,6 +516,10 @@ static void r300_mm_write(void *opaque, hwaddr addr, trace_ati_mm_write(size, addr, r300_reg_name(addr & ~3ULL), data= ); } switch (addr) { + case RADEON_MC_STATUS: + s->regs.mc_status =3D R300_MC_IDLE; + s->regs.mc_status =3D data; + break; case RADEON_RBBM_STATUS: s->regs.rbbm_status =3D data|=3D RADEON_RBBM_FIFOCNT_MASK; break; @@ -946,6 +954,7 @@ static void r300_vga_realize(PCIDevice *dev, Error **= errp) static void r300_vga_reset(DeviceState *dev) { RADVGAState *s =3D RAD_VGA(dev); + s->regs.mc_status =3D R300_MC_IDLE; =20 timer_del(&s->vblank_timer); r300_vga_update_irq(s); diff --git a/hw/display/r300.h b/hw/display/r300.h index 60f572647f..a9e1db32be 100644 --- a/hw/display/r300.h +++ b/hw/display/r300.h @@ -81,6 +81,7 @@ typedef struct RADVGARegs{ uint32_t default_pitch; uint32_t default_tile; uint32_t default_sc_bottom_right; + uint32_t mc_status; =20 //Color Buffer RB3D uint32_t r300_rb3d_aaresolve_ctl; --=20 2.24.0