| Message ID | 1416258527-13789-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 17, 2014 at 01:08:46PM -0800, Jesse Barnes wrote: > Just like we do in the HDMI code, set the infoframe flag if we detect an > HDMI sink. > > Reported-by: Paulo Zanoni <przanoni@gmail.com> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_ddi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index 86745da..78576e0 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -2062,6 +2062,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > switch (temp & TRANS_DDI_MODE_SELECT_MASK) { > case TRANS_DDI_MODE_SELECT_HDMI: > pipe_config->has_hdmi_sink = true; > + pipe_config->has_infoframe = true; Infoframes aren't controlled by this bit here but set in HSW_TVIDEO_DIP_CTL. Since the point of this is to detect mismatches between the bios and what we'd like to have for fastboot I think we need to check that register. Instead of blindly deriving state to appease the cross checker. -Daniel > case TRANS_DDI_MODE_SELECT_DVI: > case TRANS_DDI_MODE_SELECT_FDI: > break; > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, 18 Nov 2014 09:14:05 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Mon, Nov 17, 2014 at 01:08:46PM -0800, Jesse Barnes wrote: > > Just like we do in the HDMI code, set the infoframe flag if we detect an > > HDMI sink. > > > > Reported-by: Paulo Zanoni <przanoni@gmail.com> > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > --- > > drivers/gpu/drm/i915/intel_ddi.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > > index 86745da..78576e0 100644 > > --- a/drivers/gpu/drm/i915/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/intel_ddi.c > > @@ -2062,6 +2062,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > > switch (temp & TRANS_DDI_MODE_SELECT_MASK) { > > case TRANS_DDI_MODE_SELECT_HDMI: > > pipe_config->has_hdmi_sink = true; > > + pipe_config->has_infoframe = true; > > Infoframes aren't controlled by this bit here but set in > HSW_TVIDEO_DIP_CTL. Since the point of this is to detect mismatches > between the bios and what we'd like to have for fastboot I think we need > to check that register. Instead of blindly deriving state to appease the > cross checker. Oh you're right; I was thinking of compute_config. I'll send a follow up.
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 86745da..78576e0 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -2062,6 +2062,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, switch (temp & TRANS_DDI_MODE_SELECT_MASK) { case TRANS_DDI_MODE_SELECT_HDMI: pipe_config->has_hdmi_sink = true; + pipe_config->has_infoframe = true; case TRANS_DDI_MODE_SELECT_DVI: case TRANS_DDI_MODE_SELECT_FDI: break;
Just like we do in the HDMI code, set the infoframe flag if we detect an HDMI sink. Reported-by: Paulo Zanoni <przanoni@gmail.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_ddi.c | 1 + 1 file changed, 1 insertion(+)