| Message ID | 1460569673-13694-2-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 13, 2016 at 08:47:44PM +0300, Ander Conselvan de Oliveira wrote: > Set the lane count for HDMI to 4. This will make it easier to > unduplicate CHV phy code. > > v2: Set lane_count in *_get_config() to please state checker. (0day) > v3: Set lane_count for DDI in DVI mode too. (CI) > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_ddi.c | 4 +++- > drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index 921edf1..d8999c9 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -2003,8 +2003,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > > if (intel_hdmi->infoframe_enabled(&encoder->base, pipe_config)) > pipe_config->has_infoframe = true; > - break; > + /* fall through */ > case TRANS_DDI_MODE_SELECT_DVI: > + pipe_config->lane_count = 4; > + break; > case TRANS_DDI_MODE_SELECT_FDI: > break; > case TRANS_DDI_MODE_SELECT_DP_SST: > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index b199ede..80d9841 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -953,6 +953,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, > dotclock /= pipe_config->pixel_multiplier; > > pipe_config->base.adjusted_mode.crtc_clock = dotclock; > + > + pipe_config->lane_count = 4; > } > > static void intel_enable_hdmi_audio(struct intel_encoder *encoder) > @@ -1337,6 +1339,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, > /* Set user selected PAR to incoming mode's member */ > adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; > > + pipe_config->lane_count = 4; > + > return true; > } > > -- > 2.4.11 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 921edf1..d8999c9 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -2003,8 +2003,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder, if (intel_hdmi->infoframe_enabled(&encoder->base, pipe_config)) pipe_config->has_infoframe = true; - break; + /* fall through */ case TRANS_DDI_MODE_SELECT_DVI: + pipe_config->lane_count = 4; + break; case TRANS_DDI_MODE_SELECT_FDI: break; case TRANS_DDI_MODE_SELECT_DP_SST: diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index b199ede..80d9841 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -953,6 +953,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, dotclock /= pipe_config->pixel_multiplier; pipe_config->base.adjusted_mode.crtc_clock = dotclock; + + pipe_config->lane_count = 4; } static void intel_enable_hdmi_audio(struct intel_encoder *encoder) @@ -1337,6 +1339,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, /* Set user selected PAR to incoming mode's member */ adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; + pipe_config->lane_count = 4; + return true; }
Set the lane count for HDMI to 4. This will make it easier to unduplicate CHV phy code. v2: Set lane_count in *_get_config() to please state checker. (0day) v3: Set lane_count for DDI in DVI mode too. (CI) Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> --- drivers/gpu/drm/i915/intel_ddi.c | 4 +++- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)