aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_gem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_gem.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 5c5c86ddd6f4..fd81396baaf9 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -996,10 +996,9 @@ void *omap_gem_vaddr(struct drm_gem_object *obj)
996 996
997#ifdef CONFIG_PM 997#ifdef CONFIG_PM
998/* re-pin objects in DMM in resume path: */ 998/* re-pin objects in DMM in resume path: */
999int omap_gem_resume(struct device *dev) 999int omap_gem_resume(struct drm_device *dev)
1000{ 1000{
1001 struct drm_device *drm_dev = dev_get_drvdata(dev); 1001 struct omap_drm_private *priv = dev->dev_private;
1002 struct omap_drm_private *priv = drm_dev->dev_private;
1003 struct omap_gem_object *omap_obj; 1002 struct omap_gem_object *omap_obj;
1004 int ret = 0; 1003 int ret = 0;
1005 1004
@@ -1012,7 +1011,7 @@ int omap_gem_resume(struct device *dev)
1012 omap_obj->pages, npages, 1011 omap_obj->pages, npages,
1013 omap_obj->roll, true); 1012 omap_obj->roll, true);
1014 if (ret) { 1013 if (ret) {
1015 dev_err(dev, "could not repin: %d\n", ret); 1014 dev_err(dev->dev, "could not repin: %d\n", ret);
1016 return ret; 1015 return ret;
1017 } 1016 }
1018 } 1017 }