summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jasonbstubbs@gmail.com>2011-05-28 14:26:48 +1000
committerKeith Packard <keithp@keithp.com>2011-06-04 10:40:26 -0700
commit95e0ee92d3a605de75a633dd2360700595d5a8ad (patch)
tree519b926ed5e8eba71be72d5ac8947a65b1873f7e
parentf6b07f45e2df42d63a0292dcd13aaaa18d6c01f7 (diff)
drm/i915: fix regression after clock gating init split
During the refactoring in revision 6067aaeadb5b3df26f27ac827256b1ef01e674f5, the intel_enable_clock_gating was split up into several functions that are then called indirectly. However, which function to call was not specified for the IS_PINEVIEW() case. This patch specifies the correct gating function. Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f553ddfdc168..bb1b59b3d12d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7675,6 +7675,7 @@ static void intel_init_display(struct drm_device *dev)
dev_priv->display.update_wm = NULL;
} else
dev_priv->display.update_wm = pineview_update_wm;
+ dev_priv->display.init_clock_gating = gen3_init_clock_gating;
} else if (IS_G4X(dev)) {
dev_priv->display.update_wm = g4x_update_wm;
dev_priv->display.init_clock_gating = g4x_init_clock_gating;