diff options
author | Jason Stubbs <jasonbstubbs@gmail.com> | 2011-05-28 00:26:48 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-06-04 13:40:26 -0400 |
commit | 95e0ee92d3a605de75a633dd2360700595d5a8ad (patch) | |
tree | 519b926ed5e8eba71be72d5ac8947a65b1873f7e /drivers/gpu/drm/i915/intel_display.c | |
parent | f6b07f45e2df42d63a0292dcd13aaaa18d6c01f7 (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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 1 |
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) | |||
7675 | dev_priv->display.update_wm = NULL; | 7675 | dev_priv->display.update_wm = NULL; |
7676 | } else | 7676 | } else |
7677 | dev_priv->display.update_wm = pineview_update_wm; | 7677 | dev_priv->display.update_wm = pineview_update_wm; |
7678 | dev_priv->display.init_clock_gating = gen3_init_clock_gating; | ||
7678 | } else if (IS_G4X(dev)) { | 7679 | } else if (IS_G4X(dev)) { |
7679 | dev_priv->display.update_wm = g4x_update_wm; | 7680 | dev_priv->display.update_wm = g4x_update_wm; |
7680 | dev_priv->display.init_clock_gating = g4x_init_clock_gating; | 7681 | dev_priv->display.init_clock_gating = g4x_init_clock_gating; |