Skip to content

Commit

Permalink
gma500: make init_pm callback in struct psb_op optional
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kirill A. Shutemov authored and Dave Airlie committed Mar 10, 2012
1 parent 4578240 commit c715bc1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
5 changes: 0 additions & 5 deletions drivers/gpu/drm/gma500/oaktrail_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,6 @@ int oaktrail_backlight_init(struct drm_device *dev)
* for power management
*/

static void oaktrail_init_pm(struct drm_device *dev)
{
}

/**
* oaktrail_save_display_registers - save registers lost on suspend
* @dev: our DRM device
Expand Down Expand Up @@ -504,7 +500,6 @@ const struct psb_ops oaktrail_chip_ops = {
.backlight_init = oaktrail_backlight_init,
#endif

.init_pm = oaktrail_init_pm,
.save_regs = oaktrail_save_display_registers,
.restore_regs = oaktrail_restore_display_registers,
.power_down = oaktrail_power_down,
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/gma500/power.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ void gma_power_init(struct drm_device *dev)
spin_lock_init(&power_ctrl_lock);
mutex_init(&power_mutex);

dev_priv->ops->init_pm(dev);
if (dev_priv->ops->init_pm)
dev_priv->ops->init_pm(dev);
}

/**
Expand Down

0 comments on commit c715bc1

Please sign in to comment.