Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2218839pxa; Fri, 7 Aug 2020 06:15:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfI+tY14QnZQg3IhZ2SbaI6FKfWEUlXnOLOGrhKwk7rahU+Tby+pZi2/nlko41QR91ZsOm X-Received: by 2002:a17:906:817:: with SMTP id e23mr9129361ejd.203.1596806105434; Fri, 07 Aug 2020 06:15:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596806105; cv=none; d=google.com; s=arc-20160816; b=F+MjfkEz9XL/NGF6PvsN7Alyc5Obwo9cp8YRAnk9Cz0TrVRHYNrZpJvcVPyHH11/S5 HtCVGZgAacoTP2IURuJGS0aze/VbmB/i7PMX746cpu1l2EmLuUDkj+PMwcEkybmZpkPV nFexElaVIwaXHjQ9zkCBeg+asB3oDvSSHPHbBeinI+utQiyrb2ktN6kNPYcFCdi0KLUS 4IjnvDTdsZ6QLkkzKKl6+Ivy9sDTmGoCx+ujVE79JAgYsiTtUM1rWaaxbDOlan7txrh1 u5McPQ/N3ar/ZLOqz4g76X5Q0/4+r1lzXfuS+AsIqnO2Xix6QF8IoNKBXfrTb6qLwvS7 tkQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:dkim-signature; bh=EEI1Q+fppn24GUPwdHUe/rrjbN2XPprAGHaCmC9qOCk=; b=GGZ+/CFm05XaHqW510z0meCvsxeIiQtmlkcAhnxMiCTmZCr0Wz3wPMDYArUMeyin8Z 2wG28JYC5J+GjBqe3KghDMnU/OKlzmi2uXZae2BtftAo27nMmrm1DwyP7W8+cbFi/RQX kXoxqwsTHkRFODJlZw68zHz5HaXNd6yR+b6DF9/NwieWjwUtiV0TcqNNFZhxziyXjTeu IeuLxB/7LlucxKOFwZZkzM43ASvFoPMEicEkwy/AAFr5l2XbVmYIH04qOhASKsd/5vka DH9Iv9phLs3M8751pLcRBxWLXTGY+7CYLKGIVXoEl+ba5q13j2trkZHkfQHhbCLlyVvB mdhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=N78Hjx0p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga10si5225784ejb.372.2020.08.07.06.14.42; Fri, 07 Aug 2020 06:15:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=N78Hjx0p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726030AbgHGNMJ (ORCPT + 99 others); Fri, 7 Aug 2020 09:12:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbgHGNMG (ORCPT ); Fri, 7 Aug 2020 09:12:06 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA5DAC061574 for ; Fri, 7 Aug 2020 06:12:05 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id k8so1809476wma.2 for ; Fri, 07 Aug 2020 06:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=EEI1Q+fppn24GUPwdHUe/rrjbN2XPprAGHaCmC9qOCk=; b=N78Hjx0pAcuP2VQLKJkukTxDF+52k9EvIjw1q3rhWkg1C+u2aeSRZYWPwPKisJXP8Q Dbx7yoJIM1L5p+lScZJ5ji9JdlO60MwT7urL//OWbV4LZewRq5sblDIb7zYNecfVdw7+ j2I7l6qqQeMtKspM19SnVntRgx2QpvKM/9eAU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=EEI1Q+fppn24GUPwdHUe/rrjbN2XPprAGHaCmC9qOCk=; b=g+OaMRTDAUS1f5ZBBMQaZyVuw89JJ2MI8R8DcvJivJE9rfDv3XgHdxjMXSyVArqJ2l BN2fozQHpjPDZ7TF8CqmqP9rlztKg3KXHTxHUGBQpcjCjWOILyCQdwES1lbw0m9sL1y4 hUONdS7Ew1g8vQRRJhelAEZCxh6kgNecrrediptbvtsYWX7JkBdMxdqf9q9ZPsfRslLr AdRUuMCdW1cCEKHXZwFyLnobsYB1dZ5Y3rBcKvmng+AG+AQjvwWPmDn3CrkNZz9jY7Rq Qg3iNonIPUXOhY+xASpHKVtj0E/UN5GBk7p+nIapdNvUKIUcQDcR7RfEOgFTGvWdMpwF Cz2w== X-Gm-Message-State: AOAM5311ErdGUBfvAh/kYUK7rQ1Csg0FrdgIyf5uUm0Fu+MewWw2botO HmoWlrmvB+rwsuav92bsOW+Bkw== X-Received: by 2002:a7b:c258:: with SMTP id b24mr12470414wmj.122.1596805924546; Fri, 07 Aug 2020 06:12:04 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l11sm9904436wme.11.2020.08.07.06.12.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 06:12:03 -0700 (PDT) Date: Fri, 7 Aug 2020 15:12:01 +0200 From: Daniel Vetter To: Gerd Hoffmann Cc: dri-devel@lists.freedesktop.org, Dave Airlie , David Airlie , Daniel Vetter , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , open list Subject: Re: [PATCH v2] drm/qxl: don't take vga ports on rev5+ Message-ID: <20200807131201.GF2352366@phenom.ffwll.local> Mail-Followup-To: Gerd Hoffmann , dri-devel@lists.freedesktop.org, Dave Airlie , David Airlie , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , open list References: <20200807105501.24599-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200807105501.24599-1-kraxel@redhat.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 07, 2020 at 12:55:01PM +0200, Gerd Hoffmann wrote: > qemu 5.0 introduces a new qxl hardware revision 5. Unlike revision 4 > (and below) the device doesn't switch back into vga compatibility mode > when someone touches the vga ports. So we don't have to reserve the > vga ports any more to avoid that happening. > > Signed-off-by: Gerd Hoffmann Does what it says on the label. Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/qxl/qxl_drv.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c > index 13872b882775..6e7f16f4cec7 100644 > --- a/drivers/gpu/drm/qxl/qxl_drv.c > +++ b/drivers/gpu/drm/qxl/qxl_drv.c > @@ -96,7 +96,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > if (ret) > goto disable_pci; > > - if (is_vga(pdev)) { > + if (is_vga(pdev) && pdev->revision < 5) { > ret = vga_get_interruptible(pdev, VGA_RSRC_LEGACY_IO); > if (ret) { > DRM_ERROR("can't get legacy vga ioports\n"); > @@ -127,7 +127,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > unload: > qxl_device_fini(qdev); > put_vga: > - if (is_vga(pdev)) > + if (is_vga(pdev) && pdev->revision < 5) > vga_put(pdev, VGA_RSRC_LEGACY_IO); > disable_pci: > pci_disable_device(pdev); > @@ -155,7 +155,7 @@ qxl_pci_remove(struct pci_dev *pdev) > > drm_dev_unregister(dev); > drm_atomic_helper_shutdown(dev); > - if (is_vga(pdev)) > + if (is_vga(pdev) && pdev->revision < 5) > vga_put(pdev, VGA_RSRC_LEGACY_IO); > } > > -- > 2.18.4 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch