From patchwork Fri Mar 17 03:39:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archit Taneja X-Patchwork-Id: 9629707 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 3BC3A602D6 for ; Fri, 17 Mar 2017 03:40:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15DD7283BA for ; Fri, 17 Mar 2017 03:40:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06A0528679; Fri, 17 Mar 2017 03:40:02 +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 92473283BA for ; Fri, 17 Mar 2017 03:40:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76B908976D; Fri, 17 Mar 2017 03:39:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FD4D8976D for ; Fri, 17 Mar 2017 03:39:58 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C89A5607DF; Fri, 17 Mar 2017 03:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1489721998; bh=8g6l+7NUM8Xp8yEs1zBzJ1IQZkrSHjPZKDFlzyG55gI=; h=From:To:Cc:Subject:Date:From; b=K7iHSKWcJllsBYDB8GVuRzBpEqWi2OknQJz8KUKIcJiZYA+4rqwBQIT0Fp99Tjvme hOlwPumUaKXjHCknahR/2piKK7R+C9lyzgp4D/7bz3wWX8yhSo3BAqQ+38pbqvC1/A 8Nf9b84Nq2BplG/W/to24KJyIQGpCmtt/dNzTAO4= Received: from localhost (unknown [202.46.23.61]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: architt@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E3EFE60795; Fri, 17 Mar 2017 03:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1489721995; bh=8g6l+7NUM8Xp8yEs1zBzJ1IQZkrSHjPZKDFlzyG55gI=; h=From:To:Cc:Subject:Date:From; b=GC0Xg4WEvu17exLHG6J+Ju21VxzaOf7K020RtIYcNEkIVU+l5JbbNF1ugoSxCDwoB Op6wCllhX4tmvuwxVdi6Y/bnJxy05rJPXjTYPQfLdReNbwUme35AeBds2aDkhFlH+S Uht6C+vnxbtXkseDhZ6U4HlgBgieGRtlLb+kqhIY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E3EFE60795 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=architt@codeaurora.org From: Archit Taneja To: robdclark@gmail.com Subject: [PATCH] drm/msm/mdp5: Update SSPP_MAX value Date: Fri, 17 Mar 2017 09:09:48 +0530 Message-Id: <20170317033948.22790-1-architt@codeaurora.org> X-Mailer: git-send-email 2.11.0 Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 'SSPP_MAX + 1' is the max number of hwpipes that can be present on a MDP5 platform. Recently, 2 new cursor hwpipes were added, which caused overflows in arrays that used SSPP_MAX to represent the number of elements. Update the SSPP_MAX value to incorporate the extra hwpipes. Signed-off-by: Archit Taneja --- - This should be a fix for 4.11. drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h index 611da7a660c9..238901987e00 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h @@ -18,7 +18,8 @@ #ifndef __MDP5_PIPE_H__ #define __MDP5_PIPE_H__ -#define SSPP_MAX (SSPP_RGB3 + 1) /* TODO: Add SSPP_MAX in mdp5.xml.h */ +/* TODO: Add SSPP_MAX in mdp5.xml.h */ +#define SSPP_MAX (SSPP_CURSOR1 + 1) /* represents a hw pipe, which is dynamically assigned to a plane */ struct mdp5_hw_pipe {