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: 9629709 X-Patchwork-Delegate: agross@codeaurora.org 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 0A6A9602D6 for ; Fri, 17 Mar 2017 03:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC50D283BA for ; Fri, 17 Mar 2017 03:40:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E131628679; Fri, 17 Mar 2017 03:40:30 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 95C95283BA for ; Fri, 17 Mar 2017 03:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431AbdCQDka (ORCPT ); Thu, 16 Mar 2017 23:40:30 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:60474 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752284AbdCQDk2 (ORCPT ); Thu, 16 Mar 2017 23:40:28 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 61E18607C9; 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=1489721997; bh=8g6l+7NUM8Xp8yEs1zBzJ1IQZkrSHjPZKDFlzyG55gI=; h=From:To:Cc:Subject:Date:From; b=KSzTYiaEgd6Yver7SYNuS81eXEKmm3iBysTuMPjSwdquFy8JUe3WVo5gCFjtZt8QO AP3FydhnkSpj/dk8JYM2lYyix15bC5zr3Vdq3FLrp3Ny3UgYDndck+w9CPEVcAJRSS YnGYtGIAHIUuwxfbMdFVnXFFp8B8WGK0sXzPk/NA= 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 Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Archit Taneja 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 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 '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 {