lkml.org 
[lkml]   [2008]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/1] DRM: fix radeon suspend/resume oops

> 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.

>
> --
> 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.
>
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> Cc: David Airlie <airlied@linux.ie>
> ---
> drivers/gpu/drm/radeon/radeon_drv.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 71af746..2e74a98 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -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);
>


\
 
 \ /
  Last update: 2008-11-10 01:13    [W:0.060 / U:5.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site