drm/i915: Make struct dpll == intel_clock_t

This allows unifying a bunch of the PLL calculations and whatnot.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3c90605ddd45e59764b06f8b1bda019ed9b14645..74156e231fd57f739f0f4d1bf6e2b6fe50a7ffcf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -45,18 +45,6 @@ bool intel_pipe_has_type(struct drm_crtc *crtc, int type);
 static void intel_increase_pllclock(struct drm_crtc *crtc);
 static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on);
 
-typedef struct {
-       /* given values */
-       int n;
-       int m1, m2;
-       int p1, p2;
-       /* derived values */
-       int     dot;
-       int     vco;
-       int     m;
-       int     p;
-} intel_clock_t;
-
 typedef struct {
        int     min, max;
 } intel_range_t;

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c20201d948eb86472113824d4ea94106c01a97ad..66922f8f1bc59c9787062ae9a7c8de787fcd29a8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -177,6 +177,18 @@ struct intel_connector {
        u8 polled;
 };
 
+typedef struct dpll {
+       /* given values */
+       int n;
+       int m1, m2;
+       int p1, p2;
+       /* derived values */
+       int     dot;
+       int     vco;
+       int     m;
+       int     p;
+} intel_clock_t;
+
 struct intel_crtc_config {
        struct drm_display_mode requested_mode;
        struct drm_display_mode adjusted_mode;
@@ -208,11 +220,7 @@ struct intel_crtc_config {
 
        /* Settings for the intel dpll used on pretty much everything but
         * haswell. */
-       struct dpll {
-               unsigned n;
-               unsigned m1, m2;
-               unsigned p1, p2;
-       } dpll;
+       struct dpll dpll;
 
        int pipe_bpp;
        struct intel_link_m_n dp_m_n;