On Thu, May 02, 2013 at 03:12:07PM -0300, Paulo Zanoni wrote: > Hi > > 2013/5/1 Daniel Vetter <daniel.vetter at ffwll.ch>: > > Every time I read hsw code I get completely confused about this. So > > call it what it is more explicitly. > > > > Also, add an LPT_TRANSCONF for the pch transcoder A and use it in > > lpt-only code, to really unconfuse me. > > > > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> > > --- > > drivers/gpu/drm/i915/i915_reg.h | 7 ++++--- > > drivers/gpu/drm/i915/i915_ums.c | 8 ++++---- > > drivers/gpu/drm/i915/intel_display.c | 30 +++++++++++++++--------------- > > 3 files changed, 23 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index 95ae5cf..d06a571 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -4058,9 +4058,10 @@ > > #define TRANSDPLINK_M2(pipe) _PIPE(pipe, _TRANSA_DP_LINK_M2, _TRANSB_DP_LINK_M2) > > #define TRANSDPLINK_N2(pipe) _PIPE(pipe, _TRANSA_DP_LINK_N2, _TRANSB_DP_LINK_N2) > > > > -#define _TRANSACONF 0xf0008 > > -#define _TRANSBCONF 0xf1008 > > -#define TRANSCONF(plane) _PIPE(plane, _TRANSACONF, _TRANSBCONF) > > +#define _PCH_TRANSACONF 0xf0008 > > +#define _PCH_TRANSBCONF 0xf1008 > > +#define PCH_TRANSCONF(plane) _PIPE(plane, _PCH_TRANSACONF, _PCH_TRANSBCONF) > > +#define LPT_TRANSCONF _PCH_TRANSACONF /* lpt has only one transcoder */ > > Since we're already touching the macros, I need to point that we call > the argument "plane" but use the _PIPE macro, when it's actually a > transcoder :) Yeah, plane is wrong ;-) But I've opted for PIPE instead, since the disdinction between transcoder and pipe is only relevant on hsw cpu stuff, and I very much don't expect the pch to grow an eDP transcoder. Imo that helps quite a bit since the crtc->pipe mapping is fixed, but the transcoder stuff depends upon the configuration. Hence why I prefer pipe if possible. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
