openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gma500: make init_pm callback in struct psb_op optional 

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Kirill A. Shutemov 2012-03-08 16:01:51 +00:00 committed by Dave Airlie
parent 4578240b48
commit c715bc1bf4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/gma500/oaktrail_device.c
View File

@ -176,10 +176,6 @@ int oaktrail_backlight_init(struct drm_device *dev)
* for power management * for power management
*/ */
static void oaktrail_init_pm(struct drm_device *dev)
{
}
/** /**
* oaktrail_save_display_registers - save registers lost on suspend * oaktrail_save_display_registers - save registers lost on suspend
* @dev: our DRM device * @dev: our DRM device
@ -504,7 +500,6 @@ const struct psb_ops oaktrail_chip_ops = {
.backlight_init = oaktrail_backlight_init, .backlight_init = oaktrail_backlight_init,
#endif #endif
.init_pm = oaktrail_init_pm,
.save_regs = oaktrail_save_display_registers, .save_regs = oaktrail_save_display_registers,
.restore_regs = oaktrail_restore_display_registers, .restore_regs = oaktrail_restore_display_registers,
.power_down = oaktrail_power_down, .power_down = oaktrail_power_down,

3
drivers/gpu/drm/gma500/power.c
View File

@ -58,7 +58,8 @@ void gma_power_init(struct drm_device *dev)
spin_lock_init(&power_ctrl_lock); spin_lock_init(&power_ctrl_lock);
mutex_init(&power_mutex); mutex_init(&power_mutex);
dev_priv->ops->init_pm(dev); if (dev_priv->ops->init_pm)
dev_priv->ops->init_pm(dev);
} }
/** /**