diff mbox

[10/22] drm/i915: don't init LVDS on VLV

Message ID 1359809786-26434-11-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes Feb. 2, 2013, 12:56 p.m. UTC
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_lvds.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

Jani Nikula Feb. 6, 2013, 1:19 p.m. UTC | #1
On Sat, 02 Feb 2013, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_lvds.c |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 8c61876..feef18c 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -1024,6 +1024,9 @@ static bool intel_lvds_supported(struct drm_device *dev)
>  	if (HAS_PCH_SPLIT(dev))
>  		return true;
>  
> +	if (IS_VALLEYVIEW(dev))
> +		return false;
> +
>  	/* Otherwise LVDS was only attached to mobile products,
>  	 * except for the inglorious 830gm */
>  	return IS_MOBILE(dev) && !IS_I830(dev);
> -- 
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Feb. 6, 2013, 1:34 p.m. UTC | #2
On Wed, Feb 6, 2013 at 2:19 PM, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Sat, 02 Feb 2013, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Up to now all the platform output setup selection has happened in, I'm
not sure whether we should sprinkle this out like that. In any case,
we seem to miss the check for Haswell, too. It probably works out
since the lvds present pin doesn't work, either.
-Daniel
Daniel Vetter March 6, 2013, 2:27 p.m. UTC | #3
On Wed, Feb 06, 2013 at 03:19:03PM +0200, Jani Nikula wrote:
> On Sat, 02 Feb 2013, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Queued for -next, thanks for the patch. And Paulo promised to fix up the
confusion around LVDS presence checks.
-Daniel
> 
> > ---
> >  drivers/gpu/drm/i915/intel_lvds.c |    3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> > index 8c61876..feef18c 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > @@ -1024,6 +1024,9 @@ static bool intel_lvds_supported(struct drm_device *dev)
> >  	if (HAS_PCH_SPLIT(dev))
> >  		return true;
> >  
> > +	if (IS_VALLEYVIEW(dev))
> > +		return false;
> > +
> >  	/* Otherwise LVDS was only attached to mobile products,
> >  	 * except for the inglorious 830gm */
> >  	return IS_MOBILE(dev) && !IS_I830(dev);
> > -- 
> > 1.7.9.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 8c61876..feef18c 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1024,6 +1024,9 @@  static bool intel_lvds_supported(struct drm_device *dev)
 	if (HAS_PCH_SPLIT(dev))
 		return true;
 
+	if (IS_VALLEYVIEW(dev))
+		return false;
+
 	/* Otherwise LVDS was only attached to mobile products,
 	 * except for the inglorious 830gm */
 	return IS_MOBILE(dev) && !IS_I830(dev);