From patchwork Thu Oct 29 19:01:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11867135 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 343C3C55179 for ; Thu, 29 Oct 2020 19:03:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 A98962076D for ; Thu, 29 Oct 2020 19:03:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gf0MDmfy"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="T1dd5rsp"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="d0mBk7Xt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A98962076D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KIDVT0Rf8r9e2O3SJ/cpm2S/LpZ/jQ5Acyj8gqWVZo8=; b=gf0MDmfyBlH/I7Z1UFlUf+LvO zGZ1VNxZDsSqqctNcXBN1myeTX9G0Mu0wer4T5ZGDZTbPnUEbSyXew0b1aE7vFIYaIVfvTRDP7eQG RkFIzDc64rdd21iRr9I36zTPcYqkfNJaLWXuAG+lgjGrMCqn3zqqD5q3K8eyZ9qZnYzFzHQGYwDUY aNOXjSiPZxvAYeKY1525QKYBHZhqrK18hD2kuMivxfYCr/shYrZMcUOTX97608UKEXp8jULdbT31t JUUpA2RnRuJey3wKxBYpIqhRAmtCMqgJSUL/nKDAKaP6R2qp8AwaCb4a74Bf3QdyK1pEJHDRpoKPV 7ZviSp++Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDB7-0001f0-7m; Thu, 29 Oct 2020 19:01:41 +0000 Received: from new1-smtp.messagingengine.com ([66.111.4.221]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDAe-0001Ux-3B; Thu, 29 Oct 2020 19:01:13 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id DD56A5807F8; Thu, 29 Oct 2020 15:01:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 29 Oct 2020 15:01:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=DJblop826jaau ARFHlsFWGhybWeX4gCdzuspM7ojKio=; b=T1dd5rspJuZzJ3CovJjMx/dkKwTee E+9XTYeVwWu2lnJONtSB74RNOokh3Qg/CO3QaOx9+A/JJoC9XNyKYiIVtKtTUSde 0xLFw3KkofdqQnNurggrUmdBFggtkZkgc4dUgDup1Drls/fv/THM4/0jizrw6V/R xdImfc7oPMy3Y8bWZhcicVqLB9SHMbiffMdG4u4I+Tq4F0PGMO70c5dZDdYN9yI1 mqsZtsX5BpDOPk3Syf1UPIyRWb5sXOl+bA555xJWC51Luu2prFUmrpAH7DDgsGFa YPpMnJLaS4nWrdzDJcii5/lyZkqyqHe59U/xQuV6YomNfwuMwA073kZhw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=DJblop826jaauARFHlsFWGhybWeX4gCdzuspM7ojKio=; b=d0mBk7Xt M35dpBfOGcHX3T8xO0Es3UlUXLBjMc+ZVwwMz1PZxAK86R6IHpPsY0zmzlLMzsgw LmCedRo8Diml1NdZFo1wLPb/mYMnuK2oOiEexJvfAAurqQV3sRajydicz9KAPD17 CWUUaC6wm1iSN+ypauojFhkKkjcrguP0wRIAaYokV1z4VCZPhEwQwC3LE0OFO/qg JFJ5qeNAFi+bqke1sXVgJ1shsVO4irEUagNNb4pTGASkeiSRozypmX6yQX3my7UN RG6coLzdrb3HI1x0gol3SHVXkz9ESkWB40iJbe76YAF0NCd4uN58CKIiDpAFMoHk 009YzX9zBEsxMA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrleefgdduudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id 64F0C3064683; Thu, 29 Oct 2020 15:01:11 -0400 (EDT) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Eric Anholt Subject: [PATCH 4/6] drm/vc4: Use the helper to retrieve vc4_dev when needed Date: Thu, 29 Oct 2020 20:01:02 +0100 Message-Id: <20201029190104.2181730-4-maxime@cerno.tech> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201029190104.2181730-1-maxime@cerno.tech> References: <20201029190104.2181730-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_150112_258553_03F888CD X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Dave Stevenson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We have a helper to retrieve the vc4_dev structure from the drm_device one when needed, so let's use it consistently. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hvs.c | 4 ++-- drivers/gpu/drm/vc4/vc4_kms.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index 4d0a833366ce..b72b2bd05a81 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -560,7 +560,7 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); - struct vc4_dev *vc4 = drm->dev_private; + struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_hvs *hvs = NULL; int ret; u32 dispctrl; @@ -679,7 +679,7 @@ static void vc4_hvs_unbind(struct device *dev, struct device *master, void *data) { struct drm_device *drm = dev_get_drvdata(master); - struct vc4_dev *vc4 = drm->dev_private; + struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_hvs *hvs = vc4->hvs; if (drm_mm_node_allocated(&vc4->hvs->mitchell_netravali_filter)) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 149825ff5df8..708099a24406 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -51,7 +51,7 @@ static struct vc4_ctm_state *vc4_get_ctm_state(struct drm_atomic_state *state, struct drm_private_obj *manager) { struct drm_device *dev = state->dev; - struct vc4_dev *vc4 = dev->dev_private; + struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_private_state *priv_state; int ret;