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

Commit 80ad9206 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Make struct dpll == intel_clock_t 



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

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cece5d58

drivers/gpu/drm/i915/intel_display.c

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

drivers/gpu/drm/i915/intel_drv.h

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