From patchwork Fri Jun 25 03:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 12343581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BF5AC49EA5 for ; Fri, 25 Jun 2021 03:48:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3E1261400 for ; Fri, 25 Jun 2021 03:48:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3E1261400 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A8386E096; Fri, 25 Jun 2021 03:48:32 +0000 (UTC) Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2D386E096 for ; Fri, 25 Jun 2021 03:48:30 +0000 (UTC) Received: by mail-oi1-x236.google.com with SMTP id h9so9924217oih.4 for ; Thu, 24 Jun 2021 20:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YPOpe/pbA8bUnGpZvYmFITp0NghwSmJn6dUDVrfCv+E=; b=hzs8Tl8EyDHus3ahR9b21fg/WfdJZlMs3DlXuyuWSukuoKTxim4HYJCFWVytM/+tmp eUHhrU25K52sd9THcIJKn/nehCWVBrSBhKWO6eM/U5V6pZpzRDQpTt7r0QZQqoZ8AYVE F4ZfrFDhvUwvLYRpVBCZfSUa9ThrBXSk0XgaLpDU0j/DnelILFiPtD5LHBUIHBrm6ETs dDKokJ+mSr+qX2mTSZC1BJLFRH+EIuKTGH5CF20O5k1YuzCJPIC2IDlj0bYO9C3HD0Sz kUFvtP2YFTFG11GYRiAcqha2nfHzQbihI2dWXHb/YQmO634KzQtFDcbHNbEK6WvTIW2b 4YKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YPOpe/pbA8bUnGpZvYmFITp0NghwSmJn6dUDVrfCv+E=; b=nglhzzkR509r6TUGMPfvHusH1m/2vVlMl+nMQ4xKcw6e2V8eZ39EN53bmx84Z/XUbI lkAVYs8FtQK6SjcE0ba6djCwT4LaQEAwbPpZ1nCyRwKlB0dSxO5nDZDSfvUcD0IWp7eC v81KW3WPSo1UfE5tWkEfxNYCcIwKe2VIszh1Q9jEvUsd/0HiyatnhmVcP/gpayk+C/25 VASb8sW5gmoPPk65VVkYrqM4kKyBnPAZCRDKrOaWhvO0qgHPLexZX4xO9m031Ac1Guho 5OsKY/D0LhsTPuEb6nMxR0aYdCiBeMZvY9GekkOXChPiSWeGf97kaVt4m5+8v2eqxpcr rO4Q== X-Gm-Message-State: AOAM531IixPMlmCUejrLvFygvr8NO5BWPET/NTLYhkvI+qNi4Z/PB7wf H46QIVzivXoTWv/iLnfLgTEWpw== X-Google-Smtp-Source: ABdhPJzU2V+rYLSU0OS1yhD01/njJqJk4DxGcmQAc4IA2qxy0Ho+ormW5U1DV/f3M7TJxA4YLuQOIA== X-Received: by 2002:a05:6808:251:: with SMTP id m17mr6547877oie.77.1624592909941; Thu, 24 Jun 2021 20:48:29 -0700 (PDT) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id d20sm1099480otq.62.2021.06.24.20.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 20:48:29 -0700 (PDT) From: Bjorn Andersson To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Dave Airlie Subject: [PATCH] drm/msm/dp: Add missing drm_device backpointer Date: Thu, 24 Jun 2021 20:47:21 -0700 Message-Id: <20210625034721.1287948-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" '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 Reviewed-by: Abhinav Kumar Reviewed-by: Lyude Paul --- 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 -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;