projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56f5f70
)
drm/i915: Kill duplicated PNV .get_display_clock_speed() assignment
author
Ville Syrjälä
<
[email protected]
>
Mon, 30 Nov 2015 14:23:45 +0000
(16:23 +0200)
committer
Ville Syrjälä
<
[email protected]
>
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ä <
[email protected]
>
Link:
http://patchwork.freedesktop.org/patch/msgid/
[email protected]
Reviewed-by: Daniel Vetter <
[email protected]
>
Reviewed-by: Jani Nikula <
[email protected]
>
drivers/gpu/drm/i915/intel_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 598a6adbe1da35e1babd69666d11743f32f386a6..4aa4cadeaf315d76a9080b4b206cb358c5b19e4b 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_display.c
+++ b/
drivers/gpu/drm/i915/intel_display.c
@@
-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;