p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2017-10-13 17:58:58 +03:00 committed by Tomi Valkeinen
parent 7a228a0d7e
commit 7fb15c480e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/omap_drv.c
View File

@ -715,7 +715,7 @@ static int omap_drm_resume(struct device *dev)
drm_kms_helper_poll_enable(drm_dev);
return omap_gem_resume(dev);
return omap_gem_resume(drm_dev);
}
#endif

2
drivers/gpu/drm/omapdrm/omap_drv.h
View File

@ -97,7 +97,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m);
#endif
#ifdef CONFIG_PM
int omap_gem_resume(struct device *dev);
int omap_gem_resume(struct drm_device *dev);
#endif
int omap_irq_enable_vblank(struct drm_crtc *crtc);

7
drivers/gpu/drm/omapdrm/omap_gem.c
View File

@ -996,10 +996,9 @@ void *omap_gem_vaddr(struct drm_gem_object *obj)
#ifdef CONFIG_PM
/* 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 = drm_dev->dev_private;
struct omap_drm_private *priv = dev->dev_private;
struct omap_gem_object *omap_obj;
int ret = 0;
@ -1012,7 +1011,7 @@ int omap_gem_resume(struct device *dev)
omap_obj->pages, npages,
omap_obj->roll, true);
if (ret) {
dev_err(dev, "could not repin: %d\n", ret);
dev_err(dev->dev, "could not repin: %d\n", ret);
return ret;
}
}