oops in radeon_suspend (mmotm 2008-10-22-17-18)
Subsystems (2)
Hi,
this oops occured on suspend of mmotm:
http://decibel.fi.muni.cz/~xslaby/radeon_oops1.png
http://decibel.fi.muni.cz/~xslaby/radeon_oops2.png
radeon_suspend:
movq 288(%rcx), %rax # <variable>.mmio, <variable>.mmio xorl %edx, %edx # tmp68 movq 24(%rax), %rax # <variable>.handle, <variable>.handle
rax (dev_priv->mmio) is null.
Ping
Quoted 12 lines · Jiri Slaby
Hi,
this oops occured on suspend of mmotm:
http://decibel.fi.muni.cz/~xslaby/radeon_oops1.png
http://decibel.fi.muni.cz/~xslaby/radeon_oops2.png
radeon_suspend:movq 288(%rcx), %rax # <variable>.mmio, <variable>.mmio xorl %edx, %edx # tmp68 movq 24(%rax), %rax # <variable>.handle, <variable>.handlerax (
dev_priv->mmio) is null.
PATCH 1/1 DRM: fix radeon suspend/resume oops
In reply to Jiri SlabyHi,
I've sent a bugreport twice with no reply, so coming with a patch. Andrew please apply, if no comments or a better patch from drm fellows comes.
As the accesses to the mmio member are not protected by anything, they seem to be racy with the open/clsoe anyways, setting this down there too.
--
When the driver is bound to a device and nobody opens the device node, it will oops on suspend and resume, since it's not mapped and dev_priv->mmio is NULL.
--- drivers/gpu/drm/radeon/radeon_drv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +7 -0
@@ -52,10 +52,14 @@ static int dri_library_name(struct drm_device *dev, char *buf) "r300")); } +/* FIXME all this suspend/resume races with open/close? */ static int radeon_suspend (struct drm_device *dev,pm_message_t state) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Disable *all* interrupts */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK,0 );
@@ -67,6 +71,9 @@ static int radeon_resume(struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Restore interrupt registers */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
Signature · 1 line
1.6.0.3
PATCH v2 1/1 DRM: fix radeon suspend/resume oops
Quoted 3 lines · me
As the accesses to the mmio member are not protected by anything, they seem to be racy with the open/clsoe anyways, setting this down there too.
On the second though it should be protected. Updated patch below...
+ added Rafael to cc list
--
When the driver is bound to a device and nobody opens the device node, it will oops on suspend and resume, since it's not mapped and dev_priv->mmio is NULL.
--- drivers/gpu/drm/radeon/radeon_drv.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +6 -0
@@ -56,6 +56,9 @@ static int radeon_suspend(struct drm_device *dev, pm_message_t state) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Disable *all* interrupts */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK,0 );
@@ -67,6 +70,9 @@ static int radeon_resume(struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Restore interrupt registers */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
Signature · 1 line
1.6.0.3
Re: [PATCH 1/1] DRM: fix radeon suspend/resume oops
In reply to Jiri SlabyQuoted 7 lines
Andrew please apply, if no comments or a better patch from drm fellows comes.
As the accesses to the mmio member are not protected by anything, they seem to be racy with the open/clsoe anyways, setting this down there too.
We got a patch last week from Jesse Barnes to fix this, I'll pull it and send it to Linus, I was waiting for some other fixes first.
Dave.
Quoted 42 lines
--
When the driver is bound to a device and nobody opens the device node, it will oops on suspend and resume, since it's not mapped anddev_priv->mmiois NULL.Signed-off-by Jiri Slaby <[email protected]>Cc David Airlie <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +7
-0@@ -52,10 +52,14 @@ static int dri_library_name(struct drm_device *dev, char *buf) "r300")); } +/* FIXME all this suspend/resume races with open/close? */ static int radeon_suspend (struct drm_device *dev,pm_message_t state) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Disable *all* interrupts */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK,0 );@@ -67,6 +71,9 @@ static int radeon_resume(struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; +if (!dev_priv->mmio) +return 0 ; +/* Restore interrupt registers */ if ((dev_priv->flags &RADEON_FAMILY_MASK ) >=CHIP_RS690 )RADEON_WRITE (R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);