From patchwork Wed Jan 11 15:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 42063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3391510wrt; Wed, 11 Jan 2023 07:42:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXs2H96QugygsNikDIyhD/ry1RrenWrS9gXiJQ0kUF5335kGe+/ShsLgMPXI8uSgdQE9JulP X-Received: by 2002:aa7:9533:0:b0:585:e009:6e41 with SMTP id c19-20020aa79533000000b00585e0096e41mr13641917pfp.10.1673451756866; Wed, 11 Jan 2023 07:42:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673451756; cv=none; d=google.com; s=arc-20160816; b=QOPAxSXAOLT5kqCqKoadS0DkFTmSfPjqRRuuVU5tLHVegJwlv4fRm7sdQH+mMmtwL7 sF8c2skzM2J5GtIj9xFhG30h2VIscBLG/LDjTD1AVh9WO7aurOEFvmXPuOwMpLk+luAt SpH3BuQq6gf3t1PnG6OaTsnzTVTXhFTgmebaDtKPF6sK6kPTEud5WfkfmxZ5cCBQn6XE gPwmwCYd51F5i5AzTQJqL1xgkx636Hx5tsfUin2FgvYXeYhsRd/OwClveorTPD2l6afZ uYguyTrh1gCNVmVDco1O41KIVA1CIXyg7zykFkjoveXhNKyNhIQoCwW8kuzlYkY83xdh EajA== 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=G2sqw4liQtpNZ++ehK/ijyVQMT7dm9/yDDOGWgKM06Q=; b=PCevfdLK/CLlHBbamuOAdsqvNy1SUdOFph8XXbiXK5xx12NyPbFhpoo/nidx2PFzUu v7fFbWxzmwU45sQ4SFo53HmY8s3ZSZNi84E6iwcknn9Xa2TLJWLybLuHDEJAn8KwaWCR ENxJ4wZgIfF0OubCg+oA4Js0kMI1rFzbK6ffF3GnXePa2rivx9bL89JHVPhINT/L8ZL2 YRzfZzbsz2ZN2Rhkl5XHIMw6kuBeNhvwRxkd4hMtBUC6BNP0Ba4IC5c5HLDK6Yv61w/P RxdKPfHfO7/KxnTK/dciQdad85DFveZr0iCDZHmQ+tpucYw0zYrkC75kEYzTyB+r+Hb5 LcIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=QFSULLmM; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l4-20020a056a0016c400b0056ee105315fsi15398647pfc.178.2023.01.11.07.42.23; Wed, 11 Jan 2023 07:42:36 -0800 (PST) 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=@ffwll.ch header.s=google header.b=QFSULLmM; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238848AbjAKPmN (ORCPT + 99 others); Wed, 11 Jan 2023 10:42:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235411AbjAKPlc (ORCPT ); Wed, 11 Jan 2023 10:41:32 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BAECB68 for ; Wed, 11 Jan 2023 07:41:31 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso12990641wmq.1 for ; Wed, 11 Jan 2023 07:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; 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=G2sqw4liQtpNZ++ehK/ijyVQMT7dm9/yDDOGWgKM06Q=; b=QFSULLmMVFFwJ3kPRo04bI+cTmjJnjfKH40bscRWkka9KWLPADsKgemIa4JXzvMkeK v49Cp1Za1fPlLnKdgCl4jKo453bf3sIRTGpbcHpGl7KAbEP0dJP61vP0ovBnnh98zN2z 7FfdaXLc80KuSpk0fZAE3Tu5F7hg8nJd6DWYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=G2sqw4liQtpNZ++ehK/ijyVQMT7dm9/yDDOGWgKM06Q=; b=kszDzNhcddt+bderrZsdKL+RSRnDkWHHS5DqSgArFYumZ9ZiPDuy2QLOWviFAmy3po SkDlrdmBWKru4YM785QAZdsz0ZjFCe+XWyyhZQpSCnz7pyT/hXkL3lReM3IZ0O+Bp8+5 STEJ9uwqxtG4v0sNv2k0FsUAjfXcguVerth9dqBUHiXnvoJ9uGiVQqD/9vvy3qpULfwH AxGFMTNMRECYAPCo+iJRw/WypY+/+TMAtRWIIFDv4wUEtOO89wHT/Dr2B0KgqhSop6Bi oulB1cUM7VrWTV9tBDXai/8Gcub8YliaV6ciJmtpaGCGgpvtcaLjbJSo/vNGKQzj3LCK k9fQ== X-Gm-Message-State: AFqh2kr47bzTMwLotpGXMbHxeaofF6adEZkLGlC5AeIfr7A7RjRSKZ8C b+qIenVA/anTD54IDXmDb0yLb+KTB9qYiTUP X-Received: by 2002:a05:600c:54c2:b0:3d3:3c74:dbd0 with SMTP id iw2-20020a05600c54c200b003d33c74dbd0mr52401995wmb.13.1673451690779; Wed, 11 Jan 2023 07:41:30 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b003d9e74dd9b2sm15936149wmq.9.2023.01.11.07.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 07:41:30 -0800 (PST) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , LKML , Daniel Vetter , Daniel Vetter , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , linux-hyperv@vger.kernel.org Subject: [PATCH 08/11] fbdev/hyperv: use pci aperture helpers Date: Wed, 11 Jan 2023 16:41:09 +0100 Message-Id: <20230111154112.90575-8-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111154112.90575-1-daniel.vetter@ffwll.ch> References: <20230111154112.90575-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754741349411344169?= X-GMAIL-MSGID: =?utf-8?q?1754741349411344169?= Again this just gets setting the primary parameter right, which might help in some case (but then I guess the hyperv display isn't vga compatible, I have no idea). It's more consistent for sure. Signed-off-by: Daniel Vetter Cc: "K. Y. Srinivasan" Cc: Haiyang Zhang Cc: Wei Liu Cc: Dexuan Cui Cc: linux-hyperv@vger.kernel.org --- drivers/video/fbdev/hyperv_fb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index fdbf02b42723..1067a64bbdf3 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1076,9 +1076,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) info->screen_size = dio_fb_size; getmem_done: - aperture_remove_conflicting_devices(info->apertures->ranges[0].base, - info->apertures->ranges[0].size, - false, KBUILD_MODNAME); + aperture_remove_conflicting_pci_devices(pdev, KBUILD_MODNAME); if (gen2vm) { /* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */