Skip to content

Commit

Permalink
drm/msm/dp: Add missing drm_device backpointer
Browse files Browse the repository at this point in the history
'6cba3fe43341 ("drm/dp: Add backpointer to drm_device in drm_dp_aux")'
introduced a mandator drm_device backpointer in struct drm_dp_aux, but
missed the msm DP driver. Fix this.

Fixes: 6cba3fe ("drm/dp: Add backpointer to drm_device in drm_dp_aux")
Link: https://lore.kernel.org/linux-arm-msm/20210625034721.1287948-1-bjorn.andersson@linaro.org/
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  • Loading branch information
andersson authored and 0x011011110 committed Aug 5, 2021
1 parent 6b339ed commit 23181ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/msm/dp/dp_aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void dp_aux_deinit(struct drm_dp_aux *dp_aux)
dp_catalog_aux_enable(aux->catalog, false);
}

int dp_aux_register(struct drm_dp_aux *dp_aux)
int dp_aux_register(struct drm_dp_aux *dp_aux, struct drm_device *drm_dev)
{
struct dp_aux_private *aux;
int ret;
Expand All @@ -455,6 +455,7 @@ int dp_aux_register(struct drm_dp_aux *dp_aux)

aux->dp_aux.name = "dpu_dp_aux";
aux->dp_aux.dev = aux->dev;
aux->dp_aux.drm_dev = drm_dev;
aux->dp_aux.transfer = dp_aux_transfer;
ret = drm_dp_aux_register(&aux->dp_aux);
if (ret) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/msm/dp/dp_aux.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "dp_catalog.h"
#include <drm/drm_dp_helper.h>

int dp_aux_register(struct drm_dp_aux *dp_aux);
int dp_aux_register(struct drm_dp_aux *dp_aux, struct drm_device *drm_dev);
void dp_aux_unregister(struct drm_dp_aux *dp_aux);
void dp_aux_isr(struct drm_dp_aux *dp_aux);
void dp_aux_init(struct drm_dp_aux *dp_aux);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/msm/dp/dp_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ static int dp_display_bind(struct device *dev, struct device *master,
}

dp->aux->drm_dev = drm;
rc = dp_aux_register(dp->aux);
rc = dp_aux_register(dp->aux, drm);
if (rc) {
DRM_ERROR("DRM DP AUX register failed\n");
goto end;
Expand Down

0 comments on commit 23181ec

Please sign in to comment.