OSDN Git Service

drm/i915: Kill duplicated PNV .get_display_clock_speed() assignment
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 30 Nov 2015 14:23:45 +0000 (16:23 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 2 Dec 2015 09:22:57 +0000 (11:22 +0200)
Somehow we accumulated a duplicated .get_display_clock_speed()
assignment for PNV in
commit 34edce2fea69 ("drm/i915: Add cdclk extraction for g33, g965gm and g4x")

No real harm on having two, we just never reach the second one, so
simply kill it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448893432-6978-5-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c

index 598a6ad..4aa4cad 100644 (file)
@@ -14800,9 +14800,6 @@ static void intel_init_display(struct drm_device *dev)
        else if (IS_I945GM(dev) || IS_845G(dev))
                dev_priv->display.get_display_clock_speed =
                        i9xx_misc_get_display_clock_speed;
-       else if (IS_PINEVIEW(dev))
-               dev_priv->display.get_display_clock_speed =
-                       pnv_get_display_clock_speed;
        else if (IS_I915GM(dev))
                dev_priv->display.get_display_clock_speed =
                        i915gm_get_display_clock_speed;