On Wed, Feb 12, 2014 at 3:00 PM, Alexandre Courbot <acourbot@xxxxxxxxxx> wrote: > pm_runtime_get*() may return -EACCES to indicate a device does not have > runtime PM enabled. This is currently the case with platform devices > on Nouveau, and is not an error in that context. Handle this case > without failure. > > Signed-off-by: Alexandre Courbot <acourbot@xxxxxxxxxx> Merged, thanks :) > --- > Changes since v1: > - Fixed typo and inaccuracy in commit message > > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_drm.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c > index 0e3270c3ffd2..1caef1fd139e 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c > @@ -1048,7 +1048,7 @@ nouveau_crtc_set_config(struct drm_mode_set *set) > > /* get a pm reference here */ > ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) > + if (ret < 0 && ret != -EACCES) > return ret; > > ret = drm_crtc_helper_set_config(set); > diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c > index 1674882d60d5..cddef546d9b0 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_connector.c > +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c > @@ -255,7 +255,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) > } > > ret = pm_runtime_get_sync(connector->dev->dev); > - if (ret < 0) > + if (ret < 0 && ret != -EACCES) > return conn_status; > > i2c = nouveau_connector_ddc_detect(connector, &nv_encoder); > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index b45fd1a0ab28..c677a09aac3f 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -696,7 +696,7 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) > > /* need to bring up power immediately if opening device */ > ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) > + if (ret < 0 && ret != -EACCES) > return ret; > > get_task_comm(tmpname, current); > @@ -781,7 +781,7 @@ long nouveau_drm_ioctl(struct file *filp, > dev = file_priv->minor->dev; > > ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) > + if (ret < 0 && ret != -EACCES) > return ret; > > ret = drm_ioctl(filp, cmd, arg); > -- > 1.8.5.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
