From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C8C0CC33CB6 for ; Thu, 16 Jan 2020 23:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 946622072B for ; Thu, 16 Jan 2020 23:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217389; bh=FOFzr0NAm5ktk6Djd9QBwhNzPcrJqu+nWzNrlTcnVL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ysPUFSYMD8ZpOPSffa2DLLJneQ3/wDG16AhA5X0JT2Lw+n3+5MF3qCwjvHzub5YiJ i7EZpNziXzFqDA8vBeZ0EqYPgbmT6TnXJTmjesRl0DQ0DeRxx113jVKH/KmfMWeGvu iN+kYCm8DCQSWzyjTp0Dv782XW+lQMoqHQvCMeFE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391355AbgAPX3s (ORCPT ); Thu, 16 Jan 2020 18:29:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:35616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391323AbgAPX3m (ORCPT ); Thu, 16 Jan 2020 18:29:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D54DC2082F; Thu, 16 Jan 2020 23:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217381; bh=FOFzr0NAm5ktk6Djd9QBwhNzPcrJqu+nWzNrlTcnVL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MLp1xBgOVPM4bYhFnPpxafAyMziH3n4HEeCH7jcRGYB1zLyk8750KwV2QjtmUDWej 2JMVfQXv5prD32t4yVAG9EkAtmU9idtTZ1+9MF1nQzYmfuq+q2o3isbMqg+ETMcDFd nJ7MOFsjsychOPjd+LU+DzJllLAn3kFY1Ui0M6bU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Huang Rui , Alex Deucher , Zubin Mithra Subject: [PATCH 4.19 33/84] drm/ttm: fix incrementing the page pointer for huge pages Date: Fri, 17 Jan 2020 00:18:07 +0100 Message-Id: <20200116231717.636874499@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian König commit 453393369dc9806d2455151e329c599684762428 upstream. When we increment the counter we need to increment the pointer as well. Signed-off-by: Christian König Fixes: e16858a7e6e7 drm/ttm: fix start page for huge page check in ttm_put_pages() Reviewed-by: Michel Dänzer Acked-by: Huang Rui Signed-off-by: Alex Deucher Cc: Zubin Mithra Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -733,7 +733,7 @@ static void ttm_put_pages(struct page ** if (!(flags & TTM_PAGE_FLAG_DMA32) && (npages - i) >= HPAGE_PMD_NR) { for (j = 1; j < HPAGE_PMD_NR; ++j) - if (p++ != pages[i + j]) + if (++p != pages[i + j]) break; if (j == HPAGE_PMD_NR) @@ -768,7 +768,7 @@ static void ttm_put_pages(struct page ** break; for (j = 1; j < HPAGE_PMD_NR; ++j) - if (p++ != pages[i + j]) + if (++p != pages[i + j]) break; if (j != HPAGE_PMD_NR)