Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp25161423rwd; Sun, 2 Jul 2023 11:31:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0X8gTIYZk5tZEd6GfZEjuTVqyZg0BMomZRmVBQT5H10MzOKPWWV4HdT1J+Kgwg/3j44YF X-Received: by 2002:aa7:88cf:0:b0:678:4e9d:8fea with SMTP id k15-20020aa788cf000000b006784e9d8feamr9753100pff.15.1688322716527; Sun, 02 Jul 2023 11:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688322716; cv=none; d=google.com; s=arc-20160816; b=USv+URkyN4htJ7Bvn9KN/G5S2ZMGSMjsp1/Bs6d4KeXLsQx1wZP/ba/ymulbhUp5VB 1o4p15+03GhdHCNnUVgoZz5299VxDG70RviItPF2GuMudOdFd7Zbpq1ICDZd2iUtBU+D zeO1vAUyvrCcWt8E2Hn5prMfyMREIQUP9ZvrtvE7jfd936XbHMN3EIvjBqYjtGcX2GpH 43huRuT6pwNo01Us6jVCkSu/pW37pRytCOsqYVyG4VnMIkkn+yXsyURd5b+VAg8JjSTT k1GNTEclVjlLl9JDMDSRLe+f6d3jzSTufqMvL5URNVi+tKmfopBgIO1MG4eY5hs8LxTS jfjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JD+BSfEOubeM4NaunZhKuggns+1jx3KG/ygiczCTpQY=; fh=7B/sikuQ4mXvx+99i2Dcw6VGKfAkLFQnlIHzY/HpgmE=; b=gV4Kon7ZYNx5tpVimrL7w5WrV7Lgg/W97ySPBDottFRvJyOHsC9iSQpXCtLyDaSrr8 R9/F/4gLD2UPjzAI3FRLMBoHBbpcbj9PKr9mRewj9lBVruRJb7pClMGwm8krVPuT7P/y D1OkxT469rEBwwF4cUY7b+zL9+5+o8R8USUVumXFign/S66bJLCFuaYCCQjUJPeaavFn 2lMXGpERTBGEqhBgCLDsVnFWYmDrdaN96rIEE3X+w7CxXc77y64IIcd4LPMh6+cowmzz pkSXBIk65Ouyog/Li1GOxportlWxDwq8AKoRtTo/EzNHrfKTOHNnwFLGZM1U1bUrEhGA nCwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hsPJDuYj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cl11-20020a056a0032cb00b0067f4fd59b00si9748215pfb.260.2023.07.02.11.31.42; Sun, 02 Jul 2023 11:31:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hsPJDuYj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229852AbjGBS27 (ORCPT + 99 others); Sun, 2 Jul 2023 14:28:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229701AbjGBS25 (ORCPT ); Sun, 2 Jul 2023 14:28:57 -0400 Received: from out-52.mta0.migadu.com (out-52.mta0.migadu.com [91.218.175.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EE4A123 for ; Sun, 2 Jul 2023 11:28:38 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688322516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JD+BSfEOubeM4NaunZhKuggns+1jx3KG/ygiczCTpQY=; b=hsPJDuYj9iRgllcgTdnKnVeIWHI4dbFO6cetTcGBRitOohcizdBhNOgpXttZSEDOrRYB5m YFJNaZLsmoLXvdcfKsN/KjXlvPsWffQ20eToqWq6ZBWru43mzpRqHFZmlFwwfPaOHCHF4R FpaJ05EzBAAFuai3Fohx7nkMzTFuZlM= From: Sui Jingfeng To: Alex Deucher , David Airlie , Daniel Vetter , Thomas Zimmermann , Maxime Ripard , Jani Nikula , Lyude Paul , Bjorn Helgaas , Mario Limonciello Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-fbdev@vger.kernel.org, Sui Jingfeng , Jocelyn Falempe Subject: [PATCH v2 6/6] drm/ast: Register as a vga client to vgaarb by calling vga_client_register() Date: Mon, 3 Jul 2023 02:27:44 +0800 Message-Id: <20230702182744.755467-7-sui.jingfeng@linux.dev> In-Reply-To: <20230702182744.755467-1-sui.jingfeng@linux.dev> References: <20230702182744.755467-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sui Jingfeng Becasuse the VGA Display Controller in the ASpeed BMC chip is also a PCIe device, the Software Programming guide of AST2400 say that it is Fully IBM VGA compliant, thus, it should also particiate in the arbitration. Cc: Thomas Zimmermann Cc: Jocelyn Falempe Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/ast/ast_drv.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index e1224ef4ad83..5ce681142679 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -89,6 +90,32 @@ static const struct pci_device_id ast_pciidlist[] = { MODULE_DEVICE_TABLE(pci, ast_pciidlist); +static bool ast_is_boot_device(struct pci_dev *pdev) +{ + struct drm_device *drm = pci_get_drvdata(pdev); + struct ast_device *ast = to_ast_device(drm); + + return drm_aperture_contain_firmware_fb(ast->vram_base, ast->vram_size); +} + +static unsigned int ast_vga_set_decode(struct pci_dev *pdev, bool state) +{ + struct drm_device *drm = pci_get_drvdata(pdev); + struct ast_device *ast = to_ast_device(drm); + + if (state) { + /* Enable standard VGA decode and Enable normal VGA decode */ + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x04); + + return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM | + VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; + } + + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x07); + + return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; +} + static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct ast_device *ast; @@ -112,6 +139,8 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) return ret; + vga_client_register(pdev, ast_vga_set_decode, ast_is_boot_device); + drm_fbdev_generic_setup(dev, 32); return 0; -- 2.25.1