Commit 7fb15c48 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

drm: omapdrm: Pass drm_device to omap_gem_resume()

The omap_gem_resume() function is internal to the driver. Pass it a
drm_device pointer that the caller already has instead of looking it up
from device data.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7a228a0d
...@@ -715,7 +715,7 @@ static int omap_drm_resume(struct device *dev) ...@@ -715,7 +715,7 @@ static int omap_drm_resume(struct device *dev)
drm_kms_helper_poll_enable(drm_dev); drm_kms_helper_poll_enable(drm_dev);
return omap_gem_resume(dev); return omap_gem_resume(drm_dev);
} }
#endif #endif
......
...@@ -97,7 +97,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m); ...@@ -97,7 +97,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m);
#endif #endif
#ifdef CONFIG_PM #ifdef CONFIG_PM
int omap_gem_resume(struct device *dev); int omap_gem_resume(struct drm_device *dev);
#endif #endif
int omap_irq_enable_vblank(struct drm_crtc *crtc); int omap_irq_enable_vblank(struct drm_crtc *crtc);
......
...@@ -996,10 +996,9 @@ void *omap_gem_vaddr(struct drm_gem_object *obj) ...@@ -996,10 +996,9 @@ void *omap_gem_vaddr(struct drm_gem_object *obj)
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* re-pin objects in DMM in resume path: */ /* re-pin objects in DMM in resume path: */
int omap_gem_resume(struct device *dev) int omap_gem_resume(struct drm_device *dev)
{ {
struct drm_device *drm_dev = dev_get_drvdata(dev); struct omap_drm_private *priv = dev->dev_private;
struct omap_drm_private *priv = drm_dev->dev_private;
struct omap_gem_object *omap_obj; struct omap_gem_object *omap_obj;
int ret = 0; int ret = 0;
...@@ -1012,7 +1011,7 @@ int omap_gem_resume(struct device *dev) ...@@ -1012,7 +1011,7 @@ int omap_gem_resume(struct device *dev)
omap_obj->pages, npages, omap_obj->pages, npages,
omap_obj->roll, true); omap_obj->roll, true);
if (ret) { if (ret) {
dev_err(dev, "could not repin: %d\n", ret); dev_err(dev->dev, "could not repin: %d\n", ret);
return ret; return ret;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment