summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv04
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-02-12 14:00:59 +0900
committerBen Skeggs <bskeggs@redhat.com>2014-03-26 13:59:32 +1000
commitb6c4285afa66f2f258a237771fd90905a194957d (patch)
tree73d59a5ca30c76ce4e47c24bace5f3256f3a3f3e /drivers/gpu/drm/nouveau/dispnv04
parentef98c1f7b37116ae45d892a23f46cffdda31773c (diff)
downloadop-kernel-dev-b6c4285afa66f2f258a237771fd90905a194957d.zip
op-kernel-dev-b6c4285afa66f2f258a237771fd90905a194957d.tar.gz
drm/nouveau: handle -EACCES runtime PM return code
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@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv04/crtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 0e3270c..1caef1f 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);
OpenPOWER on IntegriCloud