* [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201
@ 2022-01-04 18:48 Jani Nikula
2022-01-04 18:48 ` [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI Jani Nikula
2022-01-10 16:01 ` [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Ville Syrjälä
0 siblings, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2022-01-04 18:48 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx
DP_SINK_COUNT_ESI and DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 have the same
contents as DP_SINK_COUNT and DP_DEVICE_SERVICE_IRQ_VECTOR,
respectively.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/drm_dp_helper.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 30359e434c3f..98d020835b49 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -1038,11 +1038,8 @@ struct drm_panel;
#define DP_SIDEBAND_MSG_UP_REQ_BASE 0x1600 /* 1.2 MST */
/* DPRX Event Status Indicator */
-#define DP_SINK_COUNT_ESI 0x2002 /* 1.2 */
-/* 0-5 sink count */
-# define DP_SINK_COUNT_CP_READY (1 << 6)
-
-#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* 1.2 */
+#define DP_SINK_COUNT_ESI 0x2002 /* same as 0x200 */
+#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* same as 0x201 */
#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1 0x2004 /* 1.2 */
# define DP_RX_GTC_MSTR_REQ_STATUS_CHANGE (1 << 0)
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI
2022-01-04 18:48 [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Jani Nikula
@ 2022-01-04 18:48 ` Jani Nikula
2022-01-10 16:01 ` [Intel-gfx] " Ville Syrjälä
2022-01-10 16:01 ` [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Ville Syrjälä
1 sibling, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2022-01-04 18:48 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx
Take bit 7 into account when reading sink count from
DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index f3d79eda94bb..ab4372e9fe43 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -4196,7 +4196,7 @@ int drm_dp_mst_hpd_irq(struct drm_dp_mst_topology_mgr *mgr, u8 *esi, bool *handl
int ret = 0;
int sc;
*handled = false;
- sc = esi[0] & 0x3f;
+ sc = DP_GET_SINK_COUNT(esi[0]);
if (sc != mgr->sink_count) {
mgr->sink_count = sc;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201
2022-01-04 18:48 [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Jani Nikula
2022-01-04 18:48 ` [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI Jani Nikula
@ 2022-01-10 16:01 ` Ville Syrjälä
2022-01-11 15:51 ` Jani Nikula
1 sibling, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2022-01-10 16:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, dri-devel
On Tue, Jan 04, 2022 at 08:48:56PM +0200, Jani Nikula wrote:
> DP_SINK_COUNT_ESI and DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 have the same
> contents as DP_SINK_COUNT and DP_DEVICE_SERVICE_IRQ_VECTOR,
> respectively.
IIRC there was an oversight in the earlier spec revisions that
showed bit 7 as reserved for one of the locations. But looks like
that got fixed.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> include/drm/drm_dp_helper.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
> index 30359e434c3f..98d020835b49 100644
> --- a/include/drm/drm_dp_helper.h
> +++ b/include/drm/drm_dp_helper.h
> @@ -1038,11 +1038,8 @@ struct drm_panel;
> #define DP_SIDEBAND_MSG_UP_REQ_BASE 0x1600 /* 1.2 MST */
>
> /* DPRX Event Status Indicator */
> -#define DP_SINK_COUNT_ESI 0x2002 /* 1.2 */
> -/* 0-5 sink count */
> -# define DP_SINK_COUNT_CP_READY (1 << 6)
> -
> -#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* 1.2 */
> +#define DP_SINK_COUNT_ESI 0x2002 /* same as 0x200 */
> +#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* same as 0x201 */
>
> #define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1 0x2004 /* 1.2 */
> # define DP_RX_GTC_MSTR_REQ_STATUS_CHANGE (1 << 0)
> --
> 2.30.2
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI
2022-01-04 18:48 ` [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI Jani Nikula
@ 2022-01-10 16:01 ` Ville Syrjälä
0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2022-01-10 16:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, dri-devel
On Tue, Jan 04, 2022 at 08:48:57PM +0200, Jani Nikula wrote:
> Take bit 7 into account when reading sink count from
> DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index f3d79eda94bb..ab4372e9fe43 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -4196,7 +4196,7 @@ int drm_dp_mst_hpd_irq(struct drm_dp_mst_topology_mgr *mgr, u8 *esi, bool *handl
> int ret = 0;
> int sc;
> *handled = false;
> - sc = esi[0] & 0x3f;
> + sc = DP_GET_SINK_COUNT(esi[0]);
I wouldn't mind a s/sc/sink_count/ as well.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> if (sc != mgr->sink_count) {
> mgr->sink_count = sc;
> --
> 2.30.2
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201
2022-01-10 16:01 ` [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Ville Syrjälä
@ 2022-01-11 15:51 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2022-01-11 15:51 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, dri-devel
On Mon, 10 Jan 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Tue, Jan 04, 2022 at 08:48:56PM +0200, Jani Nikula wrote:
>> DP_SINK_COUNT_ESI and DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 have the same
>> contents as DP_SINK_COUNT and DP_DEVICE_SERVICE_IRQ_VECTOR,
>> respectively.
>
> IIRC there was an oversight in the earlier spec revisions that
> showed bit 7 as reserved for one of the locations. But looks like
> that got fixed.
Yeah. Thanks for the review, pushed both to drm-misc-next.
BR,
Jani.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> include/drm/drm_dp_helper.h | 7 ++-----
>> 1 file changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
>> index 30359e434c3f..98d020835b49 100644
>> --- a/include/drm/drm_dp_helper.h
>> +++ b/include/drm/drm_dp_helper.h
>> @@ -1038,11 +1038,8 @@ struct drm_panel;
>> #define DP_SIDEBAND_MSG_UP_REQ_BASE 0x1600 /* 1.2 MST */
>>
>> /* DPRX Event Status Indicator */
>> -#define DP_SINK_COUNT_ESI 0x2002 /* 1.2 */
>> -/* 0-5 sink count */
>> -# define DP_SINK_COUNT_CP_READY (1 << 6)
>> -
>> -#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* 1.2 */
>> +#define DP_SINK_COUNT_ESI 0x2002 /* same as 0x200 */
>> +#define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* same as 0x201 */
>>
>> #define DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1 0x2004 /* 1.2 */
>> # define DP_RX_GTC_MSTR_REQ_STATUS_CHANGE (1 << 0)
>> --
>> 2.30.2
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-11 15:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-04 18:48 [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Jani Nikula
2022-01-04 18:48 ` [PATCH 2/2] drm/mst: use DP_GET_SINK_COUNT() for sink count in ESI Jani Nikula
2022-01-10 16:01 ` [Intel-gfx] " Ville Syrjälä
2022-01-10 16:01 ` [Intel-gfx] [PATCH 1/2] drm/dp: note that DPCD 0x2002-0x2003 match 0x200-0x201 Ville Syrjälä
2022-01-11 15: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