From: Daniel Vetter Subject: Re: [PATCH 3/3] drm/i915: Provide DPIO diagrams as docboox tables Date: Wed, 21 May 2014 14:18:56 +0200 Message-ID: <20140521121855.GC14357@phenom.ffwll.local> References: <1398446072-5952-1-git-send-email-ville.syrjala@linux.intel.com> <1398446072-5952-3-git-send-email-ville.syrjala@linux.intel.com> <20140521105903.GC3860@clee30-mobl2.gar.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 050266EA28 for ; Wed, 21 May 2014 05:18:59 -0700 (PDT) Received: by mail-ee0-f47.google.com with SMTP id c13so1551081eek.34 for ; Wed, 21 May 2014 05:18:59 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140521105903.GC3860@clee30-mobl2.gar.corp.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Lee, Chon Ming" Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, May 21, 2014 at 06:59:03PM +0800, Lee, Chon Ming wrote: > On 04/25 20:14, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrj=E4l=E4 > > = > > The ascii art version of the DPIO diagram gets mangled by docbook, so > > we can't use it there. Insted provide another version built using > > . > > = > > Signed-off-by: Ville Syrj=E4l=E4 > = > When generating drm.tmpl to html, it say no structured comments found for > i915_reg.h > = > I am getting this error when displaying the link for i915_reg.h in HTML f= ormat: = > Document generation inconsistency. > = > Not sure is some issue on my side because I have issue apply this patch s= eries, > so I apply manually. > = > Anyway, the table below is similar to your previous patch. So, Worked here, dunno what's broken on your side ... Note that some docbooks moved around in 3.15-rc1 and the build system doesn't handle that. You need to run a git clean -dfx in the Documentation directory to fix that. > Reviewed-by: Chon Ming Lee Both patches merged, thanks. -Daniel > = > > --- > > Documentation/DocBook/drm.tmpl | 86 ++++++++++++++++++++++++++++++++++= ++++++++ > > 1 file changed, 86 insertions(+) > > = > > diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm= .tmpl > > index e361ccd..bf11fe5 100644 > > --- a/Documentation/DocBook/drm.tmpl > > +++ b/Documentation/DocBook/drm.tmpl > > @@ -2945,6 +2945,92 @@ int num_ioctls; > > > > DPIO > > !Pdrivers/gpu/drm/i915/i915_reg.h DPIO > > +
> > + Dual channel PHY (VLV/CHV) > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + CH0 > > + CH1 > > + > > + > > + > > + > > + CMN/PLL/REF > > + CMN/PLL/REF > > + > > + > > + PCS01 > > + PCS23 > > + PCS01 > > + PCS23 > > + > > + > > + TX0 > > + TX1 > > + TX2 > > + TX3 > > + TX0 > > + TX1 > > + TX2 > > + TX3 > > + > > + > > + DDI0 > > + DDI1 > > + > > + > > + > > +
> > + > > + Single channel PHY (CHV) > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + > > + CH0 > > + > > + > > + > > + > > + CMN/PLL/REF > > + > > + > > + PCS01 > > + PCS23 > > + > > + > > + TX0 > > + TX1 > > + TX2 > > + TX3 > > + > > + > > + DDI2 > > + > > + > > + > > +
> > > > > > = > > -- = > > 1.8.3.2 > > = > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch