summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorVille Syrjälä2013-04-19 13:36:51 +0200
committerDaniel Vetter2013-04-20 16:49:41 +0200
commit80ad9206c0d863832bc5f6008c4d1868d1df8e70 (patch)
treeebd10ae5b76e866188726a52e9da5eb72420eb42 /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: use vlv_dport_to_channel in vlv_signal_levels (diff)
downloadkernel-qcow2-linux-80ad9206c0d863832bc5f6008c4d1868d1df8e70.tar.gz
kernel-qcow2-linux-80ad9206c0d863832bc5f6008c4d1868d1df8e70.tar.xz
kernel-qcow2-linux-80ad9206c0d863832bc5f6008c4d1868d1df8e70.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c20201d948eb..66922f8f1bc5 100644
--- 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;