From patchwork Tue Sep 24 07:26:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lowry Li (Arm Technology China)" X-Patchwork-Id: 11158033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E71381747 for ; Tue, 24 Sep 2019 07:26:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBFF921655 for ; Tue, 24 Sep 2019 07:26:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBFF921655 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DECEB6E9B8; Tue, 24 Sep 2019 07:26:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F7C46E9B8 for ; Tue, 24 Sep 2019 07:26:33 +0000 (UTC) Received: from VI1PR0802CA0002.eurprd08.prod.outlook.com (2603:10a6:800:aa::12) by DB8PR08MB5146.eurprd08.prod.outlook.com (2603:10a6:10:e7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.26; Tue, 24 Sep 2019 07:26:29 +0000 Received: from DB5EUR03FT048.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::209) by VI1PR0802CA0002.outlook.office365.com (2603:10a6:800:aa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.25 via Frontend Transport; Tue, 24 Sep 2019 07:26:29 +0000 Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT048.mail.protection.outlook.com (10.152.21.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20 via Frontend Transport; Tue, 24 Sep 2019 07:26:27 +0000 Received: ("Tessian outbound 5061e1b5386c:v31"); Tue, 24 Sep 2019 07:26:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e48258766da11404 X-CR-MTA-TID: 64aa7808 Received: from 12b73542b0cc.2 (ip-172-16-0-2.eu-west-1.compute.internal [104.47.2.56]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 61407BBD-25A9-4578-952B-CA282CD94D24.1; Tue, 24 Sep 2019 07:26:15 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2056.outbound.protection.outlook.com [104.47.2.56]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 12b73542b0cc.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 24 Sep 2019 07:26:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+m0IoCG6aM3XJXJA5a9Af4nwBeaXAhngPUH/Q06zvjFrt4/juMc5hL2IhKfHV9Toi4eRqLviYUArqgEtV2hxB7nf72GZ/LLu11x3Km4F97QKcV88k2yEkz1AOtcvn2Jbelu9rA0t5m/6j+H0AqkygT8IL8zw+CUXKit9BOoAAPq2LbOf5DZGAY+TQeMtCoajdU0lyFmHLZmX3mXKaEACruvAKnJ2Ti6nRDNAVChwkz1zOVwpCBtzjb3x3a6w5U5VXIsW2olf9IOCAnyRJJVT2XbR1nomvz/Vk7PylhzTNE7lznUbqv0J0R7kCXzjCLuc568iNCYI77MatWA3dPURg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZsp5b9CREF6o15QmOw7iKDF5xz9u0ShN5TG4mS9xYQ=; b=XCWHe15irX8oozp8HgZKEr9u3bjNhX09CpxwutvUSkPhuKO9kalliV8BK9C5YLfu93LQzRIDrUZA2slrnzjt/BBdGWtOia6r0WS/HeG168qyLKD/WrB7/W63Igl3RAfJh0PxcZH8JddA0Iw9XJbwuQKR6j2QXQf+W13AZxzvniFaohTYNx8DHoAm9DkPwsltO83/DsRnD4aQajPSlGQ72Dkye31nYcIBgiiQhudZRNohtBXVUEWRqq2jBc/XI7CUYVqXAYEmY/gjzJDSXGv7fzNm7wriDtSA5z6ZXnSLc0AtdgmSrxqQfnv3fsvKF0aMSvwNihwlxyfprhAA6nx66A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from VI1PR08MB5488.eurprd08.prod.outlook.com (52.133.246.150) by VI1PR08MB3998.eurprd08.prod.outlook.com (20.178.126.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20; Tue, 24 Sep 2019 07:26:13 +0000 Received: from VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::d09e:254b:4d3b:456b]) by VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::d09e:254b:4d3b:456b%3]) with mapi id 15.20.2284.023; Tue, 24 Sep 2019 07:26:13 +0000 From: "Lowry Li (Arm Technology China)" To: Liviu Dudau , "james qian wang (Arm Technology China)" , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , Brian Starkey , Mihail Atanassov Subject: [PATCH v2 1/2] drm/komeda: Add line size support Thread-Topic: [PATCH v2 1/2] drm/komeda: Add line size support Thread-Index: AQHVcqlYDphWl6Q560C4rpnwGAgy5A== Date: Tue, 24 Sep 2019 07:26:13 +0000 Message-ID: <20190924072552.32446-2-lowry.li@arm.com> References: <20190924072552.32446-1-lowry.li@arm.com> In-Reply-To: <20190924072552.32446-1-lowry.li@arm.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [113.29.88.7] x-clientproxiedby: HK2P15301CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::16) To VI1PR08MB5488.eurprd08.prod.outlook.com (2603:10a6:803:137::22) Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Lowry.Li@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 191fa6a6-7643-46c7-a27d-08d740c0834f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam-Untrusted: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR08MB3998; X-MS-TrafficTypeDiagnostic: VI1PR08MB3998:|VI1PR08MB3998:|DB8PR08MB5146: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:7691;OLM:7691; x-forefront-prvs: 0170DAF08C X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(366004)(39860400002)(396003)(376002)(136003)(346002)(199004)(189003)(50226002)(102836004)(478600001)(55236004)(66556008)(316002)(4326008)(66946007)(2501003)(25786009)(476003)(11346002)(186003)(66066001)(2616005)(52116002)(26005)(6506007)(386003)(54906003)(99286004)(446003)(76176011)(5660300002)(6116002)(66446008)(3846002)(8936002)(486006)(1076003)(86362001)(8676002)(110136005)(66476007)(64756008)(81156014)(6486002)(36756003)(6636002)(71200400001)(71190400001)(14454004)(2906002)(6512007)(81166006)(2201001)(7736002)(6436002)(305945005)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB3998; H:VI1PR08MB5488.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info-Original: +rso/FxiU4b0tJ+AttQQUsaIuIeTtZ8CmPg+O2thu+FJqH9ULjRoIwK5I43j4cpQ7KIxsuCpk/8kpXWQnVKNQt4/PnrvxuUF2G2nWobmAUWYoNEYCjTTIwP5s+Eeed16MeJbmZuvD1mVJYjSHqODMWGcXpI7NvOLPUIKGy7afuXfCwqfG6vnMr++Zhqt3DoOHcmH65mQ9JQygAfZpauk2EUzTFKqrxd/aeTiOc+lNhY1mgWsNbZEZqpE2N7V8lOufDcbBnN7qhgPLuPSoZ1fpvo6kvLKFBs0WyZF4OgiaGrhaCePGbxnIU0rQHFYq80H7IFiRRzJ8Brp2nF6cLc90HNNkIW1663Ocl8c2iEim6p6FE63eixsAEPc8wJ8aTH5eg/iMuFxmxkrMWOFeSMKgoUpJfqVM4qtt8jXyYGuf28= MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3998 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Lowry.Li@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT048.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)(39860400002)(396003)(376002)(136003)(346002)(199004)(189003)(47776003)(8746002)(1076003)(81156014)(8676002)(76176011)(7736002)(26826003)(26005)(6506007)(386003)(81166006)(66066001)(6512007)(6636002)(356004)(102836004)(305945005)(22756006)(336012)(23756003)(11346002)(63350400001)(6486002)(186003)(4326008)(446003)(486006)(126002)(476003)(2616005)(6116002)(50466002)(2501003)(76130400001)(2201001)(50226002)(110136005)(99286004)(478600001)(70206006)(25786009)(5660300002)(70586007)(54906003)(2906002)(8936002)(86362001)(36756003)(14454004)(316002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB8PR08MB5146; H:64aa7808-outbound-1.mta.getcheckrecipient.com; FPR:; SPF:TempError; LANG:en; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; A:1; MX:1; X-MS-Office365-Filtering-Correlation-Id-Prvs: 01974bbc-ba72-4081-9387-08d740c07a81 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(710020)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB8PR08MB5146; NoDisclaimer: True X-Forefront-PRVS: 0170DAF08C X-Microsoft-Antispam-Message-Info: HLYiIuEZ0jD3nkn7o2EXz7CiehPSPPxDXGzuFTAaP93Jt7DBScPf3fbC+EtK/SC+KwLIAPbmK+q0/RtiODSbxrRMH0J6XYHJyB1U20S86GeRSDsYi/bIBEN8Ni5pxXBSyR58SfDbQVX8E1Bunif5sVkIBT96jMIrajGWt+AOPVgU+lJTs7VOBsY5BbwWP11YWcH6W6iixs2pBnFu6C6xUCR6tl9cZD6ojAHh/S6oWosJ3Wln3zcT0069svL02dRIK3TPeN7ItayJZspEH7bioy1tRe/e+1Z2bCIXnrJ7AEr6yzWsK5F4/APjfxycNmwGQH49sijJA83U+hma+DNLwdfAanRJEQCVvbDKFMMqJCWLzu7nR1Y3U2eVYxPHducIKRZWgQPOb5/CplcSMlt0jfXzGZxcyWZ09yZDPKWO7Zk= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2019 07:26:27.6496 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 191fa6a6-7643-46c7-a27d-08d740c0834f 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: DB8PR08MB5146 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZsp5b9CREF6o15QmOw7iKDF5xz9u0ShN5TG4mS9xYQ=; b=FgmWlPlsjZjAkUp4vR0jFGLtraIiSJQ8Ox8jDce/P1sE3yXXaBoViWlDaVveO72Cg1i/TnJ0B++C8HUd0LcTScpGaRNBDHYT9WaiS+cZ84invRv4YHA/EKGvjJc3egJ9D3dR1x+Zw+Ayb+mtVJexB7Bm8v1IZPxvdBWDF2lAsrM= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZsp5b9CREF6o15QmOw7iKDF5xz9u0ShN5TG4mS9xYQ=; b=FgmWlPlsjZjAkUp4vR0jFGLtraIiSJQ8Ox8jDce/P1sE3yXXaBoViWlDaVveO72Cg1i/TnJ0B++C8HUd0LcTScpGaRNBDHYT9WaiS+cZ84invRv4YHA/EKGvjJc3egJ9D3dR1x+Zw+Ayb+mtVJexB7Bm8v1IZPxvdBWDF2lAsrM= X-Mailman-Original-Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.freedesktop.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.freedesktop.org; dmarc=none action=none header.from=arm.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ayan Halder , "Jonathan Chai \(Arm Technology China\)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin \(Arm Technology China\)" , nd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: "Lowry Li (Arm Technology China)" On D71, we are using the global line size. From D32, every component have a line size register to indicate the fifo size. So this patch is to set line size support and do the line size check. Signed-off-by: Lowry Li (Arm Technology China) --- .../arm/display/komeda/d71/d71_component.c | 57 ++++++++++++++++--- .../gpu/drm/arm/display/komeda/d71/d71_regs.h | 9 +-- .../drm/arm/display/komeda/komeda_pipeline.h | 2 + .../display/komeda/komeda_pipeline_state.c | 17 ++++++ 4 files changed, 70 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c index 7b374a3b911e..357837b9d6ed 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -106,6 +106,23 @@ static void dump_block_header(struct seq_file *sf, void __iomem *reg) i, hdr.output_ids[i]); } +/* On D71, we are using the global line size. From D32, every component have + * a line size register to indicate the fifo size. + */ +static u32 __get_blk_line_size(struct d71_dev *d71, u32 __iomem *reg, + u32 max_default) +{ + if (!d71->periph_addr) + max_default = malidp_read32(reg, BLK_MAX_LINE_SIZE); + + return max_default; +} + +static u32 get_blk_line_size(struct d71_dev *d71, u32 __iomem *reg) +{ + return __get_blk_line_size(d71, reg, d71->max_line_size); +} + static u32 to_rot_ctrl(u32 rot) { u32 lr_ctrl = 0; @@ -365,7 +382,28 @@ static int d71_layer_init(struct d71_dev *d71, else layer->layer_type = KOMEDA_FMT_SIMPLE_LAYER; - set_range(&layer->hsize_in, 4, d71->max_line_size); + if (!d71->periph_addr) { + /* D32 or newer product */ + layer->line_sz = malidp_read32(reg, BLK_MAX_LINE_SIZE); + layer->yuv_line_sz = L_INFO_YUV_MAX_LINESZ(layer_info); + } else if (d71->max_line_size > 2048) { + /* D71 4K */ + layer->line_sz = d71->max_line_size; + layer->yuv_line_sz = layer->line_sz / 2; + } else { + /* D71 2K */ + if (layer->layer_type == KOMEDA_FMT_RICH_LAYER) { + /* rich layer is 4K configuration */ + layer->line_sz = d71->max_line_size * 2; + layer->yuv_line_sz = layer->line_sz / 2; + } else { + layer->line_sz = d71->max_line_size; + layer->yuv_line_sz = 0; + } + } + + set_range(&layer->hsize_in, 4, layer->line_sz); + set_range(&layer->vsize_in, 4, d71->max_vsize); malidp_write32(reg, LAYER_PALPHA, D71_PALPHA_DEF_MAP); @@ -456,9 +494,11 @@ static int d71_wb_layer_init(struct d71_dev *d71, wb_layer = to_layer(c); wb_layer->layer_type = KOMEDA_FMT_WB_LAYER; + wb_layer->line_sz = get_blk_line_size(d71, reg); + wb_layer->yuv_line_sz = wb_layer->line_sz; - set_range(&wb_layer->hsize_in, D71_MIN_LINE_SIZE, d71->max_line_size); - set_range(&wb_layer->vsize_in, D71_MIN_VERTICAL_SIZE, d71->max_vsize); + set_range(&wb_layer->hsize_in, 64, wb_layer->line_sz); + set_range(&wb_layer->vsize_in, 64, d71->max_vsize); return 0; } @@ -595,8 +635,8 @@ static int d71_compiz_init(struct d71_dev *d71, compiz = to_compiz(c); - set_range(&compiz->hsize, D71_MIN_LINE_SIZE, d71->max_line_size); - set_range(&compiz->vsize, D71_MIN_VERTICAL_SIZE, d71->max_vsize); + set_range(&compiz->hsize, 64, get_blk_line_size(d71, reg)); + set_range(&compiz->vsize, 64, d71->max_vsize); return 0; } @@ -753,7 +793,7 @@ static int d71_scaler_init(struct d71_dev *d71, } scaler = to_scaler(c); - set_range(&scaler->hsize, 4, 2048); + set_range(&scaler->hsize, 4, __get_blk_line_size(d71, reg, 2048)); set_range(&scaler->vsize, 4, 4096); scaler->max_downscaling = 6; scaler->max_upscaling = 64; @@ -862,7 +902,7 @@ static int d71_splitter_init(struct d71_dev *d71, splitter = to_splitter(c); - set_range(&splitter->hsize, 4, d71->max_line_size); + set_range(&splitter->hsize, 4, get_blk_line_size(d71, reg)); set_range(&splitter->vsize, 4, d71->max_vsize); return 0; @@ -933,7 +973,8 @@ static int d71_merger_init(struct d71_dev *d71, merger = to_merger(c); - set_range(&merger->hsize_merged, 4, 4032); + set_range(&merger->hsize_merged, 4, + __get_blk_line_size(d71, reg, 4032)); set_range(&merger->vsize_merged, 4, 4096); return 0; diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h b/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h index 2d5e6d00b42c..1727dc993909 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h @@ -10,6 +10,7 @@ /* Common block registers offset */ #define BLK_BLOCK_INFO 0x000 #define BLK_PIPELINE_INFO 0x004 +#define BLK_MAX_LINE_SIZE 0x008 #define BLK_VALID_INPUT_ID0 0x020 #define BLK_OUTPUT_ID0 0x060 #define BLK_INPUT_ID0 0x080 @@ -321,6 +322,7 @@ #define L_INFO_RF BIT(0) #define L_INFO_CM BIT(1) #define L_INFO_ABUF_SIZE(x) (((x) >> 4) & 0x7) +#define L_INFO_YUV_MAX_LINESZ(x) (((x) >> 16) & 0xFFFF) /* Scaler registers */ #define SC_COEFFTAB 0x0DC @@ -494,13 +496,6 @@ enum d71_blk_type { #define D71_DEFAULT_PREPRETCH_LINE 5 #define D71_BUS_WIDTH_16_BYTES 16 -#define D71_MIN_LINE_SIZE 64 -#define D71_MIN_VERTICAL_SIZE 64 -#define D71_SC_MIN_LIN_SIZE 4 -#define D71_SC_MIN_VERTICAL_SIZE 4 -#define D71_SC_MAX_LIN_SIZE 2048 -#define D71_SC_MAX_VERTICAL_SIZE 4096 - #define D71_SC_MAX_UPSCALING 64 #define D71_SC_MAX_DOWNSCALING 6 #define D71_SC_SPLIT_OVERLAP 8 diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h index 910d279ae48d..92aba58ce2a5 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h @@ -227,6 +227,8 @@ struct komeda_layer { /* accepted h/v input range before rotation */ struct malidp_range hsize_in, vsize_in; u32 layer_type; /* RICH, SIMPLE or WB */ + u32 line_sz; + u32 yuv_line_sz; /* maximum line size for YUV422 and YUV420 */ u32 supported_rots; /* komeda supports layer split which splits a whole image to two parts * left and right and handle them by two individual layer processors diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c index 5526731f5a33..6df442666cfe 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c @@ -285,6 +285,7 @@ komeda_layer_check_cfg(struct komeda_layer *layer, struct komeda_data_flow_cfg *dflow) { u32 src_x, src_y, src_w, src_h; + u32 line_sz, max_line_sz; if (!komeda_fb_is_layer_supported(kfb, layer->layer_type, dflow->rot)) return -EINVAL; @@ -314,6 +315,22 @@ komeda_layer_check_cfg(struct komeda_layer *layer, return -EINVAL; } + if (drm_rotation_90_or_270(dflow->rot)) + line_sz = dflow->in_h; + else + line_sz = dflow->in_w; + + if (kfb->base.format->hsub > 1) + max_line_sz = layer->yuv_line_sz; + else + max_line_sz = layer->line_sz; + + if (line_sz > max_line_sz) { + DRM_DEBUG_ATOMIC("Required line_sz: %d exceeds the max size %d\n", + line_sz, max_line_sz); + return -EINVAL; + } + return 0; } From patchwork Tue Sep 24 07:26:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lowry Li (Arm Technology China)" X-Patchwork-Id: 11158035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1AB2B17EE for ; Tue, 24 Sep 2019 07:26:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F16C4214AF for ; Tue, 24 Sep 2019 07:26:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F16C4214AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E6606E9D8; Tue, 24 Sep 2019 07:26:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150070.outbound.protection.outlook.com [40.107.15.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A6986E9D8 for ; Tue, 24 Sep 2019 07:26:37 +0000 (UTC) Received: from VI1PR08CA0139.eurprd08.prod.outlook.com (2603:10a6:800:d5::17) by VI1PR0801MB1872.eurprd08.prod.outlook.com (2603:10a6:800:86::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.23; Tue, 24 Sep 2019 07:26:33 +0000 Received: from VE1EUR03FT005.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::200) by VI1PR08CA0139.outlook.office365.com (2603:10a6:800:d5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.22 via Frontend Transport; Tue, 24 Sep 2019 07:26:32 +0000 Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT005.mail.protection.outlook.com (10.152.18.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20 via Frontend Transport; Tue, 24 Sep 2019 07:26:31 +0000 Received: ("Tessian outbound d5a1f2820a4f:v31"); Tue, 24 Sep 2019 07:26:25 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d15885c2100208e0 X-CR-MTA-TID: 64aa7808 Received: from 331ba10d9251.2 (cr-mta-lb-1.cr-mta-net [104.47.14.52]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 698C6375-B7EC-4F03-AC6E-5818656E38EC.1; Tue, 24 Sep 2019 07:26:20 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2052.outbound.protection.outlook.com [104.47.14.52]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 331ba10d9251.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 24 Sep 2019 07:26:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QUNSEf4Q1rbsgt3S9Xs/8/sqzuWBVnPXyAftuaKZW7QS/lUwxTh8qcQJh71kmWaaUOHV3YOP24GM1OL91uPlUENCU2xQ4TdZjd8xW5zsatriJWULnJygAJ3M+hNjKE+LgVrZpR6PzinSR3QqZOFzIHXkEbv2q1b90n7PtLqE+xx/tgn3ubtx1yBlhvd5Vp6scjOJLPROcvaLyiUSU8wo3xQ1zoBYqHcgfG62HeAi2kgRMbpLNnA8X3DYwjdeiHcjPtrXHXNSA7VWbCObbyF67JFVURwLIb2bGBiZPHgkyAuZ7wK1lUsFWoW1HxdMCVzTObDVqkxw3HnAUvpxoc0AqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=432SZBl+XgNRowFEJpvuppz3A/j8ZcamL456V3bwWEE=; b=V09qKZzUAnyeWTCv/kjNRZEO1qgC7fesC1+Da000+2YTcPCyLEX+VrlBOk2Bax3cOrKk+lib7Ibf+4/GAreZLTnbTcEgWshc6DKAA9RV4RSWjLWjDGp0vic1Ag1q2dmXyH3KdvgJyrPwQ92/pK5c1r4fD1bVirnpxszbvEtQUSCpIJ6CqHVzmQiiw1fJoGTKQ8zoAomSeOCZOz81PHqTHRn6+v1dzoBVTGGYY/a39eDRNdTORSlbShkuQjRuok4QrK7R88o9EMWniaHsxXCL7S3NVyblWvLqhtQTs3MxmBKRyy/JgeCUe44Ecv9cudxbM7ZYjmt0knu82gjjXFRBqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from VI1PR08MB5488.eurprd08.prod.outlook.com (52.133.246.150) by VI1PR08MB3199.eurprd08.prod.outlook.com (52.133.15.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20; Tue, 24 Sep 2019 07:26:18 +0000 Received: from VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::d09e:254b:4d3b:456b]) by VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::d09e:254b:4d3b:456b%3]) with mapi id 15.20.2284.023; Tue, 24 Sep 2019 07:26:18 +0000 From: "Lowry Li (Arm Technology China)" To: Liviu Dudau , "james qian wang (Arm Technology China)" , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , Brian Starkey , Mihail Atanassov Subject: [PATCH v2 2/2] drm/komeda: Adds layer horizontal input size limitation check for D71 Thread-Topic: [PATCH v2 2/2] drm/komeda: Adds layer horizontal input size limitation check for D71 Thread-Index: AQHVcqlbZ+q1ta0ytEW/DVb0H7fVog== Date: Tue, 24 Sep 2019 07:26:18 +0000 Message-ID: <20190924072552.32446-3-lowry.li@arm.com> References: <20190924072552.32446-1-lowry.li@arm.com> In-Reply-To: <20190924072552.32446-1-lowry.li@arm.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [113.29.88.7] x-clientproxiedby: HK2P15301CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::16) To VI1PR08MB5488.eurprd08.prod.outlook.com (2603:10a6:803:137::22) Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Lowry.Li@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 17139cc3-7052-400b-953f-08d740c0855a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam-Untrusted: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR08MB3199; X-MS-TrafficTypeDiagnostic: VI1PR08MB3199:|VI1PR08MB3199:|VI1PR0801MB1872: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:4941;OLM:4941; x-forefront-prvs: 0170DAF08C X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(376002)(366004)(346002)(39860400002)(136003)(396003)(199004)(189003)(6116002)(71200400001)(50226002)(6512007)(3846002)(6506007)(4326008)(66476007)(476003)(14454004)(66946007)(386003)(52116002)(66556008)(486006)(2616005)(6636002)(6436002)(14444005)(36756003)(2501003)(99286004)(110136005)(64756008)(2906002)(446003)(256004)(66066001)(54906003)(71190400001)(76176011)(81156014)(6486002)(8676002)(478600001)(55236004)(66446008)(5660300002)(81166006)(102836004)(11346002)(86362001)(2201001)(1076003)(8936002)(26005)(186003)(7736002)(316002)(305945005)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB3199; H:VI1PR08MB5488.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info-Original: e387BRipFUQslMY7fImmJpYXFX30B+6G6iRyQFJ4KVcj6HRUnt3YHEfFnqRQwnwwCAeCx7pQYfAtsGTsfP7fJWp4DmyI8RHOje2RqD8pPxFGw0y1RHu8IQ21/ncLi0Rc4MtmXdJhJZ8QvZqJaSbfNb5A1DxMRlax/X4bgDi3jwQGGFLMLn4mfhQvKv1i8gg1EyZ29YL4291gWnrNO9XyHYjIhuMJiCLCXJ15hhc9eDaLgKj8URcDKFF00e0YeiJeC/zrmkanrNcG7o+B7C587d1slY0tO3C25rv38AI6D5AOOtDlz5B6YGRP/nJRRy2Se2/DlwYFUTQhWmR/X4PBTTfcv9wFjCRo6NY5kYl4pIHBM3NcxN0pdai/KaNOzqdwHm34B7OhWv04mUDeuOGlf3YAVnLMnpqSki0b8K+m4MM= MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3199 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Lowry.Li@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT005.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)(396003)(376002)(136003)(39860400002)(346002)(189003)(199004)(2906002)(99286004)(22756006)(8676002)(81166006)(6486002)(81156014)(50226002)(6636002)(70206006)(66066001)(47776003)(76130400001)(26826003)(4326008)(7736002)(6506007)(14444005)(50466002)(386003)(2501003)(23756003)(478600001)(76176011)(36756003)(6512007)(63350400001)(11346002)(2616005)(486006)(476003)(86362001)(446003)(126002)(336012)(305945005)(70586007)(8746002)(2201001)(102836004)(25786009)(1076003)(356004)(186003)(26005)(6116002)(36906005)(316002)(3846002)(5660300002)(110136005)(14454004)(54906003)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0801MB1872; H:64aa7808-outbound-1.mta.getcheckrecipient.com; FPR:; SPF:TempError; 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: 3f63e72f-865e-41b2-9866-08d740c07d9f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600167)(710020)(711020)(4605104)(1401327)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VI1PR0801MB1872; NoDisclaimer: True X-Forefront-PRVS: 0170DAF08C X-Microsoft-Antispam-Message-Info: 5wgp5rnNUfkiNQ/GlDnTjvHkHhk90WAUm+7nQPkcGRauzrqbfbkX/X6beBX5Jn/Q+7E6m8C0/jhsuxThCzXWfCdnSbFlek/qqSsJDVkWfpkAThc6fyhUpx3fDSeTwN+yV1FuNQUC2qGH+VKQtnMmgYwm2M3/JJVoX9umUu9FK0SotxdEzEKdDdpScQIsoh4rYjUrO8JN/LiWhu3t6bPnjUd5dTs7sutWhdpRuIEB1QybzBpe4VZ+Nv7Nk7QsQxw0IG1cTdfql0YzhJ6H0nFy39WU6SJ1n108lm0VBYN8MiY0lrnuAhPMfFoFoJ5LxxSVHpfMEuLb5+3XJHvCBviN55iZUIB19qvuVkqUOILQq1Mgc8I+RcE63tZVrVE07qtdaRFmtZd84PJT6K2eU3HEdOl+HE+Uw1pIxJTmxuNakNk= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2019 07:26:31.0368 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17139cc3-7052-400b-953f-08d740c0855a 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: VI1PR0801MB1872 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=432SZBl+XgNRowFEJpvuppz3A/j8ZcamL456V3bwWEE=; b=ruVOeaNBE9lw8p2yR80eFIoLEAdWQgCdp70cR5PE6xaUco/pjC5NNla6DO8/hpIKol27tVY9S/Cb0JaLQ4v09TrjiuFpHVhJ4lgqTBFDpyOxErcwzj/M9ckU/KTmHRQLATzJ5AMvz9j545tBUTcVxulx4g6GZVecnDqA+FRK1eo= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=432SZBl+XgNRowFEJpvuppz3A/j8ZcamL456V3bwWEE=; b=ruVOeaNBE9lw8p2yR80eFIoLEAdWQgCdp70cR5PE6xaUco/pjC5NNla6DO8/hpIKol27tVY9S/Cb0JaLQ4v09TrjiuFpHVhJ4lgqTBFDpyOxErcwzj/M9ckU/KTmHRQLATzJ5AMvz9j545tBUTcVxulx4g6GZVecnDqA+FRK1eo= X-Mailman-Original-Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.freedesktop.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.freedesktop.org; dmarc=none action=none header.from=arm.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ayan Halder , "Jonathan Chai \(Arm Technology China\)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin \(Arm Technology China\)" , nd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: "Lowry Li (Arm Technology China)" Adds maximum line size check according to the AFBC decoder limitation and special Line size limitation(2046) for format: YUV420_10BIT and X0L2. Signed-off-by: Lowry Li (Arm Technology China) --- .../arm/display/komeda/d71/d71_component.c | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c index 357837b9d6ed..6740b8422f11 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -349,7 +349,56 @@ static void d71_layer_dump(struct komeda_component *c, struct seq_file *sf) seq_printf(sf, "%sAD_V_CROP:\t\t0x%X\n", prefix, v[2]); } +static int d71_layer_validate(struct komeda_component *c, + struct komeda_component_state *state) +{ + struct komeda_layer_state *st = to_layer_st(state); + struct komeda_layer *layer = to_layer(c); + struct drm_plane_state *plane_st; + struct drm_framebuffer *fb; + u32 fourcc, line_sz, max_line_sz; + + plane_st = drm_atomic_get_new_plane_state(state->obj.state, + state->plane); + fb = plane_st->fb; + fourcc = fb->format->format; + + if (drm_rotation_90_or_270(st->rot)) + line_sz = st->vsize - st->afbc_crop_t - st->afbc_crop_b; + else + line_sz = st->hsize - st->afbc_crop_l - st->afbc_crop_r; + + if (fb->modifier) { + if ((fb->modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) == + AFBC_FORMAT_MOD_BLOCK_SIZE_32x8) + max_line_sz = layer->line_sz; + else + max_line_sz = layer->line_sz / 2; + + if (line_sz > max_line_sz) { + DRM_DEBUG_ATOMIC("afbc request line_sz: %d exceed the max afbc line_sz: %d.\n", + line_sz, max_line_sz); + return -EINVAL; + } + } + + if (fourcc == DRM_FORMAT_YUV420_10BIT && line_sz > 2046 && (st->afbc_crop_l % 4)) { + DRM_DEBUG_ATOMIC("YUV420_10BIT input_hsize: %d exceed the max size 2046.\n", + line_sz); + return -EINVAL; + } + + if (fourcc == DRM_FORMAT_X0L2 && line_sz > 2046 && (st->addr[0] % 16)) { + DRM_DEBUG_ATOMIC("X0L2 input_hsize: %d exceed the max size 2046.\n", + line_sz); + return -EINVAL; + } + + return 0; +} + static const struct komeda_component_funcs d71_layer_funcs = { + .validate = d71_layer_validate, .update = d71_layer_update, .disable = d71_layer_disable, .dump_register = d71_layer_dump,