| Message ID | 1362172471-7643-21-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote: > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index fd4a0d4..60397e8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) > I915_WRITE(PFIT_CONTROL, 0); > } > > - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) > + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && > + !IS_VALLEYVIEW(dev)) If HAS_DDI is true on baytrail, that's a bug in the HAS_DDI macro. And I'd like that to be a feature-flag in the intel_infor struct anyway, iirc Damien is volunteered. -Daniel > intel_crt_init(dev); > > if (HAS_DDI(dev)) { > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote: > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index fd4a0d4..60397e8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) > I915_WRITE(PFIT_CONTROL, 0); > } > > - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) > + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && > + !IS_VALLEYVIEW(dev)) > intel_crt_init(dev); I was under the impression that VLV still has this. Was I mistaken? > if (HAS_DDI(dev)) { > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, 6 Mar 2013 21:00:11 +0200 Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote: > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > --- > > drivers/gpu/drm/i915/intel_display.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index fd4a0d4..60397e8 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) > > I915_WRITE(PFIT_CONTROL, 0); > > } > > > > - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) > > + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && > > + !IS_VALLEYVIEW(dev)) > > intel_crt_init(dev); > > I was under the impression that VLV still has this. Was I mistaken? Not exposed anymore I think. And yeah this can be dropped since the DDI check should dtrt.
On Wed, Mar 06, 2013 at 11:09:08AM -0800, Jesse Barnes wrote: > On Wed, 6 Mar 2013 21:00:11 +0200 > Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > > > On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote: > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > > --- > > > drivers/gpu/drm/i915/intel_display.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > > index fd4a0d4..60397e8 100644 > > > --- a/drivers/gpu/drm/i915/intel_display.c > > > +++ b/drivers/gpu/drm/i915/intel_display.c > > > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) > > > I915_WRITE(PFIT_CONTROL, 0); > > > } > > > > > > - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) > > > + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && > > > + !IS_VALLEYVIEW(dev)) > > > intel_crt_init(dev); > > > > I was under the impression that VLV still has this. Was I mistaken? > > Not exposed anymore I think. And yeah this can be dropped since the > DDI check should dtrt. It's testing for !HAS_DDI() which should equal true for VLV.
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fd4a0d4..60397e8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) I915_WRITE(PFIT_CONTROL, 0); } - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && + !IS_VALLEYVIEW(dev)) intel_crt_init(dev); if (HAS_DDI(dev)) {
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)