| Message ID | 20240223191548.392185-1-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: convert remaining intel_dp_vsc_sdp_pack | expand |
On 2/23/2024 11:15 AM, Rodrigo Vivi wrote: > Commit 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") > and commit b55b88d86fec ("drm/dp: drop the size parameter from drm_dp_vsc_sdp_pack()") > were based on top of a tree containing the > commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") but > landed in a tree where this commit didn't exist, leaving behind a spurious > case calling for a removed function: intel_dp_vsc_sdp_pack() > > Let's convert the remaining case here so we can port this patch to > any tree that doesn't contain > commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") > > In in kind of merge where this commit does exist, this line here will > be gone anyway and not needed any longer. > > Fixes: 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") > Cc: Dave Airlie <airlied@gmail.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On Fri, 23 Feb 2024 at 21:15, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > > Commit 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") > and commit b55b88d86fec ("drm/dp: drop the size parameter from drm_dp_vsc_sdp_pack()") > were based on top of a tree containing the > commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") but > landed in a tree where this commit didn't exist, leaving behind a spurious > case calling for a removed function: intel_dp_vsc_sdp_pack() > > Let's convert the remaining case here so we can port this patch to > any tree that doesn't contain > commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") > > In in kind of merge where this commit does exist, this line here will > be gone anyway and not needed any longer. > > Fixes: 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") > Cc: Dave Airlie <airlied@gmail.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Fri, 23 Feb 2024 14:15:48 -0500, Rodrigo Vivi wrote: > Commit 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") > and commit b55b88d86fec ("drm/dp: drop the size parameter from drm_dp_vsc_sdp_pack()") > were based on top of a tree containing the > commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") but > landed in a tree where this commit didn't exist, leaving behind a spurious > case calling for a removed function: intel_dp_vsc_sdp_pack() > > [...] Applied to drm-misc-next, thanks! [1/1] drm/i915: convert remaining intel_dp_vsc_sdp_pack commit: de8de2c8acb931ce6197a04376a7078ccf50e821 Best regards,
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 756c15791a3c..c2e73ba5b2b1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4229,7 +4229,7 @@ void intel_write_dp_vsc_sdp(struct intel_encoder *encoder, struct dp_sdp sdp = {}; ssize_t len; - len = intel_dp_vsc_sdp_pack(vsc, &sdp, sizeof(sdp)); + len = drm_dp_vsc_sdp_pack(vsc, &sdp); if (drm_WARN_ON(&dev_priv->drm, len < 0)) return;
Commit 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") and commit b55b88d86fec ("drm/dp: drop the size parameter from drm_dp_vsc_sdp_pack()") were based on top of a tree containing the commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") but landed in a tree where this commit didn't exist, leaving behind a spurious case calling for a removed function: intel_dp_vsc_sdp_pack() Let's convert the remaining case here so we can port this patch to any tree that doesn't contain commit 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") In in kind of merge where this commit does exist, this line here will be gone anyway and not needed any longer. Fixes: 47f419e07111 ("drm/dp: move intel_dp_vsc_sdp_pack() to generic helper") Cc: Dave Airlie <airlied@gmail.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)