Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37136243rwd; Tue, 11 Jul 2023 09:54:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlEKhrJjfD39yYh3XQmli4zGGWwga6HreQhIneh249fs5wdcGQoXsmD6QoDzVZzxHG6SxySM X-Received: by 2002:a17:902:a710:b0:1a6:46f2:4365 with SMTP id w16-20020a170902a71000b001a646f24365mr11457751plq.30.1689094446246; Tue, 11 Jul 2023 09:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689094446; cv=none; d=google.com; s=arc-20160816; b=dKk/Qg4NZUc//mKeGWV0xYgAEM8l0eF/CiBe9QkI/JmeHmdJwtiRWv3zXwc6ysPA7j XPUc0IpKGfhRMbKKWyH3TXA6WaW38tqDYpo2TiYHcHEmPYyY2FR3wrM5B2EMTChnMfUU EO61vDHQS5ghTfeitWUzS8bkZZhL3H9lP4ZNsZkbZEQpsGTqdbE2GK+KAGnb0f/QIzBy rGBcseId4IyKH2cxrqKaV9mGGyDUK42cG9r5scsWxvYo0hyKYkWRv8F50EsVIETUu9/Z IhtsW+UAQv4RIusCSgcBUEBCD61mYv4gL+Ov9iDJXfU09z69B3iPWdfqeFBz0FrepNow FOAQ== 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=iVEqfzU8LKaeTCpd0iTjGV1loy12NrUravzVWeb1zk8=; fh=qoBA2N2+9d8RSEf/OcfUwJymeeZyG6ZXZj0uCQ6n9/M=; b=DH7IWuMuSvYKduLfsA8bLEdlVi+J31scClqpWCag6ELXOWTd2sezJ2BG9V5fDYPrue pD+rB/mrn9e5aWll9Fk7YonVktHXl6K1rGXG2FH4HlCB8sZaWG/FdPL/YjPvlRBDrkGo GbvFIA76S60Effj6kvPlNSPzkhxMvJSyFdWp8TsK6SBzDrZlvH02R3RQKj4XtqCpRGx2 3o9vpC0YhqRxbVbM5mcoajOHlfYE1sPgwrH9rOQS1Fwj/pq5qxBW0WitZpaXAV5PZm1V FRfAhTGb46pvEvWLU2/I9rnAFmZwyabLm/xRQmy3j7tkCMmJr8HeE33w76RCaAM3KveV 5vZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=H3VPH7tc; 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 q12-20020a170902dacc00b001b9fb1a0465si234301plx.385.2023.07.11.09.53.53; Tue, 11 Jul 2023 09:54:06 -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=H3VPH7tc; 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 S233389AbjGKQoh (ORCPT + 99 others); Tue, 11 Jul 2023 12:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230313AbjGKQoL (ORCPT ); Tue, 11 Jul 2023 12:44:11 -0400 Received: from out-8.mta1.migadu.com (out-8.mta1.migadu.com [IPv6:2001:41d0:203:375::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0CA91FCF for ; Tue, 11 Jul 2023 09:43:56 -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=1689093834; 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=iVEqfzU8LKaeTCpd0iTjGV1loy12NrUravzVWeb1zk8=; b=H3VPH7tc08QQlw2h5nbl1lpqKBm+1PGywtLormVFLl9T0Bl6ppxX8pZfolXuvzfQorxg1H /L2uyQ6b68f3NY/OM/G+v4+IsWmf3aM/9tRax3B/Gphu9fd9i4aHg5iRxClevu+H1Lvr/T ZGpawz4uQZx+ixsSXOPb3VhDlhvWY94= From: Sui Jingfeng To: David Airlie Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, kvm@vger.kernel.org, linux-fbdev@vger.kernel.org, Sui Jingfeng , Thomas Zimmermann , Jocelyn Falempe , Daniel Vetter Subject: [PATCH v3 8/9] drm/ast: Register as a vga client to vgaarb by calling vga_client_register() Date: Wed, 12 Jul 2023 00:43:09 +0800 Message-Id: <20230711164310.791756-9-sui.jingfeng@linux.dev> In-Reply-To: <20230711164310.791756-1-sui.jingfeng@linux.dev> References: <20230711164310.791756-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,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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..0e53b0cd3f09 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_vga_is_primary_gpu(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_vga_is_primary_gpu); + drm_fbdev_generic_setup(dev, 32); return 0; -- 2.25.1