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: 466816 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1055814jao; Thu, 24 Jun 2021 20:48:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxNLmc1kjqOyDS6sueWH5gu10oYGkrljrZeCqn7vo+XmXmvdVx4oybFa4RhluMV9ieMO78 X-Received: by 2002:a92:660f:: with SMTP id a15mr6387100ilc.182.1624592914217; Thu, 24 Jun 2021 20:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624592914; cv=none; d=google.com; s=arc-20160816; b=jljdy+am3hmibM9jAoXKGCMkVhnSUnXzKwWPTnZjlIFaOh58A3y+WeLihhTWEYCD5u ZIdvtXWCh4w8teLIS/1W6M9Man/Q3z3yvE9PJRh/WKKAYamnrg8tGU92JL9e9kTxXmiL QqDEb5OEF0KmltKDgeXpyE6IUDwn1XF/9hwpCQw53ydtxS4w9ASc3eLps3ybJVao/UY+ tSD+OChay5tN2BpcH3KtNlRHotgk6M/OnznbDQhVDlhTMsGD2idY08M2waeYsTkUvJUY pMvDP6y1vM9TQJP1FHAydXDRKNNt0hlnfO72ONsdAoxhvlK8npP+pgAQc34QnKIZ9SBa PmPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YPOpe/pbA8bUnGpZvYmFITp0NghwSmJn6dUDVrfCv+E=; b=Ox7DsiwS1/b3F2IXsk2ETjiCQitR6v/2Xc4ErGgsD4zSnafEA1dv0wMlPUQxz2u9x5 3/rTdwHaBe0cEvIzlWWzuak9bGbnkfzBmJos1PUrTYcwkpmx7FRmdYFPM7ddsfeQWHhg 9ggBM949zomsV2LD104aBICgN31PMZjBUvqK2cPTzbvT3cLtNPmXw/pUcFPaMRwrOAuB TGQSFShALepBxwBOAO1WZGgEGasUKIRYlGZxqxyJWZOc5QhnzS7OpNXXy1uSoxZ6I3yw tRk8wLpcVeGMElyVmdlQJA18jcfeZvWUzz8iSQ5NARE0IZn37dlbkuBGr89pSkUGKQ5j PJlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hzs8Tl8E; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k40si6315248jav.33.2021.06.24.20.48.33; Thu, 24 Jun 2021 20:48:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hzs8Tl8E; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233109AbhFYDuw (ORCPT + 17 others); Thu, 24 Jun 2021 23:50:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233068AbhFYDuw (ORCPT ); Thu, 24 Jun 2021 23:50:52 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93835C061756 for ; Thu, 24 Jun 2021 20:48:30 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id 22so3887241oix.10 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=H/F0Rzhppueqkt/9y8J1MB0w4ugvaCrqa0QsvPZbO7ezDh0uhlxpnI/+hki2EPtufL A2qBqjxkz57oAN1l2FOnPV4Fo10fwZNFVQbkSLU389huHhOj9F7AkUxCrbObtPdVkfwx UT6Bf/rYEiVgyDUrfVFu2pG4FDOFDEU0ZTtxW7nIbrCa5ihK4seVt3gWbs3kpVJUV7zV 6O+fb7YjeplYd93LX8h4eHDAa8PsTMHO7WOW/5gKcCAZOo0jSuXtbN05/pWRlWGVJ2OT MfF+epgaGkvm/Hfa4nwO/2nZ3Kp6FU+yLwuHi2IeQhBahehjop8nKfuV9ldnXghBGr4f wowg== X-Gm-Message-State: AOAM5322yNDQbWoCx8h7dWBlh/D7ATeF6TGKYDip2P1lOolCHx/sgStM 1uorW12T4PgtEgEpVg3Pm5WnFg== 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 Cc: Lyude Paul , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org 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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org '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 --- 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(-) -- 2.29.2 Reviewed-by: Abhinav Kumar Reviewed-by: Lyude Paul 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;