| Message ID | 1365801414-3576-2-git-send-email-przanoni@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 12, 2013 at 06:16:53PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not > have CRT, so just check for !IS_ULT. This problem happened on a real > machine and resulted in a very ugly dmesg. > > Cc: stable@vger.kernel.org > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> This doesn't apply to dinq. The approach I'd favour is to have a intel_info.has_crt similar to the other feature flags. -Chris
On Mon, Apr 15, 2013 at 09:45:00PM +0100, Chris Wilson wrote: > On Fri, Apr 12, 2013 at 06:16:53PM -0300, Paulo Zanoni wrote: > > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > > > We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not > > have CRT, so just check for !IS_ULT. This problem happened on a real > > machine and resulted in a very ugly dmesg. > > > > Cc: stable@vger.kernel.org > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > > This doesn't apply to dinq. The approach I'd favour is to have a > intel_info.has_crt similar to the other feature flags. I'm ok with piling checks on top here for now, I guess we should reconsider once the next hw platforms shows up around the corner ... All patches merged to dinq, thanks. -Daniel
Hi 2013/4/16 Daniel Vetter <daniel@ffwll.ch>: > On Mon, Apr 15, 2013 at 09:45:00PM +0100, Chris Wilson wrote: >> On Fri, Apr 12, 2013 at 06:16:53PM -0300, Paulo Zanoni wrote: >> > From: Paulo Zanoni <paulo.r.zanoni@intel.com> >> > >> > We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not >> > have CRT, so just check for !IS_ULT. This problem happened on a real >> > machine and resulted in a very ugly dmesg. >> > >> > Cc: stable@vger.kernel.org >> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> >> >> This doesn't apply to dinq. The approach I'd favour is to have a >> intel_info.has_crt similar to the other feature flags. > > I'm ok with piling checks on top here for now, I guess we should > reconsider once the next hw platforms shows up around the corner ... We can always apply Chris's suggestion as a follow-up patch. > > All patches merged to dinq, thanks. I thought patch 2 would go to -fixes. We need it even for older Kernels. Thanks for the reviews, Paulo > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- Paulo Zanoni
On Tue, Apr 16, 2013 at 3:41 PM, Paulo Zanoni <przanoni@gmail.com> wrote: >> All patches merged to dinq, thanks. > > I thought patch 2 would go to -fixes. We need it even for older Kernels. > This late in the release cycle -fixes is for severe regressions and black-screen level non-regression issues only. Hence merged through -next with cc: stable. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 574d68d..64b4407 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8488,7 +8488,7 @@ 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 (!IS_ULT(dev)) intel_crt_init(dev); if (HAS_DDI(dev)) {