From patchwork Wed Dec 5 16:29:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10714557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55F3114E2 for ; Wed, 5 Dec 2018 16:30:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 455592D024 for ; Wed, 5 Dec 2018 16:30:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 395EA2DC14; Wed, 5 Dec 2018 16:30:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEC932D024 for ; Wed, 5 Dec 2018 16:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728115AbeLEQaG (ORCPT ); Wed, 5 Dec 2018 11:30:06 -0500 Received: from mail-yb1-f196.google.com ([209.85.219.196]:32949 "EHLO mail-yb1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727240AbeLEQaG (ORCPT ); Wed, 5 Dec 2018 11:30:06 -0500 Received: by mail-yb1-f196.google.com with SMTP id f125so3909192ybc.0 for ; Wed, 05 Dec 2018 08:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s9WBbVUWnS8+gNiVBm0oOF4WfSw2JrldIInFTVe12gU=; b=S9fFV7NNzMkevQDxR7q8UUyU8Pja7t+hnFmzvS55wwwGpcgzz0RkN4f6+Xd2brl79+ fvX9NB3xNHYu1mrkiG2XyDudfliQAmYhuoTT1aQ0bY480ICfrWISJt6lI1IeGjBWZ2Mu 78AcTxkG9WfQvB4KJ286Nut3b7JFEfDjrVAVZFo8/WppYPq9CukQsAw4xq+L98i5Ptnw BrkGleyCf/1z9GiG2/Hyqan245mAtyMJVBihXK2rbVQcFA0hy/udGFJeYvW5Eu7aZOKl hky0xAYU7iizOo8ZI7tGdHGaNGzNm/DaH3hv96cOz36GB5gxh0lhLquLK4ERbNFdMSc4 chPQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=s9WBbVUWnS8+gNiVBm0oOF4WfSw2JrldIInFTVe12gU=; b=Jo/yee1UbMRdVhD25z6ac6suksG9nnJf4ll+eqR7YuLiNFJ6W/d9hoh1UKy7NXk9kg koeBqyo8yC6QMlIg8cT12l+rxkFS9VOBULU6LTSJkjtI2+Agd+NZeE3g2lUdeHqI+eYe ITDNCqyogIYNsYbwM+jQI9M46weuVhbbLP14snLmAHE+N77KHploOa6cMisz1Et4ycj1 IvyJhR/O6T6XO/O5o/rC5GLmZ9O9AcpPiuiUA1lL46EDvipLR4ALl6phKC6CwP1es30g mn/WUeyhGXO1MVqxrkybh9I4IYimrWsTfPQ7wWadqJYcoKghgO2YLyDMQuCX84jpLhY/ HYtg== X-Gm-Message-State: AA+aEWbq1PPFrb0CgkvSdFyqeC/MZLxMLaM/t8qHYz7QDolh3+VKwBre zqlEg0gag5c7AsoxlB/vxdX5BA== X-Google-Smtp-Source: AFSGD/VEvarS/KY3rXqQg613HZMzURDTmMxtS3lMhODpcs5QuX1kFdMcJf0tsMe6lnVClJbYvYdg/Q== X-Received: by 2002:a25:e094:: with SMTP id x142mr10335100ybg.42.1544027405051; Wed, 05 Dec 2018 08:30:05 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id n133sm6460470ywb.55.2018.12.05.08.30.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 08:30:04 -0800 (PST) From: Sean Paul Cc: robdclark@gmail.com, jsanka@codeaurora.org, Sean Paul , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH 3/9] drm/msm: Don't track bridges in msm private struct Date: Wed, 5 Dec 2018 11:29:35 -0500 Message-Id: <20181205162958.25025-3-sean@poorly.run> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog In-Reply-To: <20181205162958.25025-1-sean@poorly.run> References: <20181205162958.25025-1-sean@poorly.run> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul drm core already tracks this, so we can just lean on that instead of tracking ourselves. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/dsi/dsi.c | 1 - drivers/gpu/drm/msm/edp/edp.c | 1 - drivers/gpu/drm/msm/hdmi/hdmi.c | 1 - drivers/gpu/drm/msm/msm_drv.h | 3 --- 4 files changed, 6 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 7b2a1e6a88107..97b906a9b3945 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -250,7 +250,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } - priv->bridges[priv->num_bridges++] = msm_dsi->bridge; priv->connectors[priv->num_connectors++] = msm_dsi->connector; return 0; diff --git a/drivers/gpu/drm/msm/edp/edp.c b/drivers/gpu/drm/msm/edp/edp.c index 6a63aba98a307..694c2d43011f6 100644 --- a/drivers/gpu/drm/msm/edp/edp.c +++ b/drivers/gpu/drm/msm/edp/edp.c @@ -188,7 +188,6 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev, encoder->bridge = edp->bridge; - priv->bridges[priv->num_bridges++] = edp->bridge; priv->connectors[priv->num_connectors++] = edp->connector; return 0; diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index ace8aab072761..1901ae820ef0b 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -340,7 +340,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, encoder->bridge = hdmi->bridge; - priv->bridges[priv->num_bridges++] = hdmi->bridge; priv->connectors[priv->num_connectors++] = hdmi->connector; platform_set_drvdata(pdev, hdmi); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index c6eff08e80170..1902713ed84b0 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -197,9 +197,6 @@ struct msm_drm_private { struct msm_drm_thread disp_thread[MAX_CRTCS]; struct msm_drm_thread event_thread[MAX_CRTCS]; - unsigned int num_bridges; - struct drm_bridge *bridges[MAX_BRIDGES]; - unsigned int num_connectors; struct drm_connector *connectors[MAX_CONNECTORS];