Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 63.35.35.123 as permitted sender) receiver=protection.outlook.com;
 client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com;
From:   "james qian wang (Arm Technology China)" <james.qian.wang@arm.com>
To:     Mihail Atanassov <Mihail.Atanassov@arm.com>
CC:     "Jonathan Chai (Arm Technology China)" <Jonathan.Chai@arm.com>,
        "Lowry Li (Arm Technology China)" <Lowry.Li@arm.com>,
        "Tiannan Zhu (Arm Technology China)" <Tiannan.Zhu@arm.com>,
        nd <nd@arm.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        Ben Davis <Ben.Davis@arm.com>,
        "Oscar Zhang (Arm Technology China)" <Oscar.Zhang@arm.com>,
        "Channing Chen (Arm Technology China)" <Channing.Chen@arm.com>,
        "james qian wang (Arm Technology China)" <james.qian.wang@arm.com>
Subject: [PATCH] drm/komeda: Correct d71 register block counting
Thread-Topic: [PATCH] drm/komeda: Correct d71 register block counting
Thread-Index: AQHVryCISCrm/Iio6km6+MdLrsMXuw==
Date:   Tue, 10 Dec 2019 06:10:34 +0000
Message-ID: <20191210061015.25905-1-james.qian.wang@arm.com>
Accept-Language: en-US
Content-Language: en-US
Authentication-Results-Original: spf=none (sender IP is )
 smtp.mailfrom=james.qian.wang@arm.com; 
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.20.1
x-ms-publictraffictype: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 3ee7ba0c-d54d-4b95-7215-08d77d37af65
X-MS-TrafficTypeDiagnostic: VE1PR08MB4990:|VE1PR08MB4990:|AM6PR08MB5077:
x-ms-exchange-transport-forked: True
X-Microsoft-Antispam-PRVS: <AM6PR08MB50778DAF844ABA0772DC1857B35B0@AM6PR08MB5077.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
x-ms-oob-tlc-oobclassifiers: OLM:1443;OLM:1443;
x-forefront-prvs: 02475B2A01
X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4636009)(376002)(396003)(366004)(346002)(39860400002)(136003)(189003)(199004)(71190400001)(66556008)(66446008)(2616005)(8676002)(316002)(6862004)(71200400001)(66476007)(6512007)(64756008)(26005)(66946007)(478600001)(8936002)(81156014)(81166006)(6486002)(4326008)(103116003)(2906002)(1076003)(6506007)(86362001)(52116002)(55236004)(54906003)(305945005)(36756003)(186003)(37006003)(6636002)(5660300002);DIR:OUT;SFP:1101;SCL:1;SRVR:VE1PR08MB4990;H:VE1PR08MB5006.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: arm.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: U8sTCeuumVkDMxYjxxwmcZGyDgd8Ypl2+c4sKSmrq9EG7ableHbGW1AbDlcVbtuakCLWN69WtBQeT47zcMR/nONaUFOQu9XSWCZtm8kriZ5itHJpuYUHBQ4ltUAxiTmb5HElWS0lsown8p5os+u/h6VCzGAtyBNJuoLGa+FEpMEYFKrx+pTHNNwEWqCt7lOW/l4K0rg+LZ8OhB9TNrLYCWTQxekeV0UlqZLAj9GPSNJmAqkDT272T2GBXsE+Mu2k7rf9yTUF192xwrArJmbuKW6+9bw5EIDbjfCYTUXK+fbwL2TeEXR0S0sijW+guEAhx55ahuKXqh6m3muvEcy90rlyis3l1dvzlCXj0RLI2z1w04CMcwEgFz9ESYGcDK24niRsYAGrpyjz1H2pGksgQ4NpEtN7rlo1nb6eGdJwp3YbMxgWEVdrcksHw4RpvCkO
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4990
Original-Authentication-Results: spf=none (sender IP is )
 smtp.mailfrom=james.qian.wang@arm.com; 
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT045.eop-EUR03.prod.protection.outlook.com
X-Forefront-Antispam-Report: CIP:63.35.35.123;IPV:CAL;SCL:-1;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(346002)(396003)(376002)(39860400002)(136003)(189003)(199004)(316002)(54906003)(36906005)(6512007)(8676002)(478600001)(26826003)(37006003)(6862004)(2906002)(1076003)(6486002)(103116003)(70586007)(356004)(36756003)(2616005)(70206006)(81166006)(81156014)(4326008)(6506007)(86362001)(305945005)(5660300002)(26005)(8936002)(336012)(76130400001)(6636002)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR08MB5077;H:64aa7808-outbound-1.mta.getcheckrecipient.com;FPR:;SPF:Pass;LANG:en;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;MX:1;A:1;
X-MS-Office365-Filtering-Correlation-Id-Prvs: 9c748b79-7f32-4561-86b1-08d77d37aafe
NoDisclaimer: True
X-Forefront-PRVS: 02475B2A01
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: m+0vbjNS2xvLoALMr53ypYlJ94bIU6Pc9x+r60m/qoGqwnCB0o9EQn51l0RlxO0pesqYuX0pQTuafpgba3cJQCJvt2Rkvbk4QZ1Y4U9zkeMZg0ggR7lZK3rd8Dy3TQxhTf48bRJAgi7V0/lphJNAAMooBe01FqXqFBaq8F4kyrkhzIvhUxh7/TaGaZ7+rXKMwkM5nAa66YVrqyGTvKeTAhV2l3ZfIz/PVjiageJrIBOCcxX4R09Rt7o+fYXIkfIg8ruZebhoQgTwRtNngXTrlRW0ujj1rv3fnVAm4XB1MDKaR58aO7QduLNMUb0Pu+EsjtFVi1Ot203RXt4Yzlj5bBJnm0xlgX3Jt7LKHY9sP8G2NfRG5egdns8q1TIweQ4GNXvU0lXe2+W65tRmLcFGogCFzcFoYRpYOiNnEdMo8+Be/ewQ9jKOBk8vVPbvWqWU
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2019 06:10:41.4978
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3ee7ba0c-d54d-4b95-7215-08d77d37af65
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5077
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Per HW, d71->num_blocks includes reserved blocks but no PERIPH block,
correct the block counting accordingly.
D71 happens to only have one reserved block and periph block, which
hides this counting error.

Signed-off-by: james qian wang (Arm Technology China) <james.qian.wang@arm.=
com>
---
 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c b/drivers/gpu=
/drm/arm/display/komeda/d71/d71_dev.c
index 822b23a1ce75..d53f95dea0a1 100644
--- a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
@@ -414,8 +414,11 @@ static int d71_enum_resources(struct komeda_dev *mdev)
 		d71->pipes[i] =3D to_d71_pipeline(pipe);
 	}
=20
-	/* loop the register blks and probe */
-	i =3D 2; /* exclude GCU and PERIPH */
+	/* loop the register blks and probe.
+	 * NOTE: d71->num_blocks includes reserved blocks.
+	 * d71->num_blocks =3D GCU + valid blocks + reserved blocks
+	 */
+	i =3D 1; /* exclude GCU */
 	offset =3D D71_BLOCK_SIZE; /* skip GCU */
 	while (i < d71->num_blocks) {
 		blk_base =3D mdev->reg_base + (offset >> 2);
@@ -425,9 +428,9 @@ static int d71_enum_resources(struct komeda_dev *mdev)
 			err =3D d71_probe_block(d71, &blk, blk_base);
 			if (err)
 				goto err_cleanup;
-			i++;
 		}
=20
+		i++;
 		offset +=3D D71_BLOCK_SIZE;
 	}
=20
--=20
2.20.1