public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 1/2] drm/i915: explicitly cast pipe -> cpu_transcoder
Date: Thu, 4 Jul 2013 14:41:10 +0200	[thread overview]
Message-ID: <20130704124110.GD18285@phenom.ffwll.local> (raw)
In-Reply-To: <20130704102351.GC11980@strange.amr.corp.intel.com>

On Thu, Jul 04, 2013 at 11:23:52AM +0100, Damien Lespiau wrote:
> On Thu, Jul 04, 2013 at 12:01:15PM +0200, Daniel Vetter wrote:
> > This makes sparse happy and also makes it a bit more obvious where we
> > pull off this trick - after all we're only allowed to do it eithe as a
> > default or on platforms where there is no disdinction between the pipe
> > and the cpu transcoder.
> > 
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> For both patches:
> 
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

Both merged, thanks for the review.
-Daniel

> 
> -- 
> Damien
> 
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 8b48a72..745631f 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -4935,7 +4935,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
> >  	struct drm_i915_private *dev_priv = dev->dev_private;
> >  	uint32_t tmp;
> >  
> > -	pipe_config->cpu_transcoder = crtc->pipe;
> > +	pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
> >  	pipe_config->shared_dpll = DPLL_ID_PRIVATE;
> >  
> >  	tmp = I915_READ(PIPECONF(crtc->pipe));
> > @@ -5806,7 +5806,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> >  	struct drm_i915_private *dev_priv = dev->dev_private;
> >  	uint32_t tmp;
> >  
> > -	pipe_config->cpu_transcoder = crtc->pipe;
> > +	pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
> >  	pipe_config->shared_dpll = DPLL_ID_PRIVATE;
> >  
> >  	tmp = I915_READ(PIPECONF(crtc->pipe));
> > @@ -5922,7 +5922,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
> >  	enum intel_display_power_domain pfit_domain;
> >  	uint32_t tmp;
> >  
> > -	pipe_config->cpu_transcoder = crtc->pipe;
> > +	pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
> >  	pipe_config->shared_dpll = DPLL_ID_PRIVATE;
> >  
> >  	tmp = I915_READ(TRANS_DDI_FUNC_CTL(TRANSCODER_EDP));
> > @@ -7020,7 +7020,7 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> >  	 * Note, if LVDS ever uses a non-1 pixel multiplier, we'll need
> >  	 * to use a real value here instead.
> >  	 */
> > -	pipe_config.cpu_transcoder = intel_crtc->pipe;
> > +	pipe_config.cpu_transcoder = (enum transcoder) intel_crtc->pipe;
> >  	pipe_config.pixel_multiplier = 1;
> >  	i9xx_crtc_clock_get(intel_crtc, &pipe_config);
> >  
> > @@ -7850,7 +7850,8 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
> >  
> >  	drm_mode_copy(&pipe_config->adjusted_mode, mode);
> >  	drm_mode_copy(&pipe_config->requested_mode, mode);
> > -	pipe_config->cpu_transcoder = to_intel_crtc(crtc)->pipe;
> > +	pipe_config->cpu_transcoder =
> > +		(enum transcoder) to_intel_crtc(crtc)->pipe;
> >  	pipe_config->shared_dpll = DPLL_ID_PRIVATE;
> >  
> >  	/* Compute a starting value for pipe_config->pipe_bpp taking the source
> > -- 
> > 1.7.11.7
> > 
> > _______________________________________________
> > 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

      reply	other threads:[~2013-07-04 12:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-04 10:01 [PATCH 1/2] drm/i915: explicitly cast pipe -> cpu_transcoder Daniel Vetter
2013-07-04 10:01 ` [PATCH 2/2] drm/i915: Explicitly cast pipe -> intel_dpll_id Daniel Vetter
2013-07-04 10:23 ` [PATCH 1/2] drm/i915: explicitly cast pipe -> cpu_transcoder Damien Lespiau
2013-07-04 12:41   ` Daniel Vetter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130704124110.GD18285@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=damien.lespiau@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox