* [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock
@ 2011-07-04 3:16 skeggsb
2011-07-06 7:38 ` Michel Dänzer
0 siblings, 1 reply; 4+ messages in thread
From: skeggsb @ 2011-07-04 3:16 UTC (permalink / raw)
To: dri-devel; +Cc: Ben Skeggs
From: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
drivers/gpu/drm/drm_irq.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 2022a5c..c3c87a1 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -397,13 +397,16 @@ int drm_irq_uninstall(struct drm_device *dev)
/*
* Wake up any waiters so they don't hang.
*/
- spin_lock_irqsave(&dev->vbl_lock, irqflags);
- for (i = 0; i < dev->num_crtcs; i++) {
- DRM_WAKEUP(&dev->vbl_queue[i]);
- dev->vblank_enabled[i] = 0;
- dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
+ if (dev->num_crtcs) {
+ spin_lock_irqsave(&dev->vbl_lock, irqflags);
+ for (i = 0; i < dev->num_crtcs; i++) {
+ DRM_WAKEUP(&dev->vbl_queue[i]);
+ dev->vblank_enabled[i] = 0;
+ dev->last_vblank[i] =
+ dev->driver->get_vblank_counter(dev, i);
+ }
+ spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
}
- spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
if (!irq_enabled)
return -EINVAL;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock
2011-07-04 3:16 [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock skeggsb
@ 2011-07-06 7:38 ` Michel Dänzer
2011-07-06 23:10 ` Ben Skeggs
0 siblings, 1 reply; 4+ messages in thread
From: Michel Dänzer @ 2011-07-06 7:38 UTC (permalink / raw)
To: skeggsb; +Cc: Ben Skeggs, dri-devel
On Mon, 2011-07-04 at 13:16 +1000, skeggsb@gmail.com wrote:
> From: Ben Skeggs <bskeggs@redhat.com>
>
> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
> ---
> drivers/gpu/drm/drm_irq.c | 15 +++++++++------
> 1 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 2022a5c..c3c87a1 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -397,13 +397,16 @@ int drm_irq_uninstall(struct drm_device *dev)
> /*
> * Wake up any waiters so they don't hang.
> */
> - spin_lock_irqsave(&dev->vbl_lock, irqflags);
> - for (i = 0; i < dev->num_crtcs; i++) {
> - DRM_WAKEUP(&dev->vbl_queue[i]);
> - dev->vblank_enabled[i] = 0;
> - dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
> + if (dev->num_crtcs) {
> + spin_lock_irqsave(&dev->vbl_lock, irqflags);
> + for (i = 0; i < dev->num_crtcs; i++) {
> + DRM_WAKEUP(&dev->vbl_queue[i]);
> + dev->vblank_enabled[i] = 0;
> + dev->last_vblank[i] =
> + dev->driver->get_vblank_counter(dev, i);
> + }
> + spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> }
> - spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
>
> if (!irq_enabled)
> return -EINVAL;
Makes sense, but according to commit
7a1c2f6c8d8485af5ac6c2a313f6a7162207a4af ('vmwgfx: Enable use of the
vblank system'), the vblank ioctls will also access uninitialized data
if drm_vblank_init() hasn't been called. So, is this just for cases
where drm_irq_uninstall() is called before the driver gets a chance to
call drm_vblank_init()?
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Debian, X and DRI developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock
2011-07-06 7:38 ` Michel Dänzer
@ 2011-07-06 23:10 ` Ben Skeggs
2011-07-07 6:05 ` Michel Dänzer
0 siblings, 1 reply; 4+ messages in thread
From: Ben Skeggs @ 2011-07-06 23:10 UTC (permalink / raw)
To: Michel Dänzer; +Cc: dri-devel
On Wed, 2011-07-06 at 09:38 +0200, Michel Dänzer wrote:
> On Mon, 2011-07-04 at 13:16 +1000, skeggsb@gmail.com wrote:
> > From: Ben Skeggs <bskeggs@redhat.com>
> >
> > Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
> > ---
> > drivers/gpu/drm/drm_irq.c | 15 +++++++++------
> > 1 files changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index 2022a5c..c3c87a1 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -397,13 +397,16 @@ int drm_irq_uninstall(struct drm_device *dev)
> > /*
> > * Wake up any waiters so they don't hang.
> > */
> > - spin_lock_irqsave(&dev->vbl_lock, irqflags);
> > - for (i = 0; i < dev->num_crtcs; i++) {
> > - DRM_WAKEUP(&dev->vbl_queue[i]);
> > - dev->vblank_enabled[i] = 0;
> > - dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
> > + if (dev->num_crtcs) {
> > + spin_lock_irqsave(&dev->vbl_lock, irqflags);
> > + for (i = 0; i < dev->num_crtcs; i++) {
> > + DRM_WAKEUP(&dev->vbl_queue[i]);
> > + dev->vblank_enabled[i] = 0;
> > + dev->last_vblank[i] =
> > + dev->driver->get_vblank_counter(dev, i);
> > + }
> > + spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> > }
> > - spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> >
> > if (!irq_enabled)
> > return -EINVAL;
>
> Makes sense, but according to commit
> 7a1c2f6c8d8485af5ac6c2a313f6a7162207a4af ('vmwgfx: Enable use of the
> vblank system'), the vblank ioctls will also access uninitialized data
> if drm_vblank_init() hasn't been called. So, is this just for cases
> where drm_irq_uninstall() is called before the driver gets a chance to
> call drm_vblank_init()?
Heh, ouch.
Yes, it was specifically that case I was aiming for however. If
nouveau's running on a board without any outputs, it won't call
drm_vblank_init(), but it *will* call drm_irq_*. Just avoiding lockdep
complaints on module unload.
Ben.
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock
2011-07-06 23:10 ` Ben Skeggs
@ 2011-07-07 6:05 ` Michel Dänzer
0 siblings, 0 replies; 4+ messages in thread
From: Michel Dänzer @ 2011-07-07 6:05 UTC (permalink / raw)
To: bskeggs; +Cc: dri-devel
On Don, 2011-07-07 at 09:10 +1000, Ben Skeggs wrote:
> On Wed, 2011-07-06 at 09:38 +0200, Michel Dänzer wrote:
> > On Mon, 2011-07-04 at 13:16 +1000, skeggsb@gmail.com wrote:
> > > From: Ben Skeggs <bskeggs@redhat.com>
> > >
> > > Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
> > > ---
> > > drivers/gpu/drm/drm_irq.c | 15 +++++++++------
> > > 1 files changed, 9 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > > index 2022a5c..c3c87a1 100644
> > > --- a/drivers/gpu/drm/drm_irq.c
> > > +++ b/drivers/gpu/drm/drm_irq.c
> > > @@ -397,13 +397,16 @@ int drm_irq_uninstall(struct drm_device *dev)
> > > /*
> > > * Wake up any waiters so they don't hang.
> > > */
> > > - spin_lock_irqsave(&dev->vbl_lock, irqflags);
> > > - for (i = 0; i < dev->num_crtcs; i++) {
> > > - DRM_WAKEUP(&dev->vbl_queue[i]);
> > > - dev->vblank_enabled[i] = 0;
> > > - dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
> > > + if (dev->num_crtcs) {
> > > + spin_lock_irqsave(&dev->vbl_lock, irqflags);
> > > + for (i = 0; i < dev->num_crtcs; i++) {
> > > + DRM_WAKEUP(&dev->vbl_queue[i]);
> > > + dev->vblank_enabled[i] = 0;
> > > + dev->last_vblank[i] =
> > > + dev->driver->get_vblank_counter(dev, i);
> > > + }
> > > + spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> > > }
> > > - spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> > >
> > > if (!irq_enabled)
> > > return -EINVAL;
> >
> > Makes sense, but according to commit
> > 7a1c2f6c8d8485af5ac6c2a313f6a7162207a4af ('vmwgfx: Enable use of the
> > vblank system'), the vblank ioctls will also access uninitialized data
> > if drm_vblank_init() hasn't been called. So, is this just for cases
> > where drm_irq_uninstall() is called before the driver gets a chance to
> > call drm_vblank_init()?
> Heh, ouch.
>
> Yes, it was specifically that case I was aiming for however. If
> nouveau's running on a board without any outputs, it won't call
> drm_vblank_init(), but it *will* call drm_irq_*. Just avoiding lockdep
> complaints on module unload.
I see.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Debian, X and DRI developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-07 6:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-04 3:16 [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock skeggsb
2011-07-06 7:38 ` Michel Dänzer
2011-07-06 23:10 ` Ben Skeggs
2011-07-07 6:05 ` Michel Dänzer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.