| Message ID | 20210616194415.36926-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/dp_mst: Add missing drm parameters to recently added call to drm_dbg_kms() | expand |
Reviewed-by: Lyude Paul <lyude@redhat.com> Will go ahead and push this to drm-misc-next-fixes, thanks On Wed, 2021-06-16 at 12:44 -0700, José Roberto de Souza wrote: > Commit 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by > ports in stale topology") added to calls to drm_dbg_kms() but it > missed the first parameter, the drm device breaking the build. > > Fixes: 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by ports in > stale topology") > Cc: Wayne Lin <Wayne.Lin@amd.com> > Cc: Lyude Paul <lyude@redhat.com> > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c > b/drivers/gpu/drm/drm_dp_mst_topology.c > index 9ac148efd9e43..ad0795afc21cf 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -3389,7 +3389,9 @@ int drm_dp_update_payload_part1(struct > drm_dp_mst_topology_mgr *mgr) > mutex_unlock(&mgr->lock); > > if (skip) { > - drm_dbg_kms("Virtual channel %d is not in > current topology\n", i); > + drm_dbg_kms(mgr->dev, > + "Virtual channel %d is not in > current topology\n", > + i); > continue; > } > /* Validated ports don't matter if we're releasing > @@ -3404,7 +3406,8 @@ int drm_dp_update_payload_part1(struct > drm_dp_mst_topology_mgr *mgr) > payload->start_slot = > req_payload.start_slot; > continue; > } else { > - drm_dbg_kms("Fail:set > payload to invalid sink"); > + drm_dbg_kms(mgr->dev, > + "Fail:set > payload to invalid sink"); > mutex_unlock(&mgr- > >payload_lock); > return -EINVAL; > }
[Public] Really sorry for the mistake that I made and any inconvenience it brought. Thanks José and Lyude. Regards, Wayne
It's no problem! We all make mistakes sometimes :), I should have been more diligent on compile-checking this myself as well On Thu, 2021-06-17 at 08:20 +0000, Lin, Wayne wrote: > [Public] > > Really sorry for the mistake that I made and any inconvenience it brought. > Thanks José and Lyude. > > Regards, > Wayne > > ________________________________________ > > From: Lyude Paul <lyude@redhat.com> > > Sent: Thursday, June 17, 2021 03:47 > > To: José Roberto de Souza; intel-gfx@lists.freedesktop.org > > Cc: dri-devel@lists.freedesktop.org; Lin, Wayne > > Subject: Re: [PATCH] drm/dp_mst: Add missing drm parameters to recently > > added call to drm_dbg_kms() > > > > Reviewed-by: Lyude Paul <lyude@redhat.com> > > > > Will go ahead and push this to drm-misc-next-fixes, thanks > > > > On Wed, 2021-06-16 at 12:44 -0700, José Roberto de Souza wrote: > > > Commit 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by > > > ports in stale topology") added to calls to drm_dbg_kms() but it > > > missed the first parameter, the drm device breaking the build. > > > > > > Fixes: 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by > > > ports in > > > stale topology") > > > Cc: Wayne Lin <Wayne.Lin@amd.com> > > > Cc: Lyude Paul <lyude@redhat.com> > > > Cc: dri-devel@lists.freedesktop.org > > > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > > > --- > > > drivers/gpu/drm/drm_dp_mst_topology.c | 7 +++++-- > > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c > > > b/drivers/gpu/drm/drm_dp_mst_topology.c > > > index 9ac148efd9e43..ad0795afc21cf 100644 > > > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > > > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > > > @@ -3389,7 +3389,9 @@ int drm_dp_update_payload_part1(struct > > > drm_dp_mst_topology_mgr *mgr) > > > mutex_unlock(&mgr->lock); > > > > > > if (skip) { > > > - drm_dbg_kms("Virtual channel %d is not > > > in > > > current topology\n", i); > > > + drm_dbg_kms(mgr->dev, > > > + "Virtual channel %d is not > > > in > > > current topology\n", > > > + i); > > > continue; > > > } > > > /* Validated ports don't matter if we're > > > releasing > > > @@ -3404,7 +3406,8 @@ int drm_dp_update_payload_part1(struct > > > drm_dp_mst_topology_mgr *mgr) > > > payload->start_slot = > > > req_payload.start_slot; > > > continue; > > > } else { > > > - drm_dbg_kms("Fail:set > > > payload to invalid sink"); > > > + drm_dbg_kms(mgr->dev, > > > + "Fail:set > > > payload to invalid sink"); > > > mutex_unlock(&mgr- > > > > payload_lock); > > > return -EINVAL; > > > } > > > > -- > > Cheers, > > Lyude Paul (she/her) > > Software Engineer at Red Hat >
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9ac148efd9e43..ad0795afc21cf 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3389,7 +3389,9 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) mutex_unlock(&mgr->lock); if (skip) { - drm_dbg_kms("Virtual channel %d is not in current topology\n", i); + drm_dbg_kms(mgr->dev, + "Virtual channel %d is not in current topology\n", + i); continue; } /* Validated ports don't matter if we're releasing @@ -3404,7 +3406,8 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) payload->start_slot = req_payload.start_slot; continue; } else { - drm_dbg_kms("Fail:set payload to invalid sink"); + drm_dbg_kms(mgr->dev, + "Fail:set payload to invalid sink"); mutex_unlock(&mgr->payload_lock); return -EINVAL; }
Commit 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by ports in stale topology") added to calls to drm_dbg_kms() but it missed the first parameter, the drm device breaking the build. Fixes: 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by ports in stale topology") Cc: Wayne Lin <Wayne.Lin@amd.com> Cc: Lyude Paul <lyude@redhat.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)