Re: [PATCH 1/1] DRM: fix radeon suspend/resume oops

[Dave Airlie]

> 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@xxxxxxxxx>
> Cc: David Airlie <airlied@xxxxxxxx>
> ---
>  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);
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/