From patchwork Thu Nov 22 01:52:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 10693385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5BF1514BD for ; Thu, 22 Nov 2018 01:56:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 471342BB18 for ; Thu, 22 Nov 2018 01:56:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B7462BBB3; Thu, 22 Nov 2018 01:56:18 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 D0E3A2BB18 for ; Thu, 22 Nov 2018 01:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389068AbeKVMdU (ORCPT ); Thu, 22 Nov 2018 07:33:20 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38018 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403982AbeKVMdH (ORCPT ); Thu, 22 Nov 2018 07:33:07 -0500 Received: by mail-qt1-f194.google.com with SMTP id p17so5981065qtl.5 for ; Wed, 21 Nov 2018 17:56:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iDpxwhz52J7768fW56aWS5n/NR5UxFIVBUXbmrpXRCo=; b=CPB8irCD/L/4GU25BfCCWv2hD3ALig10lLDH5MYh8eEtOPdtbJnoDd+UBBrbAX3f0x 22iTUohGOAzAlpr5vWp6v98aY7cXV2VG1BJosB4A6nOU3Bwr5BAMExpqCf5kKQ4b2gxN PIs6FMXCXnJi0zlAv9evxi7iiU9NrI0kGCaLDO1LDhAq/AAEx057ZKpO+uowS/jUkyiH osQwpDYXicA+EwxlTc2atpP2/UKfWGV1Y6gefgz5+PXda1Y7HzXcfSLUPJDg6BS7r8ID +tgCRo92a6KosqAQ427VSEUaBA/s6we+hguodgv0aP56gcXoSq4JoAndIALSoSQmrhiX TJMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iDpxwhz52J7768fW56aWS5n/NR5UxFIVBUXbmrpXRCo=; b=Ou//ridqkW/iW/S+/CSyZ61BaPvykvT/AJ5wP1yMhS7j1jAoluZrsNRfYj6qC1ljoz FQFEKUIdBq4gN2G9tcU7tdQcoMC+SQDbZEqcSJHYCeG0Pl+ZGlJV2yVI2yd0zAIIGt7y cAnqK8oizo2tsJFpXy47ZpiJAFg9DBTvGt1V+vZf/+DzL/5mRtk0QIp5M/InKycSEMWn FRqALQEXrZzKzHmn/jRHn/XFi9eMs0WqFKgGycj8LTjM81lGkf82ClaSW4K9GftkUuy4 FTrAW8Ilbuw+ZwYqfQVdzIVSW4Bbofg1t9K7lNtQsJOWm3Up2zIHNxBj0ouH5UT/SMUj 4Tpg== X-Gm-Message-State: AA+aEWZijqk2s8BPf2Q8RgU3P2mL11laL8KklZV7jEJY4K644zwTlm/D Jwh6qaba9XQosim18UGY8+fwkg== X-Google-Smtp-Source: AFSGD/UMeFNofsnMRiV5NPUUyqSVV8LC3RrPRO2CtoaQ5PhqZ/Z2Rbrcb429SFHcowPtODwR7cToyw== X-Received: by 2002:a0c:e751:: with SMTP id g17mr8493692qvn.160.1542851763685; Wed, 21 Nov 2018 17:56:03 -0800 (PST) Received: from localhost.localdomain (modemcable014.247-57-74.mc.videotron.ca. [74.57.247.14]) by smtp.gmail.com with ESMTPSA id q15sm25297721qkl.81.2018.11.21.17.56.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 17:56:03 -0800 (PST) From: Jonathan Marek To: freedreno@lists.freedesktop.org Cc: Chris.Healy@zii.aero, festevam@gmail.com, Rob Clark , David Airlie , Sean Paul , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 8/9] drm/msm/mdp5: add config for msm8917 Date: Wed, 21 Nov 2018 20:52:34 -0500 Message-Id: <20181122015237.14534-8-jonathan@marek.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122015237.14534-1-jonathan@marek.ca> References: <20181122015237.14534-1-jonathan@marek.ca> 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 Add the mdp5_cfg_hw entry for MDP5 version v1.15 found on msm8917. Signed-off-by: Jonathan Marek --- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 86 ++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c index 824067d2d427..05ad159b6261 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c @@ -553,6 +553,91 @@ const struct mdp5_cfg_hw msm8x96_config = { .max_clk = 412500000, }; +const struct mdp5_cfg_hw msm8917_config = { + .name = "msm8917", + .mdp = { + .count = 1, + .caps = MDP_CAP_CDM, + }, + .ctl = { + .count = 3, + .base = { 0x01000, 0x01200, 0x01400 }, + .flush_hw_mask = 0xffffffff, + }, + .pipe_vig = { + .count = 1, + .base = { 0x04000 }, + .caps = MDP_PIPE_CAP_HFLIP | + MDP_PIPE_CAP_VFLIP | + MDP_PIPE_CAP_SCALE | + MDP_PIPE_CAP_CSC | + MDP_PIPE_CAP_DECIMATION | + MDP_PIPE_CAP_SW_PIX_EXT | + 0, + }, + .pipe_rgb = { + .count = 2, + .base = { 0x14000, 0x16000 }, + .caps = MDP_PIPE_CAP_HFLIP | + MDP_PIPE_CAP_VFLIP | + MDP_PIPE_CAP_DECIMATION | + MDP_PIPE_CAP_SW_PIX_EXT | + 0, + }, + .pipe_dma = { + .count = 1, + .base = { 0x24000 }, + .caps = MDP_PIPE_CAP_HFLIP | + MDP_PIPE_CAP_VFLIP | + MDP_PIPE_CAP_SW_PIX_EXT | + 0, + }, + .pipe_cursor = { + .count = 1, + .base = { 0x34000 }, + .caps = MDP_PIPE_CAP_HFLIP | + MDP_PIPE_CAP_VFLIP | + MDP_PIPE_CAP_SW_PIX_EXT | + MDP_PIPE_CAP_CURSOR | + 0, + }, + + .lm = { + .count = 2, + .base = { 0x44000, 0x45000 }, + .instances = { + { .id = 0, .pp = 0, .dspp = 0, + .caps = MDP_LM_CAP_DISPLAY, }, + { .id = 1, .pp = -1, .dspp = -1, + .caps = MDP_LM_CAP_WB }, + }, + .nb_stages = 8, + .max_width = 2048, + .max_height = 0xFFFF, + }, + .dspp = { + .count = 1, + .base = { 0x54000 }, + + }, + .pp = { + .count = 1, + .base = { 0x70000 }, + }, + .cdm = { + .count = 1, + .base = { 0x79200 }, + }, + .intf = { + .base = { 0x6a000, 0x6a800 }, + .connect = { + [0] = INTF_DISABLED, + [1] = INTF_DSI, + }, + }, + .max_clk = 320000000, +}; + static const struct mdp5_cfg_handler cfg_handlers[] = { { .revision = 0, .config = { .hw = &msm8x74v1_config } }, { .revision = 2, .config = { .hw = &msm8x74v2_config } }, @@ -560,6 +645,7 @@ static const struct mdp5_cfg_handler cfg_handlers[] = { { .revision = 6, .config = { .hw = &msm8x16_config } }, { .revision = 9, .config = { .hw = &msm8x94_config } }, { .revision = 7, .config = { .hw = &msm8x96_config } }, + { .revision = 15, .config = { .hw = &msm8917_config } }, }; static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev);