From patchwork Tue Feb 27 08:39:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 776165 Delivered-To: patch@linaro.org Received: by 2002:adf:a113:0:b0:33d:f458:43ce with SMTP id o19csp51817wro; Tue, 27 Feb 2024 00:41:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW0fUoG8q95XRlaHMY7H7fE78J7ji4eDtj6TKbjBIe/+owwiNFjszKmFaJ6qRmnX+uzHftY025tev+SXob3iXQL X-Google-Smtp-Source: AGHT+IHhpsxLgLp5aR4sSEijGheCyhUMmQS9X3sRg3JYkuLHQK/BUeoZcdIYeZ3PEKcxWOrONElH X-Received: by 2002:a05:620a:27d1:b0:787:e1e9:a42 with SMTP id i17-20020a05620a27d100b00787e1e90a42mr1529516qkp.5.1709023316558; Tue, 27 Feb 2024 00:41:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709023316; cv=none; d=google.com; s=arc-20160816; b=o9HRyjMRhvzsSjNKoVOspQNeEvcPl3d7eqYUv0qjznZH2maJuSx7rXJoKOEyUyv7Jd BVHfXFYv/mjjeYuaiSGL8YOFLrwEFxC5hHGIKiqpdERkXadiBBaK9QgZzbPg6moJq9lv zRsknY3jpehMV45+nB0mNyDykKLrX3HiXqKO5WC8vxH3IyFV1bTkc3mimXAWIHafTlB2 EXI+qLXQkQzJ/yPEAYkz78UqUU/N2w5od2yA9G+NBb4y+LxNOj/W533WvHlswGrq/02I g4CGCtwdiCjKRkESlKLTZgrM/XLlgRdpMb+6eHzDQGHqHegGt4tHYp7CC+yPvHwxHGgh bW4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vqc0dN+90FxlJ0ZwXpMXw0U7lDa+rLwNm5jLhzGNtec=; fh=MScVkeQ2iRsrAkejgD6U6vOGzjwdgMbmd00ccH8lUbg=; b=XUuWAZ6IDDrrXma64o0ReR5hNSNtMW8l2Zwe/Qt/R8zqsdPbMyeerd/S4qgv11P/tH N3gtYAJcNqh/ZjVENl8961Bv50h/EyvmmxTsDFHGhQ+cYtkH4fNr5b4zPb/lPW9CmaAb ZVv3Pkjz3Tayb86OveaWwF04odZb+Qr+iPT7PJgg+fKP9St5c4NGlB52+ZyYqKP2D5J5 ZDqgGr0qyRGVFI71AEfDeF1fJAK1LZJ74riusf47QQ8W7yI4Q/NzIRN3AAKBVhGvH9dw JOOt2X2hKTdQOBo/1XGkB+SsEb/YNolsn3ENVml5CY4meCmsu7fQW8VwWAVJK6v6BEW5 LU8Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="QU/VyRbt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z8-20020ae9e608000000b00787e872a47csi410603qkf.571.2024.02.27.00.41.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Feb 2024 00:41:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="QU/VyRbt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ret0r-0006K1-V7; Tue, 27 Feb 2024 03:40:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ret0p-0006Ee-Vp for qemu-devel@nongnu.org; Tue, 27 Feb 2024 03:40:31 -0500 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ret0a-0007dr-W5 for qemu-devel@nongnu.org; Tue, 27 Feb 2024 03:40:31 -0500 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2d29aad15a5so4238471fa.3 for ; Tue, 27 Feb 2024 00:40:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709023215; x=1709628015; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vqc0dN+90FxlJ0ZwXpMXw0U7lDa+rLwNm5jLhzGNtec=; b=QU/VyRbthrO/HXExLka9fsLfP+IcnXxNLVxLfYh/aUJIF2T7Tr9QQlLGpWL/i4Nhxj 9IipRRE0NBVH97LK4KU2oTaHxdtU3jTUK0wb7xvI+LAB2Lzf/dh0uSRzkv4WhYj4TsXG WuPn5OW808x2NYY78I4Aa8sDgbHJUWhrp4CYtxiftUliLhArt4u8FgmmOiTB/sVRyPci KiQEuYwjdoxPJMFavmKydHpaMwh02Qd+1uXhJag/1Fg9gTB/4u2B5ID9Z5r3KlYXRSWw xSeX5C8t9X9Hlv4RoGD++HUt3mI0N3kzmqYsn+4sUZp/mzK9PmBNvqy3SQxJtu/7lJO0 C7tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709023215; x=1709628015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vqc0dN+90FxlJ0ZwXpMXw0U7lDa+rLwNm5jLhzGNtec=; b=Gg6UIkiq4UeGb/4DsSSn9T+fxjnp0YIZu0Xwf9VTiZ9JNYIbX0/Si37CJ95Hj1/AJt YPXyoTOLxevw1WaAfGsb8tLrSJgZ+9E/nqXe7QlVlE15WnG+A0meKRGoZSXWnS9WkyzD cuq3yQKvnCebQ6TLmU2giRIFRxVkuwPMnc2PY2oRZV2JzNhGpGBrZX9ggkxcU/mw9aGq 26bvpOYclXddmp1FhD7R0tD20IvFUCV8Zx9Y18LFMInRmHMzdsM7Z8VGacyrp2hi24Z9 cAgO8+zSEiNVTQufN6EvoeXXj3C0/Gutr8VvANnzuQf/hSmI4IXXHJmu9p1wqnm39inN rnOg== X-Gm-Message-State: AOJu0YxW+8YqwySzra4IeRMXXOlJfYDXyemlq7EtmJaKFSbO++Hx+d4i ytd4zSSFwMdveLTUhnIr7hWYqYThWPENOtb8zRuQNpIFIcBxqKn/1F/HnNMtYeSAM4pQ2Uz3gcK d X-Received: by 2002:a2e:9c92:0:b0:2d2:628e:7fbf with SMTP id x18-20020a2e9c92000000b002d2628e7fbfmr5750458lji.36.1709023214817; Tue, 27 Feb 2024 00:40:14 -0800 (PST) Received: from m1x-phil.lan (mic92-h03-176-184-33-214.dsl.sta.abo.bbox.fr. [176.184.33.214]) by smtp.gmail.com with ESMTPSA id e13-20020a5d594d000000b0033dd53c8f15sm6479143wri.13.2024.02.27.00.40.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Feb 2024 00:40:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Igor Mitsyanko , Peter Maydell Subject: [PULL 04/30] hw/display/exynos4210_fimd: Pass frame buffer memory region as link Date: Tue, 27 Feb 2024 09:39:20 +0100 Message-ID: <20240227083948.5427-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240227083948.5427-1-philmd@linaro.org> References: <20240227083948.5427-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22d; envelope-from=philmd@linaro.org; helo=mail-lj1-x22d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Add the Exynos4210fimdState::'framebuffer-memory' property. Have the board set it. We don't need to call sysbus_address_space() anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20240226173805.289-5-philmd@linaro.org> --- hw/arm/exynos4210.c | 2 ++ hw/display/exynos4210_fimd.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index ab18836943..e3f1de2631 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -770,6 +770,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) /*** Display controller (FIMD) ***/ dev = qdev_new("exynos4210.fimd"); + object_property_set_link(OBJECT(dev), "framebuffer-memory", + OBJECT(system_mem), &error_fatal); busdev = SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(busdev, &error_fatal); sysbus_mmio_map(busdev, 0, EXYNOS4210_FIMD0_BASE_ADDR); diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 84687527d5..5712558e13 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" @@ -32,6 +33,7 @@ #include "qemu/bswap.h" #include "qemu/module.h" #include "qemu/log.h" +#include "qapi/error.h" #include "qom/object.h" /* Debug messages configuration */ @@ -302,6 +304,7 @@ struct Exynos4210fimdState { MemoryRegion iomem; QemuConsole *console; qemu_irq irq[3]; + MemoryRegion *fbmem; uint32_t vidcon[4]; /* Video main control registers 0-3 */ uint32_t vidtcon[4]; /* Video time control registers 0-3 */ @@ -1119,7 +1122,6 @@ static void exynos4210_fimd_invalidate(void *opaque) * VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) { - SysBusDevice *sbd = SYS_BUS_DEVICE(s); Exynos4210fimdWindow *w = &s->window[win]; hwaddr fb_start_addr, fb_mapped_len; @@ -1147,8 +1149,7 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) memory_region_unref(w->mem_section.mr); } - w->mem_section = memory_region_find(sysbus_address_space(sbd), - fb_start_addr, w->fb_len); + w->mem_section = memory_region_find(s->fbmem, fb_start_addr, w->fb_len); assert(w->mem_section.mr); assert(w->mem_section.offset_within_address_space == fb_start_addr); DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n", @@ -1924,6 +1925,12 @@ static const GraphicHwOps exynos4210_fimd_ops = { .gfx_update = exynos4210_fimd_update, }; +static Property exynos4210_fimd_properties[] = { + DEFINE_PROP_LINK("framebuffer-memory", Exynos4210fimdState, fbmem, + TYPE_MEMORY_REGION, MemoryRegion *), + DEFINE_PROP_END_OF_LIST(), +}; + static void exynos4210_fimd_init(Object *obj) { Exynos4210fimdState *s = EXYNOS4210_FIMD(obj); @@ -1944,6 +1951,11 @@ static void exynos4210_fimd_realize(DeviceState *dev, Error **errp) { Exynos4210fimdState *s = EXYNOS4210_FIMD(dev); + if (!s->fbmem) { + error_setg(errp, "'framebuffer-memory' property was not set"); + return; + } + s->console = graphic_console_init(dev, 0, &exynos4210_fimd_ops, s); } @@ -1954,6 +1966,7 @@ static void exynos4210_fimd_class_init(ObjectClass *klass, void *data) dc->vmsd = &exynos4210_fimd_vmstate; dc->reset = exynos4210_fimd_reset; dc->realize = exynos4210_fimd_realize; + device_class_set_props(dc, exynos4210_fimd_properties); } static const TypeInfo exynos4210_fimd_info = {