* [PATCH] drm/i915: don't probe oui for eDP panels
@ 2012-06-12 10:02 Daniel Vetter
2012-06-12 10:34 ` Chris Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2012-06-12 10:02 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
At least not in the detect function. We'd need eDP vdd to do so if the
panel is off, but I've figured just disabling it is easier.
This issue has been introduce in
commit 0d198328538276c4459ef5de081e68ae60e6c4c2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 14 16:05:47 2012 -0400
drm/i915/dp: Probe branch/sink OUIs
Cc: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
Tested-by: Yang Guang <guang.a.yang@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_dp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 296cfc2..34e1769 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1970,6 +1970,9 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
{
u8 buf[3];
+ if (is_edp(intel_dp))
+ return;
+
if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
return;
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: don't probe oui for eDP panels
2012-06-12 10:02 [PATCH] drm/i915: don't probe oui for eDP panels Daniel Vetter
@ 2012-06-12 10:34 ` Chris Wilson
2012-06-12 11:11 ` [PATCH] drm/i915: eDP aux needs vdd Daniel Vetter
2012-06-12 11:20 ` Daniel Vetter
0 siblings, 2 replies; 6+ messages in thread
From: Chris Wilson @ 2012-06-12 10:34 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Tue, 12 Jun 2012 12:02:47 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> At least not in the detect function. We'd need eDP vdd to do so if the
> panel is off, but I've figured just disabling it is easier.
>
> This issue has been introduce in
>
> commit 0d198328538276c4459ef5de081e68ae60e6c4c2
> Author: Adam Jackson <ajax@redhat.com>
> Date: Mon May 14 16:05:47 2012 -0400
>
> drm/i915/dp: Probe branch/sink OUIs
>
> Cc: Adam Jackson <ajax@redhat.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
> Tested-by: Yang Guang <guang.a.yang@intel.com>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 296cfc2..34e1769 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1970,6 +1970,9 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
> {
> u8 buf[3];
>
> + if (is_edp(intel_dp))
> + return;
Can I be annoying and ask this be annotated that we bail here for
convenience and not due to lack of hw support? Otherwise we just add a
moment of confusion should we ever need to log oui for eDP. (If
manufacturers thought eDP -> LVDS dongles were a good idea, just imagine
the chain in a couple of years time...)
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] drm/i915: eDP aux needs vdd
2012-06-12 10:34 ` Chris Wilson
@ 2012-06-12 11:11 ` Daniel Vetter
2012-06-12 11:17 ` Chris Wilson
2012-06-12 11:20 ` Daniel Vetter
1 sibling, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2012-06-12 11:11 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
The new oui probe has been missing these.
This issue has been introduce in
commit 0d198328538276c4459ef5de081e68ae60e6c4c2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 14 16:05:47 2012 -0400
drm/i915/dp: Probe branch/sink OUIs
v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
as suggested by Chris Wilson.
Cc: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
Tested-by: Yang Guang <guang.a.yang@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_dp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 296cfc2..fbc30a5 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1970,6 +1970,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
{
u8 buf[3];
+ ironlake_edp_panel_vdd_on(intel_dp);
+
if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
return;
@@ -1980,6 +1982,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
buf[0], buf[1], buf[2]);
+
+ ironlake_edp_panel_vdd_off(intel_dp, false);
}
static bool
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: eDP aux needs vdd
2012-06-12 11:11 ` [PATCH] drm/i915: eDP aux needs vdd Daniel Vetter
@ 2012-06-12 11:17 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2012-06-12 11:17 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Tue, 12 Jun 2012 13:11:41 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> The new oui probe has been missing these.
>
> This issue has been introduce in
>
> commit 0d198328538276c4459ef5de081e68ae60e6c4c2
> Author: Adam Jackson <ajax@redhat.com>
> Date: Mon May 14 16:05:47 2012 -0400
>
> drm/i915/dp: Probe branch/sink OUIs
>
> v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
> as suggested by Chris Wilson.
>
> Cc: Adam Jackson <ajax@redhat.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
> Tested-by: Yang Guang <guang.a.yang@intel.com>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 296cfc2..fbc30a5 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1970,6 +1970,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
> {
> u8 buf[3];
>
> + ironlake_edp_panel_vdd_on(intel_dp);
> +
> if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
> return;
The side effect is that we then need to introduce a layer of onion here.
>
> @@ -1980,6 +1982,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
> if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
> DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
> buf[0], buf[1], buf[2]);
> +
> + ironlake_edp_panel_vdd_off(intel_dp, false);
> }
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/i915: eDP aux needs vdd
2012-06-12 10:34 ` Chris Wilson
2012-06-12 11:11 ` [PATCH] drm/i915: eDP aux needs vdd Daniel Vetter
@ 2012-06-12 11:20 ` Daniel Vetter
2012-06-13 21:06 ` Daniel Vetter
1 sibling, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2012-06-12 11:20 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
The new oui probe has been missing these.
This issue has been introduce in
commit 0d198328538276c4459ef5de081e68ae60e6c4c2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 14 16:05:47 2012 -0400
drm/i915/dp: Probe branch/sink OUIs
v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
as suggested by Chris Wilson.
v3: Fix up the error path fail - I suck.
Cc: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
Tested-by: Yang Guang <guang.a.yang@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_dp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 296cfc2..c574ff0 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1973,6 +1973,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
return;
+ ironlake_edp_panel_vdd_on(intel_dp);
+
if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3))
DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
buf[0], buf[1], buf[2]);
@@ -1980,6 +1982,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
buf[0], buf[1], buf[2]);
+
+ ironlake_edp_panel_vdd_off(intel_dp, false);
}
static bool
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: eDP aux needs vdd
2012-06-12 11:20 ` Daniel Vetter
@ 2012-06-13 21:06 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2012-06-13 21:06 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Tue, Jun 12, 2012 at 01:20:47PM +0200, Daniel Vetter wrote:
> The new oui probe has been missing these.
>
> This issue has been introduce in
>
> commit 0d198328538276c4459ef5de081e68ae60e6c4c2
> Author: Adam Jackson <ajax@redhat.com>
> Date: Mon May 14 16:05:47 2012 -0400
>
> drm/i915/dp: Probe branch/sink OUIs
>
> v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
> as suggested by Chris Wilson.
>
> v3: Fix up the error path fail - I suck.
>
> Cc: Adam Jackson <ajax@redhat.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
> Tested-by: Yang Guang <guang.a.yang@intel.com>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Picked up for -fixes with Jesse's irc-r-b added.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-13 21:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 10:02 [PATCH] drm/i915: don't probe oui for eDP panels Daniel Vetter
2012-06-12 10:34 ` Chris Wilson
2012-06-12 11:11 ` [PATCH] drm/i915: eDP aux needs vdd Daniel Vetter
2012-06-12 11:17 ` Chris Wilson
2012-06-12 11:20 ` Daniel Vetter
2012-06-13 21:06 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox