diff options
author | Dave Airlie <airlied@redhat.com> | 2010-01-25 13:08:08 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-01-25 16:04:42 +1000 |
commit | d796d8446fe0ff4442c1a1d0b10c861f17ac8168 (patch) | |
tree | c3457449a8c9bf019fb81becd042a3f64ee0b972 /drivers/gpu/drm/radeon | |
parent | 8ba5152a3acd5914cade42a1c8c9dc58ad8d1a89 (diff) | |
download | op-kernel-dev-d796d8446fe0ff4442c1a1d0b10c861f17ac8168.zip op-kernel-dev-d796d8446fe0ff4442c1a1d0b10c861f17ac8168.tar.gz |
drm/radeon/kms: make hibernate work on IGPs
This is the least invasive fix without migrating the radeon driver
to pm_ops from what I can see. We just always migrate VRAM objects
on IGPs for now and we can fix it up later to migrate depending
on STR vs STD.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 4e636de..d72a71b 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -220,7 +220,8 @@ int radeon_bo_unpin(struct radeon_bo *bo) int radeon_bo_evict_vram(struct radeon_device *rdev) { - if (rdev->flags & RADEON_IS_IGP) { + /* late 2.6.33 fix IGP hibernate - we need pm ops to do this correct */ + if (0 && (rdev->flags & RADEON_IS_IGP)) { if (rdev->mc.igp_sideport_enabled == false) /* Useless to evict on IGP chips */ return 0; |