Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a612c405 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Kill duplicated PNV .get_display_clock_speed() assignment 



Somehow we accumulated a duplicated .get_display_clock_speed()
assignment for PNV in
commit 34edce2f ("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: default avatarVille 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 56f5f700

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -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;