'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: 6cba3fe43341 ("drm/dp: Add backpointer to drm_device in drm_dp_aux") Signed-off-by: Bjorn Andersson bjorn.andersson@linaro.org --- drivers/gpu/drm/msm/dp/dp_aux.c | 3 ++- drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c index 4a3293b590b0..88659ed200b9 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.c +++ b/drivers/gpu/drm/msm/dp/dp_aux.c @@ -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; @@ -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) { diff --git a/drivers/gpu/drm/msm/dp/dp_aux.h b/drivers/gpu/drm/msm/dp/dp_aux.h index 0728cc09c9ec..7ef0d83b483a 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.h +++ b/drivers/gpu/drm/msm/dp/dp_aux.h @@ -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); diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index c26562bd85fe..2f0a5c13f251 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -259,7 +259,7 @@ static int dp_display_bind(struct device *dev, struct device *master, return rc; }
- rc = dp_aux_register(dp->aux); + rc = dp_aux_register(dp->aux, drm); if (rc) { DRM_ERROR("DRM DP AUX register failed\n"); return rc;
On 2021-06-24 20:47, Bjorn Andersson wrote:
'6cba3fe43341 ("drm/dp: Add backpointer to drm_device in drm_dp_aux")' introduced a mandator drm_device backpointer in struct drm_dp_aux, but
mandatory
missed the msm DP driver. Fix this.
Fixes: 6cba3fe43341 ("drm/dp: Add backpointer to drm_device in drm_dp_aux") Signed-off-by: Bjorn Andersson bjorn.andersson@linaro.org
apart from that nit, Reviewed-by: Abhinav Kumar abhinavk@codeaurora.org
drivers/gpu/drm/msm/dp/dp_aux.c | 3 ++- drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c index 4a3293b590b0..88659ed200b9 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.c +++ b/drivers/gpu/drm/msm/dp/dp_aux.c @@ -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; @@ -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) {
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.h b/drivers/gpu/drm/msm/dp/dp_aux.h index 0728cc09c9ec..7ef0d83b483a 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.h +++ b/drivers/gpu/drm/msm/dp/dp_aux.h @@ -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); diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index c26562bd85fe..2f0a5c13f251 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -259,7 +259,7 @@ static int dp_display_bind(struct device *dev, struct device *master, return rc; }
- rc = dp_aux_register(dp->aux);
- rc = dp_aux_register(dp->aux, drm); if (rc) { DRM_ERROR("DRM DP AUX register failed\n"); return rc;
Ah - must have missed this when I added this. Thanks for the fix!
Reviewed-by: Lyude Paul lyude@redhat.com
On Thu, 2021-06-24 at 20:47 -0700, Bjorn Andersson wrote:
'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: 6cba3fe43341 ("drm/dp: Add backpointer to drm_device in drm_dp_aux") Signed-off-by: Bjorn Andersson bjorn.andersson@linaro.org
drivers/gpu/drm/msm/dp/dp_aux.c | 3 ++- drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c index 4a3293b590b0..88659ed200b9 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.c +++ b/drivers/gpu/drm/msm/dp/dp_aux.c @@ -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; @@ -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) { diff --git a/drivers/gpu/drm/msm/dp/dp_aux.h b/drivers/gpu/drm/msm/dp/dp_aux.h index 0728cc09c9ec..7ef0d83b483a 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.h +++ b/drivers/gpu/drm/msm/dp/dp_aux.h @@ -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); diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index c26562bd85fe..2f0a5c13f251 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -259,7 +259,7 @@ static int dp_display_bind(struct device *dev, struct device *master, return rc; } - rc = dp_aux_register(dp->aux); + rc = dp_aux_register(dp->aux, drm); if (rc) { DRM_ERROR("DRM DP AUX register failed\n"); return rc;
dri-devel@lists.freedesktop.org
-
abhinavk＠codeaurora.org -
Bjorn Andersson -
Lyude Paul