From patchwork Tue Mar 14 20:35:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 9624455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4BF7A604A9 for ; Tue, 14 Mar 2017 20:36:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E082285C3 for ; Tue, 14 Mar 2017 20:36:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32542285C5; Tue, 14 Mar 2017 20:36:03 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 65C7C285C3 for ; Tue, 14 Mar 2017 20:36:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDC566E070; Tue, 14 Mar 2017 20:35:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelnx193.ext.ti.com (lelnx193.ext.ti.com [198.47.27.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id A48B66E070 for ; Tue, 14 Mar 2017 20:35:57 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v2EKZriT008612; Tue, 14 Mar 2017 15:35:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1489523753; bh=/6Orx5fwkv/X7VTNXDv2ruip9CEyjnatlYUiRmxS6gI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=g8heBeMlgSnKInEfnz6jBSaYL9E8R0XvGsfkSP4Z2nP1mBRKhKubHuHh+zkd5R/em r5ZsIQSn3ynyEZTptdEGddGhibC18PDwRu/uIlt/YGHl7pCPZVtnNqbJQ4cGGKtDbL SV4PM03o06BXNtHjWhr61RW8c2vnJu20DD8YBwW0= Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2EKZrsG008848; Tue, 14 Mar 2017 15:35:53 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Tue, 14 Mar 2017 15:35:53 -0500 Received: from jadmar.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2EKZkWi007438; Tue, 14 Mar 2017 15:35:52 -0500 From: Jyri Sarha To: Subject: [PATCH 3/3] drm/omapdrm: Separate ids for planes and CRTCs in omap_modeset_init() Date: Tue, 14 Mar 2017 22:35:44 +0200 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 Cc: tomi.valkeinen@ti.com, Jyri Sarha , laurent.pinchart@ideasonboard.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add separate local id variables for indexing planes and CRTCs in omap_modeset_init(). This is to make it more explicit what each local variable is used for. Signed-off-by: Jyri Sarha --- drivers/gpu/drm/omapdrm/omap_drv.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 3d30f29..9b67906 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -275,7 +275,8 @@ static int omap_connect_dssdevs(void) return r; } -static int omap_modeset_create_crtc(struct drm_device *dev, int id, +static int omap_modeset_create_crtc(struct drm_device *dev, + int crtc_id, int plane_id, enum omap_channel channel, u32 possible_crtcs) { @@ -283,18 +284,18 @@ static int omap_modeset_create_crtc(struct drm_device *dev, int id, struct drm_plane *plane; struct drm_crtc *crtc; - plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_PRIMARY, + plane = omap_plane_init(dev, plane_id, DRM_PLANE_TYPE_PRIMARY, possible_crtcs); if (IS_ERR(plane)) return PTR_ERR(plane); - crtc = omap_crtc_init(dev, plane, channel, id); + crtc = omap_crtc_init(dev, plane, channel, crtc_id); BUG_ON(priv->num_crtcs >= ARRAY_SIZE(priv->crtcs)); - priv->crtcs[id] = crtc; + priv->crtcs[crtc_id] = crtc; priv->num_crtcs++; - priv->planes[id] = plane; + priv->planes[plane_id] = plane; priv->num_planes++; return 0; @@ -318,7 +319,7 @@ static int omap_modeset_init(struct drm_device *dev) int num_ovls = dss_feat_get_num_ovls(); int num_mgrs = dss_feat_get_num_mgrs(); int num_crtcs = 0; - int i, id = 0; + int i, crtc_id = 0, plane_id = 0; int ret; u32 possible_crtcs_for_planes; @@ -382,7 +383,7 @@ static int omap_modeset_init(struct drm_device *dev) * create, let's not try to create a crtc for this * panel/encoder and onwards. */ - if (id == num_crtcs) + if (crtc_id == num_crtcs) continue; /* @@ -401,8 +402,8 @@ static int omap_modeset_init(struct drm_device *dev) * allocated crtc, we create a new crtc for it */ if (!channel_used(dev, channel)) { - ret = omap_modeset_create_crtc(dev, id, channel, - possible_crtcs_for_planes); + ret = omap_modeset_create_crtc(dev, crtc_id, plane_id, + channel, possible_crtcs_for_planes); if (ret < 0) { dev_err(dev->dev, "could not create CRTC (channel %u)\n", @@ -410,17 +411,18 @@ static int omap_modeset_init(struct drm_device *dev) return ret; } - id++; + crtc_id++; + plane_id++; } } /* * Create normal planes for the remaining overlays: */ - for (; id < num_ovls; id++) { + for (; plane_id < num_ovls; plane_id++) { struct drm_plane *plane; - plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_OVERLAY, + plane = omap_plane_init(dev, plane_id, DRM_PLANE_TYPE_OVERLAY, possible_crtcs_for_planes); if (IS_ERR(plane)) return PTR_ERR(plane); @@ -438,6 +440,7 @@ static int omap_modeset_init(struct drm_device *dev) struct omap_dss_device *dssdev = omap_encoder_get_dssdev(encoder); struct omap_dss_device *output; + int id; output = omapdss_find_output_from_display(dssdev);