From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: shovel compute clock into crtc->config.dpll on ilk Date: Mon, 22 Apr 2013 17:12:10 +0200 Message-ID: <20130422151210.GB6169@phenom.ffwll.local> References: <20130419101446.GX4469@intel.com> <1366471186-8217-1-git-send-email-daniel.vetter@ffwll.ch> <20130422111344.GZ4469@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id AE446E683F for ; Mon, 22 Apr 2013 08:09:08 -0700 (PDT) Received: by mail-wi0-f172.google.com with SMTP id hm14so1402954wib.17 for ; Mon, 22 Apr 2013 08:09:08 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130422111344.GZ4469@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: Daniel Vetter , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Mon, Apr 22, 2013 at 02:13:44PM +0300, Ville Syrj=E4l=E4 wrote: > On Sat, Apr 20, 2013 at 05:19:46PM +0200, Daniel Vetter wrote: > > This was somehow lost in the pipe_config->dpll introduction in > > = > > commit f47709a9502f3715cc488b788ca91cf0c142b1b1 > > Author: Daniel Vetter > > Date: Thu Mar 28 10:42:02 2013 +0100 > > = > > drm/i915: create pipe_config->dpll for clock state > > = > > While at it, extract a few small helpers for common computations. > > = > > v2: Use the newly added helpers more thanks to Ville's trick to > > typedef the legacy intel_clock_t as the new-world struct dpll. > > = > > Cc: Ville Syrj=E4l=E4 > > Signed-off-by: Daniel Vetter > > --- > > drivers/gpu/drm/i915/intel_display.c | 50 ++++++++++++++++++++++++----= -------- > > 1 file changed, 33 insertions(+), 17 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i91= 5/intel_display.c > > index 88c19bb..63c6557 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -549,13 +549,18 @@ static void pineview_clock(int refclk, intel_cloc= k_t *clock) > > clock->dot =3D clock->vco / clock->p; > > } > > = > > +static uint32_t i9xx_dpll_compute_m(struct dpll *dpll) > > +{ > > + return 5 * (dpll->m1 + 2) + (dpll->m2 + 2); > > +} > = > intel_find_pll_g4x_dp() has another use of this formula. Oh, that one will die in fire in the next patch, so I didn't notice it while doing the fixup. > Otherwise everything looks good to me. Still r-b? Or maybe just review the other ones, too ;-) Cheers, Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch