[PATCH 0/2] Two small patches for MST

[PATCH 0/2] Two small patches for MST

[Harry Wentland]

Two minor patches for MST here. We were replying NACK to UP requests
when we intended to ACK them. We were also not filling in the vcpi
field for mst_mgr->payloads although it's defined. Saving the vcpi
simplifies the new amdgpu MST implementation that we currently work
on.

Harry Wentland (1):
  drm/dp/mst: save vcpi with payloads

Mykola Lysenko (1):
  drm/dp/mst: reply with ACK for UP reqs

 drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.1.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 1/2] drm/dp/mst: reply with ACK for UP reqs

[Harry Wentland]

From: Mykola Lysenko <Mykola.Lysenko@amd.com>

Currently we reply with NACK to UP requests which might
confuse receivers. We haven't seen any actual issues with
this but should still respond to UP requests correctly.

Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.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 809959d56d78..64a0a3729643 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1823,7 +1823,7 @@ static int drm_dp_encode_up_ack_reply(struct drm_dp_sideband_msg_tx *msg, u8 req
 {
 	struct drm_dp_sideband_msg_reply_body reply;
 
-	reply.reply_type = 1;
+	reply.reply_type = 0;
 	reply.req_type = req_type;
 	drm_dp_encode_sideband_reply(&reply, msg);
 	return 0;
-- 
2.1.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/2] drm/dp/mst: save vcpi with payloads

[Harry Wentland]

This makes it possibly for drivers to find the associated
mst_port by looking at the payload allocation table.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 64a0a3729643..3b6627dde9ff 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1673,6 +1673,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
 		if (mgr->proposed_vcpis[i]) {
 			port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
 			req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;
+			req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;
 		} else {
 			port = NULL;
 			req_payload.num_slots = 0;
@@ -1688,6 +1689,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
 			if (req_payload.num_slots) {
 				drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);
 				mgr->payloads[i].num_slots = req_payload.num_slots;
+				mgr->payloads[i].vcpi = req_payload.vcpi;
 			} else if (mgr->payloads[i].num_slots) {
 				mgr->payloads[i].num_slots = 0;
 				drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]);
-- 
2.1.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] Two small patches for MST

[Alex Deucher]

On Mon, Dec 7, 2015 at 1:55 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> Two minor patches for MST here. We were replying NACK to UP requests
> when we intended to ACK them. We were also not filling in the vcpi
> field for mst_mgr->payloads although it's defined. Saving the vcpi
> simplifies the new amdgpu MST implementation that we currently work
> on.

For the series:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


>
> Harry Wentland (1):
>   drm/dp/mst: save vcpi with payloads
>
> Mykola Lysenko (1):
>   drm/dp/mst: reply with ACK for UP reqs
>
>  drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> --
> 2.1.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] Two small patches for MST

[Wentland, Harry]

Thanks, Alex.

Dave, will you pick these up when pulling from Alex's tree if he includes them?

Thanks,
Harry

________________________________________
From: Alex Deucher <alexdeucher@gmail.com>
Sent: Monday, December 14, 2015 10:26 AM
To: Wentland, Harry
Cc: Maling list - DRI developers
Subject: Re: [PATCH 0/2] Two small patches for MST

On Mon, Dec 7, 2015 at 1:55 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> Two minor patches for MST here. We were replying NACK to UP requests
> when we intended to ACK them. We were also not filling in the vcpi
> field for mst_mgr->payloads although it's defined. Saving the vcpi
> simplifies the new amdgpu MST implementation that we currently work
> on.

For the series:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


>
> Harry Wentland (1):
>   drm/dp/mst: save vcpi with payloads
>
> Mykola Lysenko (1):
>   drm/dp/mst: reply with ACK for UP reqs
>
>  drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> --
> 2.1.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] Two small patches for MST

[Daniel Vetter]

On Mon, Dec 14, 2015 at 05:14:47PM +0000, Wentland, Harry wrote:
> Thanks, Alex.
> 
> Dave, will you pick these up when pulling from Alex's tree if he includes them?

I stuffed them into drm-misc, should land still for 4.5.

Cheers, Daniel

> 
> Thanks,
> Harry
> 
> ________________________________________
> From: Alex Deucher <alexdeucher@gmail.com>
> Sent: Monday, December 14, 2015 10:26 AM
> To: Wentland, Harry
> Cc: Maling list - DRI developers
> Subject: Re: [PATCH 0/2] Two small patches for MST
> 
> On Mon, Dec 7, 2015 at 1:55 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> > Two minor patches for MST here. We were replying NACK to UP requests
> > when we intended to ACK them. We were also not filling in the vcpi
> > field for mst_mgr->payloads although it's defined. Saving the vcpi
> > simplifies the new amdgpu MST implementation that we currently work
> > on.
> 
> For the series:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> 
> 
> >
> > Harry Wentland (1):
> >   drm/dp/mst: save vcpi with payloads
> >
> > Mykola Lysenko (1):
> >   drm/dp/mst: reply with ACK for UP reqs
> >
> >  drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > --
> > 2.1.4
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] Two small patches for MST

[Wentland, Harry]

Awesome. Thanks, Daniel.

Harry

________________________________________
From: Daniel Vetter <daniel.vetter@ffwll.ch> on behalf of Daniel Vetter <daniel@ffwll.ch>
Sent: Monday, December 14, 2015 12:32 PM
To: Wentland, Harry
Cc: Alex Deucher; Maling list - DRI developers
Subject: Re: [PATCH 0/2] Two small patches for MST

On Mon, Dec 14, 2015 at 05:14:47PM +0000, Wentland, Harry wrote:
> Thanks, Alex.
>
> Dave, will you pick these up when pulling from Alex's tree if he includes them?

I stuffed them into drm-misc, should land still for 4.5.

Cheers, Daniel

>
> Thanks,
> Harry
>
> ________________________________________
> From: Alex Deucher <alexdeucher@gmail.com>
> Sent: Monday, December 14, 2015 10:26 AM
> To: Wentland, Harry
> Cc: Maling list - DRI developers
> Subject: Re: [PATCH 0/2] Two small patches for MST
>
> On Mon, Dec 7, 2015 at 1:55 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> > Two minor patches for MST here. We were replying NACK to UP requests
> > when we intended to ACK them. We were also not filling in the vcpi
> > field for mst_mgr->payloads although it's defined. Saving the vcpi
> > simplifies the new amdgpu MST implementation that we currently work
> > on.
>
> For the series:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
>
> >
> > Harry Wentland (1):
> >   drm/dp/mst: save vcpi with payloads
> >
> > Mykola Lysenko (1):
> >   drm/dp/mst: reply with ACK for UP reqs
> >
> >  drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > --
> > 2.1.4
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel