* [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected
@ 2015-09-18 12:54 Jani Nikula
2015-09-18 14:23 ` Jani Nikula
2015-09-21 9:13 ` Mika Kuoppala
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2015-09-18 12:54 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
SKL port E handling was added in
commit 26951caf55d73ceb1967b0bf12f6d0b96853508e
Author: Xiong Zhang <xiong.y.zhang@intel.com>
Date: Mon Aug 17 15:55:50 2015 +0800
drm/i915/skl: enable DDI-E hotplug
but the whole function was moved in a another branch in
commit b93433ccf64846820b9448f5ff5dd4348b58a8ed
Author: Jani Nikula <jani.nikula@intel.com>
Date: Thu Aug 20 10:47:36 2015 +0300
drm/i915: move ibx_digital_port_connected to intel_dp.c
and the addition was lost at some backmerge that I was unable to
identify. Put it back in.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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 a6872508adec..77e4115fc847 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4583,6 +4583,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv,
case PORT_D:
bit = SDE_PORTD_HOTPLUG_CPT;
break;
+ case PORT_E:
+ bit = SDE_PORTE_HOTPLUG_SPT;
+ break;
default:
MISSING_CASE(port->port);
return false;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected
2015-09-18 12:54 [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected Jani Nikula
@ 2015-09-18 14:23 ` Jani Nikula
2015-09-21 9:13 ` Mika Kuoppala
1 sibling, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-09-18 14:23 UTC (permalink / raw)
To: intel-gfx; +Cc: Sarvela, TomiX P
On Fri, 18 Sep 2015, Jani Nikula <jani.nikula@intel.com> wrote:
> SKL port E handling was added in
>
> commit 26951caf55d73ceb1967b0bf12f6d0b96853508e
> Author: Xiong Zhang <xiong.y.zhang@intel.com>
> Date: Mon Aug 17 15:55:50 2015 +0800
>
> drm/i915/skl: enable DDI-E hotplug
>
> but the whole function was moved in a another branch in
>
> commit b93433ccf64846820b9448f5ff5dd4348b58a8ed
> Author: Jani Nikula <jani.nikula@intel.com>
> Date: Thu Aug 20 10:47:36 2015 +0300
>
> drm/i915: move ibx_digital_port_connected to intel_dp.c
>
> and the addition was lost at some backmerge that I was unable to
> identify. Put it back in.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Tested-by: Tomi Sarvela <tomix.p.sarvela@intel.com>
> ---
> 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 a6872508adec..77e4115fc847 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4583,6 +4583,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv,
> case PORT_D:
> bit = SDE_PORTD_HOTPLUG_CPT;
> break;
> + case PORT_E:
> + bit = SDE_PORTE_HOTPLUG_SPT;
> + break;
> default:
> MISSING_CASE(port->port);
> return false;
> --
> 2.1.4
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected
2015-09-18 12:54 [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected Jani Nikula
2015-09-18 14:23 ` Jani Nikula
@ 2015-09-21 9:13 ` Mika Kuoppala
2015-09-21 9:51 ` Jani Nikula
1 sibling, 1 reply; 4+ messages in thread
From: Mika Kuoppala @ 2015-09-21 9:13 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Jani Nikula <jani.nikula@intel.com> writes:
> SKL port E handling was added in
>
> commit 26951caf55d73ceb1967b0bf12f6d0b96853508e
> Author: Xiong Zhang <xiong.y.zhang@intel.com>
> Date: Mon Aug 17 15:55:50 2015 +0800
>
> drm/i915/skl: enable DDI-E hotplug
>
> but the whole function was moved in a another branch in
>
> commit b93433ccf64846820b9448f5ff5dd4348b58a8ed
> Author: Jani Nikula <jani.nikula@intel.com>
> Date: Thu Aug 20 10:47:36 2015 +0300
>
> drm/i915: move ibx_digital_port_connected to intel_dp.c
>
> and the addition was lost at some backmerge that I was unable to
> identify. Put it back in.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> 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 a6872508adec..77e4115fc847 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4583,6 +4583,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv,
> case PORT_D:
> bit = SDE_PORTD_HOTPLUG_CPT;
> break;
> + case PORT_E:
> + bit = SDE_PORTE_HOTPLUG_SPT;
> + break;
> default:
> MISSING_CASE(port->port);
> return false;
> --
> 2.1.4
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected
2015-09-21 9:13 ` Mika Kuoppala
@ 2015-09-21 9:51 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-09-21 9:51 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
On Mon, 21 Sep 2015, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
> Jani Nikula <jani.nikula@intel.com> writes:
>
>> SKL port E handling was added in
>>
>> commit 26951caf55d73ceb1967b0bf12f6d0b96853508e
>> Author: Xiong Zhang <xiong.y.zhang@intel.com>
>> Date: Mon Aug 17 15:55:50 2015 +0800
>>
>> drm/i915/skl: enable DDI-E hotplug
>>
>> but the whole function was moved in a another branch in
>>
>> commit b93433ccf64846820b9448f5ff5dd4348b58a8ed
>> Author: Jani Nikula <jani.nikula@intel.com>
>> Date: Thu Aug 20 10:47:36 2015 +0300
>>
>> drm/i915: move ibx_digital_port_connected to intel_dp.c
>>
>> and the addition was lost at some backmerge that I was unable to
>> identify. Put it back in.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Thanks, pushed to drm-intel-next-queued.
BR,
Jani.
>
>> ---
>> 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 a6872508adec..77e4115fc847 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -4583,6 +4583,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv,
>> case PORT_D:
>> bit = SDE_PORTD_HOTPLUG_CPT;
>> break;
>> + case PORT_E:
>> + bit = SDE_PORTE_HOTPLUG_SPT;
>> + break;
>> default:
>> MISSING_CASE(port->port);
>> return false;
>> --
>> 2.1.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-21 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 12:54 [PATCH] drm/i915/skl: handle port E in cpt_digital_port_connected Jani Nikula
2015-09-18 14:23 ` Jani Nikula
2015-09-21 9:13 ` Mika Kuoppala
2015-09-21 9:51 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox