diff options
author | Dave Airlie <airlied@redhat.com> | 2013-04-17 05:18:32 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-04-17 05:18:32 (GMT) |
commit | 9f7bc6acf78af238a0b8ee0bb86ab62f1fc4f51f (patch) | |
tree | b1083136e21199935c9811bc9f41905f3c5f0499 /drivers/gpu/drm/gma500/power.h | |
parent | f18353eee7570412adca210b4968ecf2783754ba (diff) | |
parent | 1611f8457768716ba2397e0cdcc92c863cf9b58b (diff) | |
download | linux-fsl-qoriq-9f7bc6acf78af238a0b8ee0bb86ab62f1fc4f51f.tar.xz |
Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next
Patrik writes:
I haven't had much review or testing on other platforms than Poulsbo but
at least the following Cedarview bug has been squashed and no
regressions reported: https://bugs.freedesktop.org/show_bug.cgi?id=58527
* 'gma500-next' of git://github.com/patjak/drm-gma500:
drm/gma500: Add debugging info to psb_gtt_restore()
drm/gma500: Check connector status before restoring sdvo
gma500:fix build failure for 3.9-rc5
drm/gma500: Fix hibernation problems on sdvo encoders
drm/gma500: Add hooks for hibernation
drm/gma500: Activate the gtt rebuild on suspend/resume
drm/gma500: Add support for rebuilding the gtt
drm/gma500: Change fb name so pm-utils doesn't apply quirks
gma500: Make VGA and HDMI connector hotpluggable
drm/gma500: Clean up various defines
drm/gma500: Remove unnecessary function exposure
drm/gma500: Type clock limits directly into array and remove defines
drm/gma500: Calculate clock in one function instead of three identical
drm/gma500: Remove unused i8xx clock limits
gma500: medfield: Fix possible NULL pointer dereference
drivers: gpu: drm: gma500: Replaced calls kzalloc & memcpy with kmemdup
gma500: remove unused drm_psb_no_fb
Diffstat (limited to 'drivers/gpu/drm/gma500/power.h')
-rw-r--r-- | drivers/gpu/drm/gma500/power.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/power.h b/drivers/gpu/drm/gma500/power.h index 1969d2e..56d8708 100644 --- a/drivers/gpu/drm/gma500/power.h +++ b/drivers/gpu/drm/gma500/power.h @@ -41,6 +41,9 @@ void gma_power_uninit(struct drm_device *dev); */ int gma_power_suspend(struct device *dev); int gma_power_resume(struct device *dev); +int gma_power_thaw(struct device *dev); +int gma_power_freeze(struct device *dev); +int gma_power_restore(struct device *_dev); /* * These are the functions the driver should use to wrap all hw access |