From patchwork Thu Jan 11 04:59:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 858784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="ZM64Gk6N"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHDH835D9z9sNV for ; Thu, 11 Jan 2018 16:01:07 +1100 (AEDT) Received: from localhost ([::1]:40901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZUzB-00032k-9g for incoming@patchwork.ozlabs.org; Thu, 11 Jan 2018 00:01:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZUyJ-00031L-V7 for qemu-devel@nongnu.org; Thu, 11 Jan 2018 00:00:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZUyJ-0000Fe-5z for qemu-devel@nongnu.org; Thu, 11 Jan 2018 00:00:12 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:32799) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZUyI-00009E-EN; Thu, 11 Jan 2018 00:00:11 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zHDFy0TRFz9t3F; Thu, 11 Jan 2018 16:00:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1515646806; bh=XOPJ3eKpCa8ppy0Xd3Mo9UxDjb/qwKcq2e5lxUh3xTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZM64Gk6NdAlc1IgAnPLasZ6p0jysxEpIQf4nL9wlYrwVdwb5eXrpoET3XekiKiUEG G3y/vjFos8RYgMtuIKMFLOZAyjgd8axNWriVBsS2yRk0Ca3P5KsEDv7TjQ3WJVfIfM qVjMLYIjcGy6p0V9Q18LelRShUQW16OBmGILXX/c= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 11 Jan 2018 15:59:28 +1100 Message-Id: <20180111045937.2119-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180111045937.2119-1-david@gibson.dropbear.id.au> References: <20180111045937.2119-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 02/11] sm501: Add panel hardware cursor registers also to read function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, surajjs@au1.ibm.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: BALATON Zoltan These were forgotten when adding panel layer support in ffd39257018 "SM501 emulation for R2D-SH4". Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé [dwg: Added reference to earlier commit in message] Signed-off-by: David Gibson --- hw/display/sm501.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 7f1822421a..b9b611131e 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -956,6 +956,19 @@ static uint64_t sm501_disp_ctrl_read(void *opaque, hwaddr addr, ret = s->dc_panel_v_sync; break; + case SM501_DC_PANEL_HWC_ADDR: + ret = s->dc_panel_hwc_addr; + break; + case SM501_DC_PANEL_HWC_LOC: + ret = s->dc_panel_hwc_location; + break; + case SM501_DC_PANEL_HWC_COLOR_1_2: + ret = s->dc_panel_hwc_color_1_2; + break; + case SM501_DC_PANEL_HWC_COLOR_3: + ret = s->dc_panel_hwc_color_3; + break; + case SM501_DC_VIDEO_CONTROL: ret = s->dc_video_control; break;