On Thu, Apr 10, 2014 at 08:56:46PM +0300, Jani Nikula wrote:
> On Wed, 09 Apr 2014, Daniel Vetter <daniel@xxxxxxxx> wrote:
> > On Wed, Apr 09, 2014 at 01:28:23PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> >> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >>
> >> No CRT output on CHV, so don't call intel_crt_init().
> >>
> >> v2: Don't disable CRT on HAS.
> >>
> >> FIXME: Split out the is_simulator check again, we need it for now to keep HAS
> >> going.
> >
> > Fixme can be dropped, this is something I need to sort out when rebasing
> > internal.
>
> FWIW, with that fixed,
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Ok, merged up to this patch here for now.
-Daniel
>
>
>
> > -Daniel
> >
> >>
> >> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> (v1)
> >> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> >> ---
> >> drivers/gpu/drm/i915/intel_display.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> >> index 266d8fe..9b65a04 100644
> >> --- a/drivers/gpu/drm/i915/intel_display.c
> >> +++ b/drivers/gpu/drm/i915/intel_display.c
> >> @@ -10989,7 +10989,7 @@ static void intel_setup_outputs(struct drm_device *dev)
> >>
> >> intel_lvds_init(dev);
> >>
> >> - if (!IS_ULT(dev))
> >> + if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev))
> >> intel_crt_init(dev);
> >>
> >> if (HAS_DDI(dev)) {
> >> --
> >> 1.8.3.2
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
