Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp9725121rwl; Wed, 11 Jan 2023 09:09:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzMKZkTlI5/SpXbIxrcdMBsrweA3plPMVg/ku9Pw8N4vAwUa+NksEzi29VrIUWplz5LUUx X-Received: by 2002:a17:907:d684:b0:7c1:11fd:9b98 with SMTP id wf4-20020a170907d68400b007c111fd9b98mr64876474ejc.27.1673456976711; Wed, 11 Jan 2023 09:09:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673456976; cv=none; d=google.com; s=arc-20160816; b=uLi6H1V6/ZjwpLOMQDmhyrT5QmDsCJg0AK7hC4121rBrvsYEGW31YACkU4G46fZJwS p/oK33SPqHtHDm3N/a4udLHnuVIf1Vj5j/oM7B44pBygulMCnRLZV4td9gf7QqxZy4Vz BR3O91P4iI283Je9xKiYXJ6BWSZziC6UJCV0RJUvwEJXYDDJ+4IWzRE7irkxivp/kLBT HnYVGiU2R/PjUjA0e0b5nqMA3Zd7MA7I82rlqSoJg+N5PJF0drs2wxUfoXCEL2DhwoRM zfZWUnuWeJYx/DFvfv48qPsHlgHcdTqdgHSMyuayF9BtaL59jzLT5q3jmHc/0GHi8BSw owuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=HxRYFvZ1+BeTGMrTtJZgEBUI9joLdvIfL1k/Gm7E0+s=; b=UTSOQAhuNeWSa/ybkfH6GxQVosvYIQ5ewh6SRVv7/r8eqAB7qu6uoxH8MJI3s+m1gg lKp1ZRr6NDsgtVHtT349/UCvnVmZovuabhMJo308GccOFAjkkGPMUaHkKtxJ80F3rOpL HoeXLGq1La702UzM7xNgG1mHi0u2voU3vSG2NxybZPS166RQYY0R1qNzh8aXtw5WjTrz qwmN8cP4nLz/OZ03d68AgLs/fRCz8lqUnCWYmYH/7G4WHlTE3BZTDiAzGiauQ98yUsXg nHa3DFZ9muJ38+HuuYWHiTNem8XZDTFGhyJSTxITbHPDI++kfqU+kLwXUk6RVes/RpiB B6KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TmbgmCvj; 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=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd12-20020a170907628c00b007c14665652esi16466601ejc.299.2023.01.11.09.09.23; Wed, 11 Jan 2023 09:09: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=@redhat.com header.s=mimecast20190719 header.b=TmbgmCvj; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230477AbjAKQox (ORCPT + 53 others); Wed, 11 Jan 2023 11:44:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231461AbjAKQou (ORCPT ); Wed, 11 Jan 2023 11:44:50 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 227F36374 for ; Wed, 11 Jan 2023 08:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673455432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HxRYFvZ1+BeTGMrTtJZgEBUI9joLdvIfL1k/Gm7E0+s=; b=TmbgmCvjRLNInAY+VsvVbgx1rWtUTb/har4ZotZRXI5n5JrWUYa505Ui1R7wLRHY4JeOUu 06x5uAadA3cYLMUxsBsSL1KWATKzNCAKYgCVEumdfgX/FwtJQYdtIHEDspMCQcIPApO4xS /hjKK2wcafuEwmpvGgFGa853wpckZMc= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-325-_CDbt5TbPmq4FZWxS8Yx-Q-1; Wed, 11 Jan 2023 11:43:48 -0500 X-MC-Unique: _CDbt5TbPmq4FZWxS8Yx-Q-1 Received: by mail-wm1-f71.google.com with SMTP id p34-20020a05600c1da200b003d990064285so10982026wms.8 for ; Wed, 11 Jan 2023 08:43:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HxRYFvZ1+BeTGMrTtJZgEBUI9joLdvIfL1k/Gm7E0+s=; b=eRXKxIm5g9kLlm+QBSd0ge5k7sEGWufooov7K/B5gS12av6dKY6TkBkJ5rJ+XtnSbc yD+wi7Q6BfFlucga9V7nWd7CGOupsoRDMKBEzyyMzEy14tPwqlL3GYKToIFNuxBL9EH3 cWW20QCVuSBTmu+CpwDDrr4WS9LLmOJFJbwoqFX/lmWOGRBxua9ZqjyNmZCiu/dOsHR3 zVN8GsXXWH+dcvsMfmWgi5Z0tVNiw3mV0/i1Zf/djDVOdisTQ0kI4E4rH7NLDf+AbR1B qqcexNMYCThGK76G8mlhsipzRefo6+JDQrZd/zCUQ+4CookvuDzOd4wfV489Aoo4YwJz t9qQ== X-Gm-Message-State: AFqh2kqnprbaP2yzw1DaOmscGodRZx7dOym5JpaQa/V6H5AkTdI8/hCi p+CN03E9lWp+RDykx6uZeqA/jTGQZTIagFhkq7RKR/RxIHpCFS7JfK2TiZLTu7/P7Elaj+d+Lqc C0AzRY69lUn1dwwil4d3x7yra X-Received: by 2002:a05:600c:a51:b0:3d2:3376:6f38 with SMTP id c17-20020a05600c0a5100b003d233766f38mr51935574wmq.20.1673455427719; Wed, 11 Jan 2023 08:43:47 -0800 (PST) X-Received: by 2002:a05:600c:a51:b0:3d2:3376:6f38 with SMTP id c17-20020a05600c0a5100b003d233766f38mr51935564wmq.20.1673455427564; Wed, 11 Jan 2023 08:43:47 -0800 (PST) Received: from [192.168.1.130] (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id u21-20020a7bc055000000b003d9aa76dc6asm27673760wmc.0.2023.01.11.08.43.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Jan 2023 08:43:47 -0800 (PST) Message-ID: Date: Wed, 11 Jan 2023 17:43:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH 11/11] video/aperture: Only remove sysfb on the default vga pci device Content-Language: en-US To: Thomas Zimmermann , Daniel Vetter , DRI Development Cc: Aaron Plattner , Intel Graphics Development , LKML , stable@vger.kernel.org, Alex Deucher , Daniel Vetter , Sam Ravnborg , Helge Deller References: <20230111154112.90575-1-daniel.vetter@ffwll.ch> <20230111154112.90575-11-daniel.vetter@ffwll.ch> <2102a618-2d5e-c286-311f-30e4baa4f85b@suse.de> From: Javier Martinez Canillas In-Reply-To: <2102a618-2d5e-c286-311f-30e4baa4f85b@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 On 1/11/23 17:20, Thomas Zimmermann wrote: [...] >> >> diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c >> index ba565515480d..a1821d369bb1 100644 >> --- a/drivers/video/aperture.c >> +++ b/drivers/video/aperture.c >> @@ -321,15 +321,16 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na >> >> primary = pdev == vga_default_device(); >> >> + if (primary) >> + sysfb_disable(); >> + > > There's another sysfb_disable() in aperture_remove_conflicting_devices() > without the branch but with a long comment. I find this slightly confusing. > > I'd rather add a branched sysfb_disable() plus the comment to > aperture_detach_devices(). And then add a 'primary' parameter to > aperture_detach_devices(). In aperture_remove_conflicting_devices() the > parameter would be unconditionally true. > Or just remove that long comment since there's already kernel-doc for the sysfb_disable() function definition. This feels to me that any approach to parameterize this will lead to code that is harder to read. Since is just a single function call, I would just duplicate like $subject does to be honest. -- Best regards, Javier Martinez Canillas Core Platforms Red Hat