From patchwork Wed Jan 11 15:41:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 42057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3391238wrt; Wed, 11 Jan 2023 07:42:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXup3fpPQv/FxGdlk5BgMYLj9GfH2Dsq7PLu8OCs97Vil5XN56N3vu1zbqXIQgkbhzT/bHrd X-Received: by 2002:a05:6a00:e8d:b0:580:c223:90e9 with SMTP id bo13-20020a056a000e8d00b00580c22390e9mr63287472pfb.6.1673451723649; Wed, 11 Jan 2023 07:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673451723; cv=none; d=google.com; s=arc-20160816; b=xGClk9aDobd+MaoGo6LpoHkWPxLxmOvRoNlYHBtDGCdvzjlPp2z/gmEUVeuP2fVfDN HjNW9HqBb1pssYvHog3T6eaf6XFWhghXd6efISv3a5miR3rtQ49UUEVp/h60t9L1ui46 7xj8kf0wtfyhlp32Ehtd0wHJvgP+6/goyJRL28rltYsnZpOSUAOR19lIAD3VxGpsEk1P kH9+OiHzuJDNvfRGSHJi+2pD9g+41tAUH6jnIMShMjcMaEPfmpFqntAWyx6TYwm51Dgr VuUefLSdcHWvuiRNIxauaV0LTPtpmoKViftprQNWEwJtkjwSgOKvQMi7fbj1JYT4Os/Y cknQ== 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=94eajVQl3EIphKCpXXhL7CnxhOfjsXCJp+mdLyrDZk0=; b=WKRC5Fos0D4T02WhvwkldFxjwzWS8K7c5uXocYOn+nr+oNiVATsF2f2+/L2RNNadUp Po/6pcd+PNmcFf7tF10OvGTYkzLnwoDXNBpkSmlWaNBYH4LOgcyDqIh64lVQd+7YH3rx m7okPeflOUC6CrotKEg6v+iHSbsA8RVyM41ArNP9+zphnb7vqyW00DLdTZ2iUp+EUPL+ tQA3xoISZN8i60HfR16iNLsWwWyD1uTQPKk3i4SNU7cWp45n38JOVMSlL6vCgwxXjm4x mHJ3rsnhJFiTikbhsOAKBzr9uPongYJxct+hCtRcRihUhgt0RuGhimsUky4+hQiKhNfk fc0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=f7KHQ8uU; 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 t36-20020a056a0013a400b0056e4c95266bsi16632576pfg.77.2023.01.11.07.41.51; Wed, 11 Jan 2023 07:42:03 -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=f7KHQ8uU; 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 S235623AbjAKPli (ORCPT + 99 others); Wed, 11 Jan 2023 10:41:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233853AbjAKPlZ (ORCPT ); Wed, 11 Jan 2023 10:41:25 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 045F429C for ; Wed, 11 Jan 2023 07:41:24 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id l26so11383590wme.5 for ; Wed, 11 Jan 2023 07:41:23 -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=94eajVQl3EIphKCpXXhL7CnxhOfjsXCJp+mdLyrDZk0=; b=f7KHQ8uU7yo7cC1q+hRAYyai9jdEOJCO8tU1UcHPeDOQzr3zT9mcNDiHKbkAh9YMdi PcqaMKKeizVMG9LtdqmhoiqGGOE/2lkXWI8gQheuKM7IeiU6H+0SevQsiVwVjpCuYqMs pIc2/KEnN2fQGSipr275BOLjvkdqRmvXH0z6A= 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=94eajVQl3EIphKCpXXhL7CnxhOfjsXCJp+mdLyrDZk0=; b=pWSYNCmnT2PI6rz+iStjSFdkcZD/nGkGqb7i0pEXX6tc7aZZkB3XTZyunEyCwg9e0Z TSAc0WU5W8ehj2Ubxf9/hLNMTlf/p25r3AB5a4XEmsyJFtndZUBD4/iaFo90tZlAXZgN VtTA2hte6ZOsWC2xjcRKh2wPxUhnResaoOfjL3g1G+5HjpJdtML9cGw3XtdIARFM57Qv GNi+U8Kq4hRfc+fwBpODFYCxL9qr9ZCqS+vj0T/k134uVu/IME2XuuWx4Xy42nJD85jU 1Nb4jM6i/np5Id3Ia4OeSGBsXDn1TH4sjwvtv8HMeNURlwW+yBr8dRytOe0+fYOE6Fj1 qJgw== X-Gm-Message-State: AFqh2krUZFqAbnOjbQ1BIv8eUa3JXaTnFs9iyC39HSdYUmf2pZnjNGdJ 9JfZrDqmPrpKzZhf58KW6Es9sA== X-Received: by 2002:a05:600c:4e4f:b0:3cf:9d32:db67 with SMTP id e15-20020a05600c4e4f00b003cf9d32db67mr52259243wmq.3.1673451682597; Wed, 11 Jan 2023 07:41:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 07:41:21 -0800 (PST) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , LKML , Daniel Vetter , Daniel Vetter Subject: [PATCH 02/11] drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers Date: Wed, 11 Jan 2023 16:41:03 +0100 Message-Id: <20230111154112.90575-2-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?1754741314330059432?= X-GMAIL-MSGID: =?utf-8?q?1754741314330059432?= This one nukes all framebuffers, which is a bit much. In reality gma500 is igpu and never shipped with anything discrete, so there should not be any difference. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/gma500/psb_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index cd9c73f5a64a..9b0daf90dc50 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -429,7 +429,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * TODO: Refactor psb_driver_load() to map vdc_reg earlier. Then we * might be able to read the framebuffer range from the device. */ - ret = drm_aperture_remove_framebuffers(true, &driver); + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver); if (ret) return ret;