similar to: [PATCH v2] drm/qxl: don't take vga ports on rev5+

qxl has two modes: "native" (used by the drm driver) and "vga" (vga compatibility mode, typically used for boot display and firmware framebuffers). Accessing any vga ioport will switch the qxl device into vga mode. The qxl driver never does that, but other drivers accessing vga ports can trigger that too and therefore disturb qxl operation. So aquire the legacy vga ioports

qxl has two modes: "native" (used by the drm driver) and "vga" (vga compatibility mode, typically used for boot display and firmware framebuffers). Accessing any vga ioport will switch the qxl device into vga mode. The qxl driver never does that, but other drivers accessing vga ports can trigger that too and therefore disturb qxl operation. So aquire the legacy vga ioports

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 <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 6 +++--- 1 file changed, 3 insertions(+),

Also need to remove the drm_dev_put from the remove hook. Acked-by: Gerd Hoffmann <kraxel at redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> Cc: Dave Airlie <airlied at redhat.com> Cc: Gerd Hoffmann <kraxel at redhat.com> Cc: virtualization at lists.linux-foundation.org Cc: spice-devel at lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 15

Also need to remove the drm_dev_put from the remove hook. Acked-by: Gerd Hoffmann <kraxel at redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> Cc: Dave Airlie <airlied at redhat.com> Cc: Gerd Hoffmann <kraxel at redhat.com> Cc: virtualization at lists.linux-foundation.org Cc: spice-devel at lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 15

Also need to remove the drm_dev_put from the remove hook. Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> Cc: Dave Airlie <airlied at redhat.com> Cc: Gerd Hoffmann <kraxel at redhat.com> Cc: virtualization at lists.linux-foundation.org Cc: spice-devel at lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 15 ++++++++------- drivers/gpu/drm/qxl/qxl_drv.h | 3

Also need to remove the drm_dev_put from the remove hook. Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> Cc: Dave Airlie <airlied at redhat.com> Cc: Gerd Hoffmann <kraxel at redhat.com> Cc: virtualization at lists.linux-foundation.org Cc: spice-devel at lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 15 ++++++++------- drivers/gpu/drm/qxl/qxl_drv.h | 3

On Fri, Apr 24, 2020 at 05:09:11PM +0200, Sam Ravnborg wrote: > Hi Daniel > > On Wed, Apr 15, 2020 at 09:40:01AM +0200, Daniel Vetter wrote: > > Also need to remove the drm_dev_put from the remove hook. > > > > Acked-by: Gerd Hoffmann <kraxel at redhat.com> > > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> > > Cc: Dave Airlie

On Fri, Apr 24, 2020 at 05:09:11PM +0200, Sam Ravnborg wrote: > Hi Daniel > > On Wed, Apr 15, 2020 at 09:40:01AM +0200, Daniel Vetter wrote: > > Also need to remove the drm_dev_put from the remove hook. > > > > Acked-by: Gerd Hoffmann <kraxel at redhat.com> > > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> > > Cc: Dave Airlie

Move final cleanups to qxl_drm_release() callback. Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 1d601f57a6ba..4fda3f9b29f4

Move final cleanups to qxl_drm_release() callback. Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 1d601f57a6ba..4fda3f9b29f4

Move final cleanups to qxl_drm_release() callback. Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). Reorder calls in qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings. Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++-------

> > qxl has two modes: "native" (used by the drm driver) and "vga" (vga > compatibility mode, typically used for boot display and firmware > framebuffers). > > Accessing any vga ioport will switch the qxl device into vga mode. > The qxl driver never does that, but other drivers accessing vga ports > can trigger that too and therefore disturb qxl

Move final cleanups to qxl_drm_release() callback. Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). Reorder calls in qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings. Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++-------

Den 10.02.2020 16.06, skrev Daniel Vetter: > On Mon, Feb 10, 2020 at 12:37:52PM +0100, Gerd Hoffmann wrote: >> Move final cleanups to qxl_drm_release() callback. >> Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). >> >> Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> >> --- >> drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++++++++++++++++-------

Hi Daniel On Wed, Apr 15, 2020 at 09:40:01AM +0200, Daniel Vetter wrote: > Also need to remove the drm_dev_put from the remove hook. > > Acked-by: Gerd Hoffmann <kraxel at redhat.com> > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> > Cc: Dave Airlie <airlied at redhat.com> > Cc: Gerd Hoffmann <kraxel at redhat.com> > Cc: virtualization at

Am 03.04.20 um 15:58 schrieb Daniel Vetter: > Also need to remove the drm_dev_put from the remove hook. > > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> > Cc: Dave Airlie <airlied at redhat.com> > Cc: Gerd Hoffmann <kraxel at redhat.com> > Cc: virtualization at lists.linux-foundation.org > Cc: spice-devel at lists.freedesktop.org > --- >

On Tue, Apr 28, 2020 at 04:00:11PM +0200, Daniel Vetter wrote: > On Fri, Apr 24, 2020 at 05:09:11PM +0200, Sam Ravnborg wrote: > > Hi Daniel > > > > On Wed, Apr 15, 2020 at 09:40:01AM +0200, Daniel Vetter wrote: > > > Also need to remove the drm_dev_put from the remove hook. > > > > > > Acked-by: Gerd Hoffmann <kraxel at redhat.com> > >

Add error checking while being at it. Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index bb81e310eb6d..578d867a81d5 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -79,6 +79,10 @@

On Mon, Feb 10, 2020 at 12:37:52PM +0100, Gerd Hoffmann wrote: > Move final cleanups to qxl_drm_release() callback. > Add drm_atomic_helper_shutdown() call to qxl_pci_remove(). > > Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> > --- > drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff