From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 279A0C32774 for ; Tue, 23 Aug 2022 07:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240551AbiHWHUA (ORCPT ); Tue, 23 Aug 2022 03:20:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240527AbiHWHT7 (ORCPT ); Tue, 23 Aug 2022 03:19:59 -0400 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 2208561D8B for ; Tue, 23 Aug 2022 00:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661239198; 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: in-reply-to:in-reply-to:references:references; bh=Hs7LaJusbzewq19gjdvDDnrR8mb0KyO4+8e+b1s4GsY=; b=ZmANCAZuCXh4PUajuX6pS5RnAR+nV7kcrzPX/tgxgPx/K+IJepU0BAEmTrduvL02Txb7dy Mwb+Vpdj3rvgIS62J9CHRQ/xVz0mAGSCx4R4rjzOCB6NmYTYuET3VomyZpprAeYCigFSxL 5zVB6qYRDC2DXGJatLtwY+9zQAzTejg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-319-5WYtPQdPOCWercAGQuufsw-1; Tue, 23 Aug 2022 03:19:57 -0400 X-MC-Unique: 5WYtPQdPOCWercAGQuufsw-1 Received: by mail-wm1-f70.google.com with SMTP id r10-20020a1c440a000000b003a538a648a9so7551085wma.5 for ; Tue, 23 Aug 2022 00:19:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc; bh=Hs7LaJusbzewq19gjdvDDnrR8mb0KyO4+8e+b1s4GsY=; b=24MoaDVdXRQ1eaEJxBPiPhOy2p+bghhSUwGP+cfyG1QJDMQ9NftOeI+/3NZg5QrrnF o2Cj7ii1ZZ0EXcJzGqw6bJTp/ycNowJeM57iocm4poHNPZEYqseKQyJfz5H46MeDBGq+ My/y2QyvYTzzqFs2TS6VsPObGl7ZQlK2SfNVFnKq+85TxFGM+vDRqAsTu5tFP1YtKWyN CM5pBhFDw+B0ZpaC70i4OaHshG8xRNdc/Rzinym3sQSEFGYGNJexUxVg0tiBhQCQvKRw cEvK+rcZrF7TdcC8kO/byOU2MkQBbYdTBb52O4iZc7uNzOmABKtZlOl5zZjbkzdTK4dK vgGQ== X-Gm-Message-State: ACgBeo3Y+xsTWFqNpBl4waQOGmDT/dRaCe2IJ4wKtPG9rzmi+EsV5Fs+ 4sxSd8wRt0NNdyp7171FO6Rbn3Irs972N9PZgnau3eChUfVv2t2clxnICtesVkx1BP7UHvXGvRD XyCluGARGGeY4BQ13kfHYaiF0 X-Received: by 2002:a05:600c:4e45:b0:3a5:f383:b917 with SMTP id e5-20020a05600c4e4500b003a5f383b917mr1191635wmq.61.1661239195896; Tue, 23 Aug 2022 00:19:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR7PodDLS/vNSvRNlNhwQt9d+MLAK2dUzwryvTeI3ossUG3lgTEZFazWxtHKJSxP9A6EWrzFAw== X-Received: by 2002:a05:600c:4e45:b0:3a5:f383:b917 with SMTP id e5-20020a05600c4e4500b003a5f383b917mr1191611wmq.61.1661239195612; Tue, 23 Aug 2022 00:19:55 -0700 (PDT) Received: from fedora (nat-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id bn26-20020a056000061a00b0021d7b41255esm13578498wrb.98.2022.08.23.00.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 00:19:55 -0700 (PDT) From: Vitaly Kuznetsov To: "Michael Kelley (LINUX)" , "linux-hyperv@vger.kernel.org" Cc: "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Wei Liu , Deepak Rawat , KY Srinivasan , Haiyang Zhang , Stephen Hemminger , Dexuan Cui Subject: RE: [PATCH v1 2/4] drm/hyperv: Don't forget to put PCI device when removing conflicting FB fails In-Reply-To: References: <20220818142508.402273-1-vkuznets@redhat.com> <20220818142508.402273-3-vkuznets@redhat.com> Date: Tue, 23 Aug 2022 09:19:54 +0200 Message-ID: <87zgfvwhnp.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org "Michael Kelley (LINUX)" writes: > From: Vitaly Kuznetsov Sent: Thursday, August 18, 2022 7:25 AM >> >> When drm_aperture_remove_conflicting_pci_framebuffers() fails, 'pdev' >> needs to be released with pci_dev_put(). >> >> Fixes: 76c56a5affeb ("drm/hyperv: Add DRM driver for hyperv synthetic video device") >> Signed-off-by: Vitaly Kuznetsov >> --- >> drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c >> b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c >> index 46f6c454b820..ca4e517b95ca 100644 >> --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c >> +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c >> @@ -82,7 +82,7 @@ static int hyperv_setup_gen1(struct hyperv_drm_device *hv) >> ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, >> &hyperv_driver); >> if (ret) { >> drm_err(dev, "Not able to remove boot fb\n"); >> - return ret; >> + goto error; >> } >> >> if (pci_request_region(pdev, 0, DRIVER_NAME) != 0) >> -- >> 2.37.1 > > This patch appears to be obsoleted by commit a0ab5abced55 > that was merged into 6.0-rc1. Of course, it does beg the question of > why the original function hyperv_setup_gen2(), which is now renamed > to hyperv_setup_vram(), doesn't check the return value from > drm_aperture_remove_conflicting_framebuffers(). AFAICT this commit (which I've obviously missed) also solves the worst issue I'm trying to address with this series: conflict between framebuffer and SR-IOV VF config space. It would probably still make sense to reserve the whole FB region on Gen1 first thing and use it as-is for DRM/FB later (Patches 3-4). -- Vitaly