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=-11.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2DBC4CA9EAF for ; Mon, 21 Oct 2019 14:41:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7BFD2053B for ; Mon, 21 Oct 2019 14:41:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="58McUph2"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="58McUph2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728033AbfJUOlr (ORCPT ); Mon, 21 Oct 2019 10:41:47 -0400 Received: from mail-eopbgr10062.outbound.protection.outlook.com ([40.107.1.62]:47758 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726289AbfJUOlr (ORCPT ); Mon, 21 Oct 2019 10:41:47 -0400 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=58McUph24A87dDKykTnXM6IaEEQ1ntcjHGfqJEqAriaak0e8vJo0asjJQPafbkqQkdpun0vYeFCtWKSVGgVUbvpEXk9C3NpsGOSyt07XgYZOMbLLAHwzodHxcNXs7yOUvXl4l8lpobblpoAxsvLBvPSqvVIJRh8ft5rnuGiN/Ag= Received: from HE1PR0802CA0009.eurprd08.prod.outlook.com (2603:10a6:3:bd::19) by AM0PR08MB3841.eurprd08.prod.outlook.com (2603:10a6:208:106::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2367.21; Mon, 21 Oct 2019 14:41:38 +0000 Received: from VE1EUR03FT057.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::207) by HE1PR0802CA0009.outlook.office365.com (2603:10a6:3:bd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2367.20 via Frontend Transport; Mon, 21 Oct 2019 14:41:38 +0000 Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; vger.kernel.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;vger.kernel.org; dmarc=none action=none header.from=arm.com; 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 VE1EUR03FT057.mail.protection.outlook.com (10.152.19.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2305.15 via Frontend Transport; Mon, 21 Oct 2019 14:41:37 +0000 Received: ("Tessian outbound 3fba803f6da3:v33"); Mon, 21 Oct 2019 14:41:29 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ed60c1a4c456ea63 X-CR-MTA-TID: 64aa7808 Received: from 7d88b54680f3.2 (ip-172-16-0-2.eu-west-1.compute.internal [104.47.12.55]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 5894CF18-030A-4947-98C8-0E8D3553D4E5.1; Mon, 21 Oct 2019 14:41:24 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2055.outbound.protection.outlook.com [104.47.12.55]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7d88b54680f3.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 21 Oct 2019 14:41:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AgnvxHwKnjI/ziU5ACjgaOzsx9PQclPPMJA8YzYlyt/ciDS4BBMSqUCRvoZXeGcb33lxP2DIzKqRfmnH7zEaRzEZ80SkYNIDiSHwcTyh4Hgc0W2DdsB/9DSic8xTTgm9wgrtZWoOFwFhN1twu+7NKYYXuCQ7U7T/p4GR6ke1/iYiJJx/iHpBzbm66qCfb6s6LGw00H/AcHp0TLnNZIrm7oz6TmZuafmhkn0UAApu10LbE76ucFl669DsjfGDk93Y7DLoVR+5uxBV/+PeejysZ/2H5EJDmGHf4NM4Z8Ju8yDWDgaHZM6AfkCRRt0QTes+ZEt+8ioryvAyTWaTz264ZA== 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=TLJRHdF9q6qJw1NtpkxrGLUvoEc5KRPwoJ5q8JSx9GyVXOhQQTfJvmQOkLgbIrb2GSslveIBg5bWSoSfFdwdacCr++rQXXptKLEbHS/wM0UaWwTvZbqa0hCh/xVXb9grHx1g21IJDlzQRKSW67uo8pIEig07tO+RlPuARu0KNSPWrhF8xV0kegC7v+wH47+QLospx9iTCpJpRt+Tbnnx10ikkHpBd1MHngN6etKWVrLzAu4nd96V2JojIqk8jBIzihTQbKrDFjTCwWFoxjjhrsoreHq8tzu9P4RH8rMUb9N0YCrUNHGg9vvwyguztFGUmbZ0rcKcVKFL42tFG6pspw== 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 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=58McUph24A87dDKykTnXM6IaEEQ1ntcjHGfqJEqAriaak0e8vJo0asjJQPafbkqQkdpun0vYeFCtWKSVGgVUbvpEXk9C3NpsGOSyt07XgYZOMbLLAHwzodHxcNXs7yOUvXl4l8lpobblpoAxsvLBvPSqvVIJRh8ft5rnuGiN/Ag= Received: from VI1PR08MB4078.eurprd08.prod.outlook.com (20.178.127.92) by VI1PR08MB3200.eurprd08.prod.outlook.com (52.133.15.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2367.20; Mon, 21 Oct 2019 14:41:22 +0000 Received: from VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::7d25:d1f2:e3eb:868b]) by VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::7d25:d1f2:e3eb:868b%6]) with mapi id 15.20.2367.022; Mon, 21 Oct 2019 14:41:22 +0000 From: Mihail Atanassov To: Ayan Halder CC: Andrzej Pietrasiewicz , "dri-devel@lists.freedesktop.org" , David Airlie , Liviu Dudau , "james qian wang (Arm Technology China)" , "linux-rockchip@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" , "kernel@collabora.com" , Sean Paul , "linux-kernel@vger.kernel.org" , nd Subject: Re: [PATCH 1/2] drm/arm: Factor out generic afbc helpers Thread-Topic: [PATCH 1/2] drm/arm: Factor out generic afbc helpers Thread-Index: AQHVgCWkbVOYIG7/eE2VirVnDYzB4adlLKIAgAAOSIA= Date: Mon, 21 Oct 2019 14:41:22 +0000 Message-ID: <2485717.1SzL54aMiy@e123338-lin> References: <20191011111813.20851-1-andrzej.p@collabora.com> <20191011111813.20851-2-andrzej.p@collabora.com> <20191021135013.GA16072@arm.com> In-Reply-To: <20191021135013.GA16072@arm.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [217.140.106.51] x-clientproxiedby: LO2P265CA0018.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::30) To VI1PR08MB4078.eurprd08.prod.outlook.com (2603:10a6:803:e5::28) Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: b2e359ff-8ee4-45ab-6310-08d75634c711 X-MS-Office365-Filtering-HT: Tenant X-MS-TrafficTypeDiagnostic: VI1PR08MB3200:|VI1PR08MB3200:|AM0PR08MB3841: X-MS-Exchange-PUrlCount: 3 x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:8882;OLM:8882; x-forefront-prvs: 0197AFBD92 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(7916004)(4636009)(376002)(136003)(366004)(396003)(39860400002)(346002)(199004)(189003)(51914003)(25786009)(14454004)(6116002)(76176011)(66066001)(8936002)(81156014)(8676002)(2906002)(6636002)(3846002)(6862004)(486006)(30864003)(33716001)(476003)(81166006)(86362001)(478600001)(11346002)(446003)(66476007)(66556008)(64756008)(66446008)(66946007)(966005)(52116002)(26005)(229853002)(99286004)(186003)(316002)(5660300002)(6246003)(7736002)(386003)(102836004)(6486002)(256004)(6512007)(54906003)(14444005)(9686003)(6436002)(4326008)(71190400001)(6506007)(6306002)(71200400001)(305945005)(39026011)(41533002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB3200;H:VI1PR08MB4078.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-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Gueo8KR3M2CV4rD/B422vaVZYxZ40UFnmU6X71Bs0+EdKkDrbOC6RSyWdJ7aJ3AIewa1fLv9vovLZQaB18B83nk5X6+7yzt46jDmTEVKNOjAHfVpjJ9GqwjqWD+vk6JdGhCqu0PjZXbprnjfyqgLPu6FHuKg9Kj/djazvGgzOxn8OUrxdcMLKAY3MslKgZS7MIt/ugnoMTB3ufC5j58/iX7jISxXpOCUpJoLw7CcrJ9EokUHoPvxYFWChDM3RmhwdDmY2rwaGZib4Av6diE2rvGokMWtvcY9b9Mf26D/XDIfIQe1wNBHmgR6se7sPG3oPhN1fHVqUM4oFiUZglug2a0/waBdWMc1IC2CVLd+Ck4VkI19nDxN8ZtgtOJTQxOO+Ek7vTTmuKIi7nEHhRmoCsELxeGPem4dBxtaMfm92vQb8fi2ywNLOieJ7agfs8htv11GNAtHB5p+N9v9lzdMlAPrzFxfp5tG5rOntUhtduo= Content-Type: text/plain; charset="iso-8859-1" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3200 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT057.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)(7916004)(4636009)(396003)(39860400002)(376002)(346002)(136003)(51914003)(189003)(199004)(26826003)(76176011)(305945005)(478600001)(99286004)(186003)(6506007)(26005)(3846002)(386003)(102836004)(6116002)(316002)(36906005)(54906003)(336012)(356004)(966005)(7736002)(5660300002)(2906002)(14454004)(6636002)(14444005)(86362001)(6246003)(30864003)(66066001)(6862004)(33716001)(486006)(476003)(126002)(81166006)(229853002)(81156014)(8936002)(8746002)(8676002)(25786009)(6486002)(9686003)(6512007)(22756006)(6306002)(4326008)(76130400001)(70586007)(47776003)(23756003)(70206006)(11346002)(446003)(63350400001)(50466002)(39026011)(41533002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR08MB3841;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: fef1fec5-de0d-4170-0869-08d75634be21 NoDisclaimer: True X-Forefront-PRVS: 0197AFBD92 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jLnw9/Bu3ViPh86l1ZisI8HEbWgHJ/mnLnTsU78pt6eqgQfuDCk9RVNnPmTf45SWp1pH673S5ZHKChP4fkk5SfrMHFaOpbMz/lBXI/A1OCxWoBdu8p6Iobr40mop8yulG3haEQLJPQqhA+xyWkm8xseToxC06kbb2sCL6PV5nsjAkLbj/w02mh4QYafq6iJg1ctNhGkZC4xE4p0bmrV3Wm5/PDGsFcVLQaT1SiFNSBRsysO/YYLtFoWfFfPMqxP3mDtxaj4euqzht1BCQ+v9pUC+j9gSdwkyvKlcpfEDSpZglwkDmr72TV7AmnIUfJqw3FPUCqbj49Rc5WihtULk7zhN32K1Ct4yCHMBU2VGFzirbVetI6g9C9DML84DANAnJbL/eKpzA2Ll/pP1r5+cSfYxmRiDkjn8ebr9P863xhiFtzMyhayskLzSkWfjEPCU6ko4grtZB0w+B7q6NbEqI8/T44M7X8geY7H2nWDTLJU= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2019 14:41:37.2836 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2e359ff-8ee4-45ab-6310-08d75634c711 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: AM0PR08MB3841 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrzej, On Monday, 21 October 2019 14:50:14 BST Ayan Halder wrote: > On Fri, Oct 11, 2019 at 01:18:10PM +0200, Andrzej Pietrasiewicz wrote: > > These are useful for other users of afbc, e.g. rockchip. > >=20 > > Signed-off-by: Andrzej Pietrasiewicz >=20 > Hi Andrzej, >=20 > Thanks a lot for doing this. Much appreciated. :) > It was on our TODO list for a long time. Seconded, thanks for the patch! >=20 > I have cc-ed james.qian.wang@arm.com, Mihail.Atanassov@arm.com for > their comments as well. >=20 > > --- > > drivers/gpu/drm/Kconfig | 4 ++ > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/arm/Kconfig | 1 + > > drivers/gpu/drm/arm/malidp_drv.c | 58 ++-------------- > > drivers/gpu/drm/drm_afbc.c | 114 +++++++++++++++++++++++++++++++ > > include/drm/drm_afbc.h | 25 +++++++ > > 6 files changed, 149 insertions(+), 54 deletions(-) > > create mode 100644 drivers/gpu/drm/drm_afbc.c > > create mode 100644 include/drm/drm_afbc.h > >=20 > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index 3c88420e3497..00e3f90557f4 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -195,6 +195,10 @@ config DRM_SCHED > > tristate > > depends on DRM > > =20 > > +config DRM_AFBC > > + tristate > > + depends on DRM > Adding a 'help' would be great here. Stealing the first line from > https://www.kernel.org/doc/html/latest/gpu/afbc.html >=20 > "AFBC is a proprietary lossless image compression protocol and format. > It provides fine-grained random access and minimizes the amount of > data transferred between IP blocks." >=20 > > + > > source "drivers/gpu/drm/i2c/Kconfig" > > =20 > > source "drivers/gpu/drm/arm/Kconfig" > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > > index 9f0d2ee35794..55368b668355 100644 > > --- a/drivers/gpu/drm/Makefile > > +++ b/drivers/gpu/drm/Makefile > > @@ -31,6 +31,7 @@ drm-$(CONFIG_OF) +=3D drm_of.o > > drm-$(CONFIG_AGP) +=3D drm_agpsupport.o > > drm-$(CONFIG_DEBUG_FS) +=3D drm_debugfs.o drm_debugfs_crc.o > > drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) +=3D drm_edid_load.o > > +drm-$(CONFIG_DRM_AFBC) +=3D drm_afbc.o > > =20 > > drm_vram_helper-y :=3D drm_gem_vram_helper.o \ > > drm_vram_helper_common.o \ > > diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig > > index a204103b3efb..25c3dc408cda 100644 > > --- a/drivers/gpu/drm/arm/Kconfig > > +++ b/drivers/gpu/drm/arm/Kconfig > > @@ -29,6 +29,7 @@ config DRM_MALI_DISPLAY > > select DRM_KMS_HELPER > > select DRM_KMS_CMA_HELPER > > select DRM_GEM_CMA_HELPER > > + select DRM_AFBC > > select VIDEOMODE_HELPERS > > help > > Choose this option if you want to compile the ARM Mali Display > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/mal= idp_drv.c > > index f25ec4382277..a67b69e08f63 100644 > > --- a/drivers/gpu/drm/arm/malidp_drv.c > > +++ b/drivers/gpu/drm/arm/malidp_drv.c This file is GPL-2.0-only. Shouldn't this be preserved when the substantive bit of the code in drm_afbc.c comes from here? > > @@ -16,6 +16,7 @@ > > #include > > =20 > > #include > > +#include > > #include > > #include > > #include > > @@ -33,8 +34,6 @@ > > #include "malidp_hw.h" > > =20 > > #define MALIDP_CONF_VALID_TIMEOUT 250 > > -#define AFBC_HEADER_SIZE 16 > > -#define AFBC_SUPERBLK_ALIGNMENT 128 > > =20 > > static void malidp_write_gamma_table(struct malidp_hw_device *hwdev, > > u32 data[MALIDP_COEFFTAB_NUM_COEFFS]) > > @@ -275,24 +274,8 @@ malidp_verify_afbc_framebuffer_caps(struct drm_dev= ice *dev, > > mode_cmd->modifier[0]) =3D=3D false) > > return false; > > =20 > > - if (mode_cmd->offsets[0] !=3D 0) { > > - DRM_DEBUG_KMS("AFBC buffers' plane offset should be 0\n"); > > - return false; > > - } > > - > > - switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) { > > - case AFBC_SIZE_16X16: > > - if ((mode_cmd->width % 16) || (mode_cmd->height % 16)) { > > - DRM_DEBUG_KMS("AFBC buffers must be aligned to 16 pixels\n"); > > - return false; > > - } > > - break; > > - default: > > - DRM_DEBUG_KMS("Unsupported AFBC block size\n"); > > - return false; > > - } > > - > > - return true; > > + return drm_afbc_check_offset(dev, mode_cmd) && > > + drm_afbc_check_size_align(dev, mode_cmd); > > } > > =20 > > static bool > > @@ -300,53 +283,20 @@ malidp_verify_afbc_framebuffer_size(struct drm_de= vice *dev, > > struct drm_file *file, > > const struct drm_mode_fb_cmd2 *mode_cmd) > > { > > - int n_superblocks =3D 0; > > const struct drm_format_info *info; > > struct drm_gem_object *objs =3D NULL; > > - u32 afbc_superblock_size =3D 0, afbc_superblock_height =3D 0; > > - u32 afbc_superblock_width =3D 0, afbc_size =3D 0; > > int bpp =3D 0; > > =20 > > - switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) { > > - case AFBC_SIZE_16X16: > > - afbc_superblock_height =3D 16; > > - afbc_superblock_width =3D 16; > > - break; > > - default: > > - DRM_DEBUG_KMS("AFBC superblock size is not supported\n"); > > - return false; > > - } > > - > > info =3D drm_get_format_info(dev, mode_cmd); > > - > > - n_superblocks =3D (mode_cmd->width / afbc_superblock_width) * > > - (mode_cmd->height / afbc_superblock_height); > > - > > bpp =3D malidp_format_get_bpp(info->format); > > =20 > > - afbc_superblock_size =3D (bpp * afbc_superblock_width * afbc_superblo= ck_height) > > - / BITS_PER_BYTE; > > - > > - afbc_size =3D ALIGN(n_superblocks * AFBC_HEADER_SIZE, AFBC_SUPERBLK_A= LIGNMENT); > > - afbc_size +=3D n_superblocks * ALIGN(afbc_superblock_size, AFBC_SUPER= BLK_ALIGNMENT); > > - > > - if ((mode_cmd->width * bpp) !=3D (mode_cmd->pitches[0] * BITS_PER_BYT= E)) { > > - DRM_DEBUG_KMS("Invalid value of (pitch * BITS_PER_BYTE) (=3D%u) " > > - "should be same as width (=3D%u) * bpp (=3D%u)\n", > > - (mode_cmd->pitches[0] * BITS_PER_BYTE), > > - mode_cmd->width, bpp); > > - return false; > > - } > > - > > objs =3D drm_gem_object_lookup(file, mode_cmd->handles[0]); > > if (!objs) { > > DRM_DEBUG_KMS("Failed to lookup GEM object\n"); > > return false; > > } > > =20 > > - if (objs->size < afbc_size) { > > - DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size =3D = %u\n", > > - objs->size, afbc_size); > > + if (!drm_afbc_check_fb_size(dev, mode_cmd, objs, bpp)) { > > drm_gem_object_put_unlocked(objs); > > return false; > > } > Also can you do the code refactoring for komeda driver as well. > specifically komeda_fb_afbc_size_check(). I will let > james.qian.wang@arm.com and Mihail.Atanassov@arm.com have their > opinion on this. I'd say that it'd be really nice to get this work done for us ;) but it doesn't have to be in this patch but rather in a follow-up. >=20 > > diff --git a/drivers/gpu/drm/drm_afbc.c b/drivers/gpu/drm/drm_afbc.c > > new file mode 100644 > > index 000000000000..3e8a9225fd2e > > --- /dev/null > > +++ b/drivers/gpu/drm/drm_afbc.c > > @@ -0,0 +1,114 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * (C) 2019 Collabora Ltd. > > + * > > + * author: Andrzej Pietrasiewicz > > + * > > + */ > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define AFBC_HEADER_SIZE 16 > > +#define AFBC_SUPERBLK_ALIGNMENT 128 > > + > > +bool drm_afbc_check_offset(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd) > > +{ > > + if (mode_cmd->offsets[0] !=3D 0) { > > + DRM_DEBUG_KMS("AFBC buffers' plane offset should be 0\n"); > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL_GPL(drm_afbc_check_offset); > > + > > +bool drm_afbc_check_size_align(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd) > > +{ > > + > > + switch (mode_cmd->modifier[0] & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) { > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16: > > + if ((mode_cmd->width % 16) || (mode_cmd->height % 16)) { > > + DRM_DEBUG_KMS( > > + "AFBC buffer must be aligned to 16 pixels\n" > > + ); > > + return false; > > + } > > + break; > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_64x4: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4: > > + /* fall through */ > > + default: > > + DRM_DEBUG_KMS("Unsupported AFBC block size\n"); > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL_GPL(drm_afbc_check_size_align); > > + > > +bool drm_afbc_check_fb_size(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd, > > + struct drm_gem_object *objs, int bpp) > > +{ > > + int n_superblocks =3D 0; > > + u32 afbc_superblock_size =3D 0, afbc_superblock_height =3D 0; > > + u32 afbc_superblock_width =3D 0, afbc_size =3D 0; > > + > > + switch (mode_cmd->modifier[0] & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) { > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16: > > + afbc_superblock_height =3D 16; > > + afbc_superblock_width =3D 16; > > + break; > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8: > Copying from > https://cgit.freedesktop.org/drm/drm-tip/tree/drivers/gpu/drm/arm/display= /komeda/komeda_framebuffer.c#n60 > afbc_superblock_width =3D 32; > afbc_superblock_height =3D 8; > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_64x4: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4: > > + /* fall through */ > > + default: > > + DRM_DEBUG_KMS("AFBC superblock size is not supported\n"); > > + return false; > > + } > Can you combine the two switch - case confitions (from this function > and the one in drm_afbc_check_size_align()) and put it in a separate > function (say drm_afbc_get_superblock_dimensions()) of its own ? > This will help to avoid code repetition. >=20 I'm personally a bit on the fence about this - functions should ideally do one thing. That shared helper would be both getting the dimensions _and_ checking the mode_cmd is valid, so one place cares about one half of the function's results, and the other - the second half. =AF\_O_/=AF, opinions, everybody has them :). > > + > > + n_superblocks =3D (mode_cmd->width / afbc_superblock_width) * > > + (mode_cmd->height / afbc_superblock_height); > > + > > + afbc_superblock_size =3D > > + (bpp * afbc_superblock_width * afbc_superblock_height) > > + / BITS_PER_BYTE; > > + > > + afbc_size =3D ALIGN(n_superblocks * AFBC_HEADER_SIZE, > > + AFBC_SUPERBLK_ALIGNMENT); > > + afbc_size +=3D n_superblocks * > > + ALIGN(afbc_superblock_size, AFBC_SUPERBLK_ALIGNMENT); > > + > > + if ((mode_cmd->width * bpp) !=3D (mode_cmd->pitches[0] * BITS_PER_BYT= E)) { > > + DRM_DEBUG_KMS("Invalid value of (pitch * BITS_PER_BYTE) (=3D%u) shou= ld be same as width (=3D%u) * bpp (=3D%u)\n", > > + mode_cmd->pitches[0] * BITS_PER_BYTE, > > + mode_cmd->width, bpp > > + ); > > + return false; > > + } > > + > > + if (objs->size < afbc_size) { > > + DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size =3D = %u\n", > > + objs->size, afbc_size > > + ); > > + > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL(drm_afbc_check_fb_size); > > diff --git a/include/drm/drm_afbc.h b/include/drm/drm_afbc.h > > new file mode 100644 > > index 000000000000..ce39c850217b > > --- /dev/null > > +++ b/include/drm/drm_afbc.h > > @@ -0,0 +1,25 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * (C) 2019 Collabora Ltd. > > + * > > + * author: Andrzej Pietrasiewicz > > + * > > + */ > > +#ifndef __DRM_AFBC_H__ > > +#define __DRM_AFBC_H__ > > + > > +struct drm_device; > > +struct drm_mode_fb_cmd2; > > +struct drm_gem_object; > > + > > +bool drm_afbc_check_offset(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd); > > + > > +bool drm_afbc_check_size_align(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd); > > + > > +bool drm_afbc_check_fb_size(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd, > > + struct drm_gem_object *objs, int bpp); > > + > > +#endif /* __DRM_AFBC_H__ */ > > -- > > 2.17.1 > >=20 > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel >=20 Overall the patch LGTM as-is, nice and straightforward mostly-cut-n-paste, just let's sort out the SPDX identifier question I have, then I'll be happy. --=20 Mihail From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mihail Atanassov Subject: Re: [PATCH 1/2] drm/arm: Factor out generic afbc helpers Date: Mon, 21 Oct 2019 14:41:22 +0000 Message-ID: <2485717.1SzL54aMiy@e123338-lin> References: <20191011111813.20851-1-andrzej.p@collabora.com> <20191011111813.20851-2-andrzej.p@collabora.com> <20191021135013.GA16072@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191021135013.GA16072@arm.com> Content-Language: en-US Content-ID: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ayan Halder Cc: nd , David Airlie , Liviu Dudau , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Andrzej Pietrasiewicz , "linux-rockchip@lists.infradead.org" , "james qian wang (Arm Technology China)" , "kernel@collabora.com" , Sean Paul , "linux-arm-kernel@lists.infradead.org" List-Id: linux-rockchip.vger.kernel.org SGkgQW5kcnplaiwKCk9uIE1vbmRheSwgMjEgT2N0b2JlciAyMDE5IDE0OjUwOjE0IEJTVCBBeWFu IEhhbGRlciB3cm90ZToKPiBPbiBGcmksIE9jdCAxMSwgMjAxOSBhdCAwMToxODoxMFBNICswMjAw LCBBbmRyemVqIFBpZXRyYXNpZXdpY3ogd3JvdGU6Cj4gPiBUaGVzZSBhcmUgdXNlZnVsIGZvciBv dGhlciB1c2VycyBvZiBhZmJjLCBlLmcuIHJvY2tjaGlwLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5 OiBBbmRyemVqIFBpZXRyYXNpZXdpY3ogPGFuZHJ6ZWoucEBjb2xsYWJvcmEuY29tPgo+IAo+IEhp IEFuZHJ6ZWosCj4gCj4gVGhhbmtzIGEgbG90IGZvciBkb2luZyB0aGlzLiBNdWNoIGFwcHJlY2lh dGVkLiA6KQo+IEl0IHdhcyBvbiBvdXIgVE9ETyBsaXN0IGZvciBhIGxvbmcgdGltZS4KClNlY29u ZGVkLCB0aGFua3MgZm9yIHRoZSBwYXRjaCEKCj4gCj4gSSBoYXZlIGNjLWVkIGphbWVzLnFpYW4u d2FuZ0Bhcm0uY29tLCBNaWhhaWwuQXRhbmFzc292QGFybS5jb20gZm9yCj4gdGhlaXIgY29tbWVu dHMgYXMgd2VsbC4KPiAKPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9LY29uZmlnICAgICAg ICAgIHwgICA0ICsrCj4gPiAgZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlICAgICAgICAgfCAgIDEg Kwo+ID4gIGRyaXZlcnMvZ3B1L2RybS9hcm0vS2NvbmZpZyAgICAgIHwgICAxICsKPiA+ICBkcml2 ZXJzL2dwdS9kcm0vYXJtL21hbGlkcF9kcnYuYyB8ICA1OCArKy0tLS0tLS0tLS0tLS0tCj4gPiAg ZHJpdmVycy9ncHUvZHJtL2RybV9hZmJjLmMgICAgICAgfCAxMTQgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwo+ID4gIGluY2x1ZGUvZHJtL2RybV9hZmJjLmggICAgICAgICAgIHwgIDI1 ICsrKysrKysKPiA+ICA2IGZpbGVzIGNoYW5nZWQsIDE0OSBpbnNlcnRpb25zKCspLCA1NCBkZWxl dGlvbnMoLSkKPiA+ICBjcmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL2RybV9hZmJj LmMKPiA+ICBjcmVhdGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9kcm0vZHJtX2FmYmMuaAo+ID4gCj4g PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL0tjb25maWcgYi9kcml2ZXJzL2dwdS9kcm0v S2NvbmZpZwo+ID4gaW5kZXggM2M4ODQyMGUzNDk3Li4wMGUzZjkwNTU3ZjQgMTAwNjQ0Cj4gPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vS2NvbmZpZwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL0tj b25maWcKPiA+IEBAIC0xOTUsNiArMTk1LDEwIEBAIGNvbmZpZyBEUk1fU0NIRUQKPiA+ICAJdHJp c3RhdGUKPiA+ICAJZGVwZW5kcyBvbiBEUk0KPiA+ICAKPiA+ICtjb25maWcgRFJNX0FGQkMKPiA+ ICsJdHJpc3RhdGUKPiA+ICsJZGVwZW5kcyBvbiBEUk0KPiBBZGRpbmcgYSAnaGVscCcgd291bGQg YmUgZ3JlYXQgaGVyZS4gU3RlYWxpbmcgdGhlIGZpcnN0IGxpbmUgZnJvbQo+IGh0dHBzOi8vd3d3 Lmtlcm5lbC5vcmcvZG9jL2h0bWwvbGF0ZXN0L2dwdS9hZmJjLmh0bWwKPiAKPiAiQUZCQyBpcyBh IHByb3ByaWV0YXJ5IGxvc3NsZXNzIGltYWdlIGNvbXByZXNzaW9uIHByb3RvY29sIGFuZCBmb3Jt YXQuCj4gSXQgcHJvdmlkZXMgZmluZS1ncmFpbmVkIHJhbmRvbSBhY2Nlc3MgYW5kIG1pbmltaXpl cyB0aGUgYW1vdW50IG9mCj4gZGF0YSB0cmFuc2ZlcnJlZCBiZXR3ZWVuIElQIGJsb2Nrcy4iCj4g Cj4gPiArCj4gPiAgc291cmNlICJkcml2ZXJzL2dwdS9kcm0vaTJjL0tjb25maWciCj4gPiAgCj4g PiAgc291cmNlICJkcml2ZXJzL2dwdS9kcm0vYXJtL0tjb25maWciCj4gPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlCj4gPiBp bmRleCA5ZjBkMmVlMzU3OTQuLjU1MzY4YjY2ODM1NSAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9NYWtlZmlsZQo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlCj4gPiBA QCAtMzEsNiArMzEsNyBAQCBkcm0tJChDT05GSUdfT0YpICs9IGRybV9vZi5vCj4gPiAgZHJtLSQo Q09ORklHX0FHUCkgKz0gZHJtX2FncHN1cHBvcnQubwo+ID4gIGRybS0kKENPTkZJR19ERUJVR19G UykgKz0gZHJtX2RlYnVnZnMubyBkcm1fZGVidWdmc19jcmMubwo+ID4gIGRybS0kKENPTkZJR19E Uk1fTE9BRF9FRElEX0ZJUk1XQVJFKSArPSBkcm1fZWRpZF9sb2FkLm8KPiA+ICtkcm0tJChDT05G SUdfRFJNX0FGQkMpICs9IGRybV9hZmJjLm8KPiA+ICAKPiA+ICBkcm1fdnJhbV9oZWxwZXIteSA6 PSBkcm1fZ2VtX3ZyYW1faGVscGVyLm8gXAo+ID4gIAkJICAgICBkcm1fdnJhbV9oZWxwZXJfY29t bW9uLm8gXAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vS2NvbmZpZyBiL2Ry aXZlcnMvZ3B1L2RybS9hcm0vS2NvbmZpZwo+ID4gaW5kZXggYTIwNDEwM2IzZWZiLi4yNWMzZGM0 MDhjZGEgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXJtL0tjb25maWcKPiA+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vS2NvbmZpZwo+ID4gQEAgLTI5LDYgKzI5LDcgQEAgY29u ZmlnIERSTV9NQUxJX0RJU1BMQVkKPiA+ICAJc2VsZWN0IERSTV9LTVNfSEVMUEVSCj4gPiAgCXNl bGVjdCBEUk1fS01TX0NNQV9IRUxQRVIKPiA+ICAJc2VsZWN0IERSTV9HRU1fQ01BX0hFTFBFUgo+ ID4gKwlzZWxlY3QgRFJNX0FGQkMKPiA+ICAJc2VsZWN0IFZJREVPTU9ERV9IRUxQRVJTCj4gPiAg CWhlbHAKPiA+ICAJICBDaG9vc2UgdGhpcyBvcHRpb24gaWYgeW91IHdhbnQgdG8gY29tcGlsZSB0 aGUgQVJNIE1hbGkgRGlzcGxheQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0v bWFsaWRwX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2FybS9tYWxpZHBfZHJ2LmMKPiA+IGluZGV4 IGYyNWVjNDM4MjI3Ny4uYTY3YjY5ZTA4ZjYzIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FybS9tYWxpZHBfZHJ2LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vbWFsaWRw X2Rydi5jCgpUaGlzIGZpbGUgaXMgR1BMLTIuMC1vbmx5LiBTaG91bGRuJ3QgdGhpcyBiZSBwcmVz ZXJ2ZWQgd2hlbiB0aGUKc3Vic3RhbnRpdmUgYml0IG9mIHRoZSBjb2RlIGluIGRybV9hZmJjLmMg Y29tZXMgZnJvbSBoZXJlPwoKPiA+IEBAIC0xNiw2ICsxNiw3IEBACj4gPiAgI2luY2x1ZGUgPGxp bnV4L2RlYnVnZnMuaD4KPiA+ICAKPiA+ICAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KPiA+ICsjaW5j bHVkZSA8ZHJtL2RybV9hZmJjLmg+Cj4gPiAgI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+Cj4g PiAgI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgo+ID4gICNpbmNsdWRlIDxkcm0v ZHJtX2NydGMuaD4KPiA+IEBAIC0zMyw4ICszNCw2IEBACj4gPiAgI2luY2x1ZGUgIm1hbGlkcF9o dy5oIgo+ID4gIAo+ID4gICNkZWZpbmUgTUFMSURQX0NPTkZfVkFMSURfVElNRU9VVAkyNTAKPiA+ IC0jZGVmaW5lIEFGQkNfSEVBREVSX1NJWkUJCTE2Cj4gPiAtI2RlZmluZSBBRkJDX1NVUEVSQkxL X0FMSUdOTUVOVAkJMTI4Cj4gPiAgCj4gPiAgc3RhdGljIHZvaWQgbWFsaWRwX3dyaXRlX2dhbW1h X3RhYmxlKHN0cnVjdCBtYWxpZHBfaHdfZGV2aWNlICpod2RldiwKPiA+ICAJCQkJICAgICB1MzIg ZGF0YVtNQUxJRFBfQ09FRkZUQUJfTlVNX0NPRUZGU10pCj4gPiBAQCAtMjc1LDI0ICsyNzQsOCBA QCBtYWxpZHBfdmVyaWZ5X2FmYmNfZnJhbWVidWZmZXJfY2FwcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ID4gIAkJCQkJbW9kZV9jbWQtPm1vZGlmaWVyWzBdKSA9PSBmYWxzZSkKPiA+ICAJCXJl dHVybiBmYWxzZTsKPiA+ICAKPiA+IC0JaWYgKG1vZGVfY21kLT5vZmZzZXRzWzBdICE9IDApIHsK PiA+IC0JCURSTV9ERUJVR19LTVMoIkFGQkMgYnVmZmVycycgcGxhbmUgb2Zmc2V0IHNob3VsZCBi ZSAwXG4iKTsKPiA+IC0JCXJldHVybiBmYWxzZTsKPiA+IC0JfQo+ID4gLQo+ID4gLQlzd2l0Y2gg KG1vZGVfY21kLT5tb2RpZmllclswXSAmIEFGQkNfU0laRV9NQVNLKSB7Cj4gPiAtCWNhc2UgQUZC Q19TSVpFXzE2WDE2Ogo+ID4gLQkJaWYgKChtb2RlX2NtZC0+d2lkdGggJSAxNikgfHwgKG1vZGVf Y21kLT5oZWlnaHQgJSAxNikpIHsKPiA+IC0JCQlEUk1fREVCVUdfS01TKCJBRkJDIGJ1ZmZlcnMg bXVzdCBiZSBhbGlnbmVkIHRvIDE2IHBpeGVsc1xuIik7Cj4gPiAtCQkJcmV0dXJuIGZhbHNlOwo+ ID4gLQkJfQo+ID4gLQkJYnJlYWs7Cj4gPiAtCWRlZmF1bHQ6Cj4gPiAtCQlEUk1fREVCVUdfS01T KCJVbnN1cHBvcnRlZCBBRkJDIGJsb2NrIHNpemVcbiIpOwo+ID4gLQkJcmV0dXJuIGZhbHNlOwo+ ID4gLQl9Cj4gPiAtCj4gPiAtCXJldHVybiB0cnVlOwo+ID4gKwlyZXR1cm4gZHJtX2FmYmNfY2hl Y2tfb2Zmc2V0KGRldiwgbW9kZV9jbWQpICYmCj4gPiArCSAgICAgICBkcm1fYWZiY19jaGVja19z aXplX2FsaWduKGRldiwgbW9kZV9jbWQpOwo+ID4gIH0KPiA+ICAKPiA+ICBzdGF0aWMgYm9vbAo+ ID4gQEAgLTMwMCw1MyArMjgzLDIwIEBAIG1hbGlkcF92ZXJpZnlfYWZiY19mcmFtZWJ1ZmZlcl9z aXplKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gPiAgCQkJCSAgICBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUsCj4gPiAgCQkJCSAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9j bWQpCj4gPiAgewo+ID4gLQlpbnQgbl9zdXBlcmJsb2NrcyA9IDA7Cj4gPiAgCWNvbnN0IHN0cnVj dCBkcm1fZm9ybWF0X2luZm8gKmluZm87Cj4gPiAgCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2Jq cyA9IE5VTEw7Cj4gPiAtCXUzMiBhZmJjX3N1cGVyYmxvY2tfc2l6ZSA9IDAsIGFmYmNfc3VwZXJi bG9ja19oZWlnaHQgPSAwOwo+ID4gLQl1MzIgYWZiY19zdXBlcmJsb2NrX3dpZHRoID0gMCwgYWZi Y19zaXplID0gMDsKPiA+ICAJaW50IGJwcCA9IDA7Cj4gPiAgCj4gPiAtCXN3aXRjaCAobW9kZV9j bWQtPm1vZGlmaWVyWzBdICYgQUZCQ19TSVpFX01BU0spIHsKPiA+IC0JY2FzZSBBRkJDX1NJWkVf MTZYMTY6Cj4gPiAtCQlhZmJjX3N1cGVyYmxvY2tfaGVpZ2h0ID0gMTY7Cj4gPiAtCQlhZmJjX3N1 cGVyYmxvY2tfd2lkdGggPSAxNjsKPiA+IC0JCWJyZWFrOwo+ID4gLQlkZWZhdWx0Ogo+ID4gLQkJ RFJNX0RFQlVHX0tNUygiQUZCQyBzdXBlcmJsb2NrIHNpemUgaXMgbm90IHN1cHBvcnRlZFxuIik7 Cj4gPiAtCQlyZXR1cm4gZmFsc2U7Cj4gPiAtCX0KPiA+IC0KPiA+ICAJaW5mbyA9IGRybV9nZXRf Zm9ybWF0X2luZm8oZGV2LCBtb2RlX2NtZCk7Cj4gPiAtCj4gPiAtCW5fc3VwZXJibG9ja3MgPSAo bW9kZV9jbWQtPndpZHRoIC8gYWZiY19zdXBlcmJsb2NrX3dpZHRoKSAqCj4gPiAtCQkobW9kZV9j bWQtPmhlaWdodCAvIGFmYmNfc3VwZXJibG9ja19oZWlnaHQpOwo+ID4gLQo+ID4gIAlicHAgPSBt YWxpZHBfZm9ybWF0X2dldF9icHAoaW5mby0+Zm9ybWF0KTsKPiA+ICAKPiA+IC0JYWZiY19zdXBl cmJsb2NrX3NpemUgPSAoYnBwICogYWZiY19zdXBlcmJsb2NrX3dpZHRoICogYWZiY19zdXBlcmJs b2NrX2hlaWdodCkKPiA+IC0JCQkJLyBCSVRTX1BFUl9CWVRFOwo+ID4gLQo+ID4gLQlhZmJjX3Np emUgPSBBTElHTihuX3N1cGVyYmxvY2tzICogQUZCQ19IRUFERVJfU0laRSwgQUZCQ19TVVBFUkJM S19BTElHTk1FTlQpOwo+ID4gLQlhZmJjX3NpemUgKz0gbl9zdXBlcmJsb2NrcyAqIEFMSUdOKGFm YmNfc3VwZXJibG9ja19zaXplLCBBRkJDX1NVUEVSQkxLX0FMSUdOTUVOVCk7Cj4gPiAtCj4gPiAt CWlmICgobW9kZV9jbWQtPndpZHRoICogYnBwKSAhPSAobW9kZV9jbWQtPnBpdGNoZXNbMF0gKiBC SVRTX1BFUl9CWVRFKSkgewo+ID4gLQkJRFJNX0RFQlVHX0tNUygiSW52YWxpZCB2YWx1ZSBvZiAo cGl0Y2ggKiBCSVRTX1BFUl9CWVRFKSAoPSV1KSAiCj4gPiAtCQkJICAgICAgInNob3VsZCBiZSBz YW1lIGFzIHdpZHRoICg9JXUpICogYnBwICg9JXUpXG4iLAo+ID4gLQkJCSAgICAgIChtb2RlX2Nt ZC0+cGl0Y2hlc1swXSAqIEJJVFNfUEVSX0JZVEUpLAo+ID4gLQkJCSAgICAgIG1vZGVfY21kLT53 aWR0aCwgYnBwKTsKPiA+IC0JCXJldHVybiBmYWxzZTsKPiA+IC0JfQo+ID4gLQo+ID4gIAlvYmpz ID0gZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIG1vZGVfY21kLT5oYW5kbGVzWzBdKTsKPiA+ ICAJaWYgKCFvYmpzKSB7Cj4gPiAgCQlEUk1fREVCVUdfS01TKCJGYWlsZWQgdG8gbG9va3VwIEdF TSBvYmplY3RcbiIpOwo+ID4gIAkJcmV0dXJuIGZhbHNlOwo+ID4gIAl9Cj4gPiAgCj4gPiAtCWlm IChvYmpzLT5zaXplIDwgYWZiY19zaXplKSB7Cj4gPiAtCQlEUk1fREVCVUdfS01TKCJidWZmZXIg c2l6ZSAoJXp1KSB0b28gc21hbGwgZm9yIEFGQkMgYnVmZmVyIHNpemUgPSAldVxuIiwKPiA+IC0J CQkgICAgICBvYmpzLT5zaXplLCBhZmJjX3NpemUpOwo+ID4gKwlpZiAoIWRybV9hZmJjX2NoZWNr X2ZiX3NpemUoZGV2LCBtb2RlX2NtZCwgb2JqcywgYnBwKSkgewo+ID4gIAkJZHJtX2dlbV9vYmpl Y3RfcHV0X3VubG9ja2VkKG9ianMpOwo+ID4gIAkJcmV0dXJuIGZhbHNlOwo+ID4gIAl9Cj4gQWxz byBjYW4geW91IGRvIHRoZSBjb2RlIHJlZmFjdG9yaW5nIGZvciBrb21lZGEgZHJpdmVyIGFzIHdl bGwuCj4gc3BlY2lmaWNhbGx5IGtvbWVkYV9mYl9hZmJjX3NpemVfY2hlY2soKS4gSSB3aWxsIGxl dAo+IGphbWVzLnFpYW4ud2FuZ0Bhcm0uY29tIGFuZCBNaWhhaWwuQXRhbmFzc292QGFybS5jb20g aGF2ZSB0aGVpcgo+IG9waW5pb24gb24gdGhpcy4KCkknZCBzYXkgdGhhdCBpdCdkIGJlIHJlYWxs eSBuaWNlIHRvIGdldCB0aGlzIHdvcmsgZG9uZSBmb3IgdXMgOykKYnV0IGl0IGRvZXNuJ3QgaGF2 ZSB0byBiZSBpbiB0aGlzIHBhdGNoIGJ1dCByYXRoZXIgaW4gYSBmb2xsb3ctdXAuCgo+IAo+ID4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYWZiYy5jIGIvZHJpdmVycy9ncHUvZHJt L2RybV9hZmJjLmMKPiA+IG5ldyBmaWxlIG1vZGUgMTAwNjQ0Cj4gPiBpbmRleCAwMDAwMDAwMDAw MDAuLjNlOGE5MjI1ZmQyZQo+ID4gLS0tIC9kZXYvbnVsbAo+ID4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9hZmJjLmMKPiA+IEBAIC0wLDAgKzEsMTE0IEBACj4gPiArLy8gU1BEWC1MaWNlbnNl LUlkZW50aWZpZXI6IEdQTC0yLjArCj4gPiArLyoKPiA+ICsgKiAoQykgMjAxOSBDb2xsYWJvcmEg THRkLgo+ID4gKyAqCj4gPiArICogYXV0aG9yOiBBbmRyemVqIFBpZXRyYXNpZXdpY3ogPGFuZHJ6 ZWoucEBjb2xsYWJvcmEuY29tPgo+ID4gKyAqCj4gPiArICovCj4gPiArI2luY2x1ZGUgPGxpbnV4 L21vZHVsZS5oPgo+ID4gKwo+ID4gKyNpbmNsdWRlIDxkcm0vZHJtX2FmYmMuaD4KPiA+ICsjaW5j bHVkZSA8ZHJtL2RybV9kZXZpY2UuaD4KPiA+ICsjaW5jbHVkZSA8ZHJtL2RybV9mb3VyY2MuaD4K PiA+ICsjaW5jbHVkZSA8ZHJtL2RybV9nZW0uaD4KPiA+ICsjaW5jbHVkZSA8ZHJtL2RybV9tb2Rl Lmg+Cj4gPiArI2luY2x1ZGUgPGRybS9kcm1fcHJpbnQuaD4KPiA+ICsKPiA+ICsjZGVmaW5lIEFG QkNfSEVBREVSX1NJWkUJCTE2Cj4gPiArI2RlZmluZSBBRkJDX1NVUEVSQkxLX0FMSUdOTUVOVAkJ MTI4Cj4gPiArCj4gPiArYm9vbCBkcm1fYWZiY19jaGVja19vZmZzZXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiA+ICsJCQkgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9j bWQpCj4gPiArewo+ID4gKwlpZiAobW9kZV9jbWQtPm9mZnNldHNbMF0gIT0gMCkgewo+ID4gKwkJ RFJNX0RFQlVHX0tNUygiQUZCQyBidWZmZXJzJyBwbGFuZSBvZmZzZXQgc2hvdWxkIGJlIDBcbiIp Owo+ID4gKwkJcmV0dXJuIGZhbHNlOwo+ID4gKwl9Cj4gPiArCj4gPiArCXJldHVybiB0cnVlOwo+ ID4gK30KPiA+ICtFWFBPUlRfU1lNQk9MX0dQTChkcm1fYWZiY19jaGVja19vZmZzZXQpOwo+ID4g Kwo+ID4gK2Jvb2wgZHJtX2FmYmNfY2hlY2tfc2l6ZV9hbGlnbihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ID4gKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9j bWQpCj4gPiArewo+ID4gKwo+ID4gKwlzd2l0Y2ggKG1vZGVfY21kLT5tb2RpZmllclswXSAmIEFG QkNfRk9STUFUX01PRF9CTE9DS19TSVpFX01BU0spIHsKPiA+ICsJY2FzZSBBRkJDX0ZPUk1BVF9N T0RfQkxPQ0tfU0laRV8xNngxNjoKPiA+ICsJCWlmICgobW9kZV9jbWQtPndpZHRoICUgMTYpIHx8 IChtb2RlX2NtZC0+aGVpZ2h0ICUgMTYpKSB7Cj4gPiArCQkJRFJNX0RFQlVHX0tNUygKPiA+ICsJ CQkJIkFGQkMgYnVmZmVyIG11c3QgYmUgYWxpZ25lZCB0byAxNiBwaXhlbHNcbiIKPiA+ICsJCQkp Owo+ID4gKwkJCXJldHVybiBmYWxzZTsKPiA+ICsJCX0KPiA+ICsJCWJyZWFrOwo+ID4gKwljYXNl IEFGQkNfRk9STUFUX01PRF9CTE9DS19TSVpFXzMyeDg6Cj4gPiArCQkvKiBmYWxsIHRocm91Z2gg Ki8KPiA+ICsJY2FzZSBBRkJDX0ZPUk1BVF9NT0RfQkxPQ0tfU0laRV82NHg0Ogo+ID4gKwkJLyog ZmFsbCB0aHJvdWdoICovCj4gPiArCWNhc2UgQUZCQ19GT1JNQVRfTU9EX0JMT0NLX1NJWkVfMzJ4 OF82NHg0Ogo+ID4gKwkJLyogZmFsbCB0aHJvdWdoICovCj4gPiArCWRlZmF1bHQ6Cj4gPiArCQlE Uk1fREVCVUdfS01TKCJVbnN1cHBvcnRlZCBBRkJDIGJsb2NrIHNpemVcbiIpOwo+ID4gKwkJcmV0 dXJuIGZhbHNlOwo+ID4gKwl9Cj4gPiArCj4gPiArCXJldHVybiB0cnVlOwo+ID4gK30KPiA+ICtF WFBPUlRfU1lNQk9MX0dQTChkcm1fYWZiY19jaGVja19zaXplX2FsaWduKTsKPiA+ICsKPiA+ICti b29sIGRybV9hZmJjX2NoZWNrX2ZiX3NpemUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ICsJ CQkgICAgY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLAo+ID4gKwkJCSAg ICBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9ianMsIGludCBicHApCj4gPiArewo+ID4gKwlpbnQg bl9zdXBlcmJsb2NrcyA9IDA7Cj4gPiArCXUzMiBhZmJjX3N1cGVyYmxvY2tfc2l6ZSA9IDAsIGFm YmNfc3VwZXJibG9ja19oZWlnaHQgPSAwOwo+ID4gKwl1MzIgYWZiY19zdXBlcmJsb2NrX3dpZHRo ID0gMCwgYWZiY19zaXplID0gMDsKPiA+ICsKPiA+ICsJc3dpdGNoIChtb2RlX2NtZC0+bW9kaWZp ZXJbMF0gJiBBRkJDX0ZPUk1BVF9NT0RfQkxPQ0tfU0laRV9NQVNLKSB7Cj4gPiArCWNhc2UgQUZC Q19GT1JNQVRfTU9EX0JMT0NLX1NJWkVfMTZ4MTY6Cj4gPiArCQlhZmJjX3N1cGVyYmxvY2tfaGVp Z2h0ID0gMTY7Cj4gPiArCQlhZmJjX3N1cGVyYmxvY2tfd2lkdGggPSAxNjsKPiA+ICsJCWJyZWFr Owo+ID4gKwljYXNlIEFGQkNfRk9STUFUX01PRF9CTE9DS19TSVpFXzMyeDg6Cj4gQ29weWluZyBm cm9tCj4gaHR0cHM6Ly9jZ2l0LmZyZWVkZXNrdG9wLm9yZy9kcm0vZHJtLXRpcC90cmVlL2RyaXZl cnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2ZyYW1lYnVmZmVyLmMjbjYwCj4g ICAgICAgICAgICAgICAgIGFmYmNfc3VwZXJibG9ja193aWR0aCA9IDMyOwo+ICAgICAgICAgICAg ICAgICBhZmJjX3N1cGVyYmxvY2tfaGVpZ2h0ID0gODsKPiA+ICsJCS8qIGZhbGwgdGhyb3VnaCAq Lwo+ID4gKwljYXNlIEFGQkNfRk9STUFUX01PRF9CTE9DS19TSVpFXzY0eDQ6Cj4gPiArCQkvKiBm YWxsIHRocm91Z2ggKi8KPiA+ICsJY2FzZSBBRkJDX0ZPUk1BVF9NT0RfQkxPQ0tfU0laRV8zMng4 XzY0eDQ6Cj4gPiArCQkvKiBmYWxsIHRocm91Z2ggKi8KPiA+ICsJZGVmYXVsdDoKPiA+ICsJCURS TV9ERUJVR19LTVMoIkFGQkMgc3VwZXJibG9jayBzaXplIGlzIG5vdCBzdXBwb3J0ZWRcbiIpOwo+ ID4gKwkJcmV0dXJuIGZhbHNlOwo+ID4gKwl9Cj4gQ2FuIHlvdSBjb21iaW5lIHRoZSB0d28gc3dp dGNoIC0gY2FzZSBjb25maXRpb25zIChmcm9tIHRoaXMgZnVuY3Rpb24KPiBhbmQgdGhlIG9uZSBp biBkcm1fYWZiY19jaGVja19zaXplX2FsaWduKCkpIGFuZCBwdXQgaXQgaW4gYSBzZXBhcmF0ZQo+ IGZ1bmN0aW9uIChzYXkgZHJtX2FmYmNfZ2V0X3N1cGVyYmxvY2tfZGltZW5zaW9ucygpKSBvZiBp dHMgb3duID8KPiBUaGlzIHdpbGwgaGVscCB0byBhdm9pZCBjb2RlIHJlcGV0aXRpb24uCj4gCgpJ J20gcGVyc29uYWxseSBhIGJpdCBvbiB0aGUgZmVuY2UgYWJvdXQgdGhpcyAtIGZ1bmN0aW9ucyBz aG91bGQgaWRlYWxseQpkbyBvbmUgdGhpbmcuIFRoYXQgc2hhcmVkIGhlbHBlciB3b3VsZCBiZSBi b3RoIGdldHRpbmcgdGhlIGRpbWVuc2lvbnMKX2FuZF8gY2hlY2tpbmcgdGhlIG1vZGVfY21kIGlz IHZhbGlkLCBzbyBvbmUgcGxhY2UgY2FyZXMgYWJvdXQgb25lIGhhbGYKb2YgdGhlIGZ1bmN0aW9u J3MgcmVzdWx0cywgYW5kIHRoZSBvdGhlciAtIHRoZSBzZWNvbmQgaGFsZi4gwq9cX09fL8KvLApv cGluaW9ucywgZXZlcnlib2R5IGhhcyB0aGVtIDopLgoKPiA+ICsKPiA+ICsJbl9zdXBlcmJsb2Nr cyA9IChtb2RlX2NtZC0+d2lkdGggLyBhZmJjX3N1cGVyYmxvY2tfd2lkdGgpICoKPiA+ICsJCSht b2RlX2NtZC0+aGVpZ2h0IC8gYWZiY19zdXBlcmJsb2NrX2hlaWdodCk7Cj4gPiArCj4gPiArCWFm YmNfc3VwZXJibG9ja19zaXplID0KPiA+ICsJCShicHAgKiBhZmJjX3N1cGVyYmxvY2tfd2lkdGgg KiBhZmJjX3N1cGVyYmxvY2tfaGVpZ2h0KQo+ID4gKwkJCS8gQklUU19QRVJfQllURTsKPiA+ICsK PiA+ICsJYWZiY19zaXplID0gQUxJR04obl9zdXBlcmJsb2NrcyAqIEFGQkNfSEVBREVSX1NJWkUs Cj4gPiArCQkJICBBRkJDX1NVUEVSQkxLX0FMSUdOTUVOVCk7Cj4gPiArCWFmYmNfc2l6ZSArPSBu X3N1cGVyYmxvY2tzICoKPiA+ICsJCUFMSUdOKGFmYmNfc3VwZXJibG9ja19zaXplLCBBRkJDX1NV UEVSQkxLX0FMSUdOTUVOVCk7Cj4gPiArCj4gPiArCWlmICgobW9kZV9jbWQtPndpZHRoICogYnBw KSAhPSAobW9kZV9jbWQtPnBpdGNoZXNbMF0gKiBCSVRTX1BFUl9CWVRFKSkgewo+ID4gKwkJRFJN X0RFQlVHX0tNUygiSW52YWxpZCB2YWx1ZSBvZiAocGl0Y2ggKiBCSVRTX1BFUl9CWVRFKSAoPSV1 KSBzaG91bGQgYmUgc2FtZSBhcyB3aWR0aCAoPSV1KSAqIGJwcCAoPSV1KVxuIiwKPiA+ICsJCQlt b2RlX2NtZC0+cGl0Y2hlc1swXSAqIEJJVFNfUEVSX0JZVEUsCj4gPiArCQkJbW9kZV9jbWQtPndp ZHRoLCBicHAKPiA+ICsJCSk7Cj4gPiArCQlyZXR1cm4gZmFsc2U7Cj4gPiArCX0KPiA+ICsKPiA+ ICsJaWYgKG9ianMtPnNpemUgPCBhZmJjX3NpemUpIHsKPiA+ICsJCURSTV9ERUJVR19LTVMoImJ1 ZmZlciBzaXplICglenUpIHRvbyBzbWFsbCBmb3IgQUZCQyBidWZmZXIgc2l6ZSA9ICV1XG4iLAo+ ID4gKwkJCW9ianMtPnNpemUsIGFmYmNfc2l6ZQo+ID4gKwkJKTsKPiA+ICsKPiA+ICsJCXJldHVy biBmYWxzZTsKPiA+ICsJfQo+ID4gKwo+ID4gKwlyZXR1cm4gdHJ1ZTsKPiA+ICt9Cj4gPiArRVhQ T1JUX1NZTUJPTChkcm1fYWZiY19jaGVja19mYl9zaXplKTsKPiA+IGRpZmYgLS1naXQgYS9pbmNs dWRlL2RybS9kcm1fYWZiYy5oIGIvaW5jbHVkZS9kcm0vZHJtX2FmYmMuaAo+ID4gbmV3IGZpbGUg bW9kZSAxMDA2NDQKPiA+IGluZGV4IDAwMDAwMDAwMDAwMC4uY2UzOWM4NTAyMTdiCj4gPiAtLS0g L2Rldi9udWxsCj4gPiArKysgYi9pbmNsdWRlL2RybS9kcm1fYWZiYy5oCj4gPiBAQCAtMCwwICsx LDI1IEBACj4gPiArLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjArICovCj4gPiAr LyoKPiA+ICsgKiAoQykgMjAxOSBDb2xsYWJvcmEgTHRkLgo+ID4gKyAqCj4gPiArICogYXV0aG9y OiBBbmRyemVqIFBpZXRyYXNpZXdpY3ogPGFuZHJ6ZWoucEBjb2xsYWJvcmEuY29tPgo+ID4gKyAq Cj4gPiArICovCj4gPiArI2lmbmRlZiBfX0RSTV9BRkJDX0hfXwo+ID4gKyNkZWZpbmUgX19EUk1f QUZCQ19IX18KPiA+ICsKPiA+ICtzdHJ1Y3QgZHJtX2RldmljZTsKPiA+ICtzdHJ1Y3QgZHJtX21v ZGVfZmJfY21kMjsKPiA+ICtzdHJ1Y3QgZHJtX2dlbV9vYmplY3Q7Cj4gPiArCj4gPiArYm9vbCBk cm1fYWZiY19jaGVja19vZmZzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ICsJCQkgICBj b25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9jbWQpOwo+ID4gKwo+ID4gK2Jvb2wg ZHJtX2FmYmNfY2hlY2tfc2l6ZV9hbGlnbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gKwkJ CSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9jbWQpOwo+ID4gKwo+ ID4gK2Jvb2wgZHJtX2FmYmNfY2hlY2tfZmJfc2l6ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ ID4gKwkJCSAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9jbWQsCj4gPiAr CQkJICAgIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqcywgaW50IGJwcCk7Cj4gPiArCj4gPiAr I2VuZGlmIC8qIF9fRFJNX0FGQkNfSF9fICovCj4gPiAtLQo+ID4gMi4xNy4xCj4gPiAKPiA+IF9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gPiBkcmktZGV2 ZWwgbWFpbGluZyBsaXN0Cj4gPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gPiBo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo+ IAoKT3ZlcmFsbCB0aGUgcGF0Y2ggTEdUTSBhcy1pcywgbmljZSBhbmQgc3RyYWlnaHRmb3J3YXJk Cm1vc3RseS1jdXQtbi1wYXN0ZSwganVzdCBsZXQncyBzb3J0IG91dCB0aGUgU1BEWCBpZGVudGlm aWVyIHF1ZXN0aW9uCkkgaGF2ZSwgdGhlbiBJJ2xsIGJlIGhhcHB5LgoKLS0gCk1paGFpbAoKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D9F84CA9EAF for ; Mon, 21 Oct 2019 14:41:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 96B112053B for ; Mon, 21 Oct 2019 14:41:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j+OmKl5b"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="58McUph2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="58McUph2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96B112053B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V+Or+hZkBHupuet+qR9VhqME567b7OvLeBinzG+78sc=; b=j+OmKl5by+lrg7 26RLrAze1GI4U90WaXpqKNRFEOmjSV95aOXenHdZUups+SLX+lSnStnH0P4etO8wuXJkobpf5FQLT BU/TdOmHBjqubhzhvJ8who19Wzrw3kB8M7SWJyWWWWJjsFRnDowNiqfPESH75XqjKZqS5sQXxzapH Rr+xsxinFU6Dk2Fi7k1VSNDiwUcJ/cKe8UDJRZFO2GsUIw4b6oZZ10syRp+ZnFEt3BfXKBpsPG5Zm qED+DUP4AcSR7uX/3GNIRXyZrEWGdCr/BiApfjn7FJi9VGqiRsPpq0UPLEcUnceTZXwmYjQPiKlz4 gd5sJhcMHHkVnsPddehw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMYsX-00005n-28; Mon, 21 Oct 2019 14:41:49 +0000 Received: from mail-eopbgr50041.outbound.protection.outlook.com ([40.107.5.41] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMYsR-0008Vk-C0; Mon, 21 Oct 2019 14:41:46 +0000 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=58McUph24A87dDKykTnXM6IaEEQ1ntcjHGfqJEqAriaak0e8vJo0asjJQPafbkqQkdpun0vYeFCtWKSVGgVUbvpEXk9C3NpsGOSyt07XgYZOMbLLAHwzodHxcNXs7yOUvXl4l8lpobblpoAxsvLBvPSqvVIJRh8ft5rnuGiN/Ag= Received: from HE1PR0802CA0019.eurprd08.prod.outlook.com (2603:10a6:3:bd::29) by AM0PR08MB4148.eurprd08.prod.outlook.com (2603:10a6:208:131::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.21; Mon, 21 Oct 2019 14:41:36 +0000 Received: from VE1EUR03FT057.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::208) by HE1PR0802CA0019.outlook.office365.com (2603:10a6:3:bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2367.21 via Frontend Transport; Mon, 21 Oct 2019 14:41:36 +0000 Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.infradead.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.infradead.org; dmarc=none action=none header.from=arm.com; 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 VE1EUR03FT057.mail.protection.outlook.com (10.152.19.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2305.15 via Frontend Transport; Mon, 21 Oct 2019 14:41:35 +0000 Received: ("Tessian outbound 3fba803f6da3:v33"); Mon, 21 Oct 2019 14:41:29 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ed60c1a4c456ea63 X-CR-MTA-TID: 64aa7808 Received: from 7d88b54680f3.2 (ip-172-16-0-2.eu-west-1.compute.internal [104.47.12.55]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 5894CF18-030A-4947-98C8-0E8D3553D4E5.1; Mon, 21 Oct 2019 14:41:24 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2055.outbound.protection.outlook.com [104.47.12.55]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7d88b54680f3.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 21 Oct 2019 14:41:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AgnvxHwKnjI/ziU5ACjgaOzsx9PQclPPMJA8YzYlyt/ciDS4BBMSqUCRvoZXeGcb33lxP2DIzKqRfmnH7zEaRzEZ80SkYNIDiSHwcTyh4Hgc0W2DdsB/9DSic8xTTgm9wgrtZWoOFwFhN1twu+7NKYYXuCQ7U7T/p4GR6ke1/iYiJJx/iHpBzbm66qCfb6s6LGw00H/AcHp0TLnNZIrm7oz6TmZuafmhkn0UAApu10LbE76ucFl669DsjfGDk93Y7DLoVR+5uxBV/+PeejysZ/2H5EJDmGHf4NM4Z8Ju8yDWDgaHZM6AfkCRRt0QTes+ZEt+8ioryvAyTWaTz264ZA== 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=TLJRHdF9q6qJw1NtpkxrGLUvoEc5KRPwoJ5q8JSx9GyVXOhQQTfJvmQOkLgbIrb2GSslveIBg5bWSoSfFdwdacCr++rQXXptKLEbHS/wM0UaWwTvZbqa0hCh/xVXb9grHx1g21IJDlzQRKSW67uo8pIEig07tO+RlPuARu0KNSPWrhF8xV0kegC7v+wH47+QLospx9iTCpJpRt+Tbnnx10ikkHpBd1MHngN6etKWVrLzAu4nd96V2JojIqk8jBIzihTQbKrDFjTCwWFoxjjhrsoreHq8tzu9P4RH8rMUb9N0YCrUNHGg9vvwyguztFGUmbZ0rcKcVKFL42tFG6pspw== 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 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=GIv7uTU0kafNj3RaBYiBJkuOORdVhqqvW4hMPRFZ0SM=; b=58McUph24A87dDKykTnXM6IaEEQ1ntcjHGfqJEqAriaak0e8vJo0asjJQPafbkqQkdpun0vYeFCtWKSVGgVUbvpEXk9C3NpsGOSyt07XgYZOMbLLAHwzodHxcNXs7yOUvXl4l8lpobblpoAxsvLBvPSqvVIJRh8ft5rnuGiN/Ag= Received: from VI1PR08MB4078.eurprd08.prod.outlook.com (20.178.127.92) by VI1PR08MB3200.eurprd08.prod.outlook.com (52.133.15.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2367.20; Mon, 21 Oct 2019 14:41:22 +0000 Received: from VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::7d25:d1f2:e3eb:868b]) by VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::7d25:d1f2:e3eb:868b%6]) with mapi id 15.20.2367.022; Mon, 21 Oct 2019 14:41:22 +0000 From: Mihail Atanassov To: Ayan Halder Subject: Re: [PATCH 1/2] drm/arm: Factor out generic afbc helpers Thread-Topic: [PATCH 1/2] drm/arm: Factor out generic afbc helpers Thread-Index: AQHVgCWkbVOYIG7/eE2VirVnDYzB4adlLKIAgAAOSIA= Date: Mon, 21 Oct 2019 14:41:22 +0000 Message-ID: <2485717.1SzL54aMiy@e123338-lin> References: <20191011111813.20851-1-andrzej.p@collabora.com> <20191011111813.20851-2-andrzej.p@collabora.com> <20191021135013.GA16072@arm.com> In-Reply-To: <20191021135013.GA16072@arm.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [217.140.106.51] x-clientproxiedby: LO2P265CA0018.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::30) To VI1PR08MB4078.eurprd08.prod.outlook.com (2603:10a6:803:e5::28) Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 9e959dac-a82c-41d2-2a05-08d75634c5da X-MS-Office365-Filtering-HT: Tenant X-MS-TrafficTypeDiagnostic: VI1PR08MB3200:|VI1PR08MB3200:|AM0PR08MB4148: X-MS-Exchange-PUrlCount: 3 x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:8882;OLM:8882; x-forefront-prvs: 0197AFBD92 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(7916004)(4636009)(376002)(136003)(366004)(396003)(39860400002)(346002)(199004)(189003)(51914003)(25786009)(14454004)(6116002)(76176011)(66066001)(8936002)(81156014)(8676002)(2906002)(6636002)(3846002)(6862004)(486006)(30864003)(33716001)(476003)(81166006)(86362001)(478600001)(11346002)(446003)(66476007)(66556008)(64756008)(66446008)(66946007)(966005)(52116002)(26005)(229853002)(99286004)(186003)(316002)(5660300002)(6246003)(7736002)(386003)(102836004)(6486002)(256004)(6512007)(54906003)(14444005)(9686003)(6436002)(4326008)(71190400001)(6506007)(6306002)(71200400001)(305945005)(39026011)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB3200; H:VI1PR08MB4078.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-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Gueo8KR3M2CV4rD/B422vaVZYxZ40UFnmU6X71Bs0+EdKkDrbOC6RSyWdJ7aJ3AIewa1fLv9vovLZQaB18B83nk5X6+7yzt46jDmTEVKNOjAHfVpjJ9GqwjqWD+vk6JdGhCqu0PjZXbprnjfyqgLPu6FHuKg9Kj/djazvGgzOxn8OUrxdcMLKAY3MslKgZS7MIt/ugnoMTB3ufC5j58/iX7jISxXpOCUpJoLw7CcrJ9EokUHoPvxYFWChDM3RmhwdDmY2rwaGZib4Av6diE2rvGokMWtvcY9b9Mf26D/XDIfIQe1wNBHmgR6se7sPG3oPhN1fHVqUM4oFiUZglug2a0/waBdWMc1IC2CVLd+Ck4VkI19nDxN8ZtgtOJTQxOO+Ek7vTTmuKIi7nEHhRmoCsELxeGPem4dBxtaMfm92vQb8fi2ywNLOieJ7agfs8htv11GNAtHB5p+N9v9lzdMlAPrzFxfp5tG5rOntUhtduo= Content-ID: MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3200 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT057.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)(7916004)(376002)(346002)(136003)(396003)(39860400002)(51914003)(199004)(189003)(6306002)(3846002)(6116002)(6486002)(450100002)(5660300002)(229853002)(14444005)(6636002)(99286004)(30864003)(4326008)(6862004)(86362001)(25786009)(76130400001)(6246003)(9686003)(6512007)(8676002)(8936002)(8746002)(81166006)(81156014)(23756003)(7736002)(305945005)(33716001)(47776003)(54906003)(66066001)(386003)(336012)(126002)(11346002)(186003)(50466002)(36906005)(316002)(22756006)(70586007)(70206006)(14454004)(966005)(63350400001)(476003)(26826003)(486006)(76176011)(102836004)(26005)(2906002)(478600001)(446003)(356004)(6506007)(39026011)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR08MB4148; 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: fef1fec5-de0d-4170-0869-08d75634be21 NoDisclaimer: True X-Forefront-PRVS: 0197AFBD92 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iEcMTu5zETAsAbgyjQZdWioZ7CcDBfu7o+bBjLuYFAcZ4QbOSvYGr5LrvtNGfDs8IjZlUjzcNw5eOk0SueWvGptouhG1+a4cZ6SiZdy1bOvIPTiBivvtZjo+f9YhE98Pr1/kmndpYtPly0rjWdweIzh7MjBWV6clzDsqeEwxVkEK83BS561H2xkLwQTJzqcRw5MaqzrwYr0ms4jtKjZI5T8fVCJ71pdcXfV6/2L63W+5lj2fs0ZaAh6nq2ro+wVfaHkiH6VLdNcuHdkmDn2RaXr9u9GNxB9iPnENar7DPWfQiDhLt2rLXTq+Xb1haIqFV5p6T3iRPK4TxgpjQDGUQnKQoFk0wPfHt8Xx4e1hgJZGcBRWoc8gKd0KqkKXUiJ3LQvY1tpRYO8KFccGGC/BIUJ//DNLX6oEwhpFhD4OFDKT7u6dAVtdpk4B5JiY2skKO29JTpSm5MgU/nrfwFoF1w== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2019 14:41:35.1890 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e959dac-a82c-41d2-2a05-08d75634c5da 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: AM0PR08MB4148 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_074143_581212_413EAA99 X-CRM114-Status: GOOD ( 19.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd , David Airlie , Liviu Dudau , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Andrzej Pietrasiewicz , "linux-rockchip@lists.infradead.org" , "james qian wang \(Arm Technology China\)" , "kernel@collabora.com" , Sean Paul , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Andrzej, On Monday, 21 October 2019 14:50:14 BST Ayan Halder wrote: > On Fri, Oct 11, 2019 at 01:18:10PM +0200, Andrzej Pietrasiewicz wrote: > > These are useful for other users of afbc, e.g. rockchip. > > = > > Signed-off-by: Andrzej Pietrasiewicz > = > Hi Andrzej, > = > Thanks a lot for doing this. Much appreciated. :) > It was on our TODO list for a long time. Seconded, thanks for the patch! > = > I have cc-ed james.qian.wang@arm.com, Mihail.Atanassov@arm.com for > their comments as well. > = > > --- > > drivers/gpu/drm/Kconfig | 4 ++ > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/arm/Kconfig | 1 + > > drivers/gpu/drm/arm/malidp_drv.c | 58 ++-------------- > > drivers/gpu/drm/drm_afbc.c | 114 +++++++++++++++++++++++++++++++ > > include/drm/drm_afbc.h | 25 +++++++ > > 6 files changed, 149 insertions(+), 54 deletions(-) > > create mode 100644 drivers/gpu/drm/drm_afbc.c > > create mode 100644 include/drm/drm_afbc.h > > = > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index 3c88420e3497..00e3f90557f4 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -195,6 +195,10 @@ config DRM_SCHED > > tristate > > depends on DRM > > = > > +config DRM_AFBC > > + tristate > > + depends on DRM > Adding a 'help' would be great here. Stealing the first line from > https://www.kernel.org/doc/html/latest/gpu/afbc.html > = > "AFBC is a proprietary lossless image compression protocol and format. > It provides fine-grained random access and minimizes the amount of > data transferred between IP blocks." > = > > + > > source "drivers/gpu/drm/i2c/Kconfig" > > = > > source "drivers/gpu/drm/arm/Kconfig" > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > > index 9f0d2ee35794..55368b668355 100644 > > --- a/drivers/gpu/drm/Makefile > > +++ b/drivers/gpu/drm/Makefile > > @@ -31,6 +31,7 @@ drm-$(CONFIG_OF) +=3D drm_of.o > > drm-$(CONFIG_AGP) +=3D drm_agpsupport.o > > drm-$(CONFIG_DEBUG_FS) +=3D drm_debugfs.o drm_debugfs_crc.o > > drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) +=3D drm_edid_load.o > > +drm-$(CONFIG_DRM_AFBC) +=3D drm_afbc.o > > = > > drm_vram_helper-y :=3D drm_gem_vram_helper.o \ > > drm_vram_helper_common.o \ > > diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig > > index a204103b3efb..25c3dc408cda 100644 > > --- a/drivers/gpu/drm/arm/Kconfig > > +++ b/drivers/gpu/drm/arm/Kconfig > > @@ -29,6 +29,7 @@ config DRM_MALI_DISPLAY > > select DRM_KMS_HELPER > > select DRM_KMS_CMA_HELPER > > select DRM_GEM_CMA_HELPER > > + select DRM_AFBC > > select VIDEOMODE_HELPERS > > help > > Choose this option if you want to compile the ARM Mali Display > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/mal= idp_drv.c > > index f25ec4382277..a67b69e08f63 100644 > > --- a/drivers/gpu/drm/arm/malidp_drv.c > > +++ b/drivers/gpu/drm/arm/malidp_drv.c This file is GPL-2.0-only. Shouldn't this be preserved when the substantive bit of the code in drm_afbc.c comes from here? > > @@ -16,6 +16,7 @@ > > #include > > = > > #include > > +#include > > #include > > #include > > #include > > @@ -33,8 +34,6 @@ > > #include "malidp_hw.h" > > = > > #define MALIDP_CONF_VALID_TIMEOUT 250 > > -#define AFBC_HEADER_SIZE 16 > > -#define AFBC_SUPERBLK_ALIGNMENT 128 > > = > > static void malidp_write_gamma_table(struct malidp_hw_device *hwdev, > > u32 data[MALIDP_COEFFTAB_NUM_COEFFS]) > > @@ -275,24 +274,8 @@ malidp_verify_afbc_framebuffer_caps(struct drm_dev= ice *dev, > > mode_cmd->modifier[0]) =3D=3D false) > > return false; > > = > > - if (mode_cmd->offsets[0] !=3D 0) { > > - DRM_DEBUG_KMS("AFBC buffers' plane offset should be 0\n"); > > - return false; > > - } > > - > > - switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) { > > - case AFBC_SIZE_16X16: > > - if ((mode_cmd->width % 16) || (mode_cmd->height % 16)) { > > - DRM_DEBUG_KMS("AFBC buffers must be aligned to 16 pixels\n"); > > - return false; > > - } > > - break; > > - default: > > - DRM_DEBUG_KMS("Unsupported AFBC block size\n"); > > - return false; > > - } > > - > > - return true; > > + return drm_afbc_check_offset(dev, mode_cmd) && > > + drm_afbc_check_size_align(dev, mode_cmd); > > } > > = > > static bool > > @@ -300,53 +283,20 @@ malidp_verify_afbc_framebuffer_size(struct drm_de= vice *dev, > > struct drm_file *file, > > const struct drm_mode_fb_cmd2 *mode_cmd) > > { > > - int n_superblocks =3D 0; > > const struct drm_format_info *info; > > struct drm_gem_object *objs =3D NULL; > > - u32 afbc_superblock_size =3D 0, afbc_superblock_height =3D 0; > > - u32 afbc_superblock_width =3D 0, afbc_size =3D 0; > > int bpp =3D 0; > > = > > - switch (mode_cmd->modifier[0] & AFBC_SIZE_MASK) { > > - case AFBC_SIZE_16X16: > > - afbc_superblock_height =3D 16; > > - afbc_superblock_width =3D 16; > > - break; > > - default: > > - DRM_DEBUG_KMS("AFBC superblock size is not supported\n"); > > - return false; > > - } > > - > > info =3D drm_get_format_info(dev, mode_cmd); > > - > > - n_superblocks =3D (mode_cmd->width / afbc_superblock_width) * > > - (mode_cmd->height / afbc_superblock_height); > > - > > bpp =3D malidp_format_get_bpp(info->format); > > = > > - afbc_superblock_size =3D (bpp * afbc_superblock_width * afbc_superblo= ck_height) > > - / BITS_PER_BYTE; > > - > > - afbc_size =3D ALIGN(n_superblocks * AFBC_HEADER_SIZE, AFBC_SUPERBLK_A= LIGNMENT); > > - afbc_size +=3D n_superblocks * ALIGN(afbc_superblock_size, AFBC_SUPER= BLK_ALIGNMENT); > > - > > - if ((mode_cmd->width * bpp) !=3D (mode_cmd->pitches[0] * BITS_PER_BYT= E)) { > > - DRM_DEBUG_KMS("Invalid value of (pitch * BITS_PER_BYTE) (=3D%u) " > > - "should be same as width (=3D%u) * bpp (=3D%u)\n", > > - (mode_cmd->pitches[0] * BITS_PER_BYTE), > > - mode_cmd->width, bpp); > > - return false; > > - } > > - > > objs =3D drm_gem_object_lookup(file, mode_cmd->handles[0]); > > if (!objs) { > > DRM_DEBUG_KMS("Failed to lookup GEM object\n"); > > return false; > > } > > = > > - if (objs->size < afbc_size) { > > - DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size =3D = %u\n", > > - objs->size, afbc_size); > > + if (!drm_afbc_check_fb_size(dev, mode_cmd, objs, bpp)) { > > drm_gem_object_put_unlocked(objs); > > return false; > > } > Also can you do the code refactoring for komeda driver as well. > specifically komeda_fb_afbc_size_check(). I will let > james.qian.wang@arm.com and Mihail.Atanassov@arm.com have their > opinion on this. I'd say that it'd be really nice to get this work done for us ;) but it doesn't have to be in this patch but rather in a follow-up. > = > > diff --git a/drivers/gpu/drm/drm_afbc.c b/drivers/gpu/drm/drm_afbc.c > > new file mode 100644 > > index 000000000000..3e8a9225fd2e > > --- /dev/null > > +++ b/drivers/gpu/drm/drm_afbc.c > > @@ -0,0 +1,114 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * (C) 2019 Collabora Ltd. > > + * > > + * author: Andrzej Pietrasiewicz > > + * > > + */ > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define AFBC_HEADER_SIZE 16 > > +#define AFBC_SUPERBLK_ALIGNMENT 128 > > + > > +bool drm_afbc_check_offset(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd) > > +{ > > + if (mode_cmd->offsets[0] !=3D 0) { > > + DRM_DEBUG_KMS("AFBC buffers' plane offset should be 0\n"); > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL_GPL(drm_afbc_check_offset); > > + > > +bool drm_afbc_check_size_align(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd) > > +{ > > + > > + switch (mode_cmd->modifier[0] & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) { > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16: > > + if ((mode_cmd->width % 16) || (mode_cmd->height % 16)) { > > + DRM_DEBUG_KMS( > > + "AFBC buffer must be aligned to 16 pixels\n" > > + ); > > + return false; > > + } > > + break; > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_64x4: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4: > > + /* fall through */ > > + default: > > + DRM_DEBUG_KMS("Unsupported AFBC block size\n"); > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL_GPL(drm_afbc_check_size_align); > > + > > +bool drm_afbc_check_fb_size(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd, > > + struct drm_gem_object *objs, int bpp) > > +{ > > + int n_superblocks =3D 0; > > + u32 afbc_superblock_size =3D 0, afbc_superblock_height =3D 0; > > + u32 afbc_superblock_width =3D 0, afbc_size =3D 0; > > + > > + switch (mode_cmd->modifier[0] & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) { > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16: > > + afbc_superblock_height =3D 16; > > + afbc_superblock_width =3D 16; > > + break; > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8: > Copying from > https://cgit.freedesktop.org/drm/drm-tip/tree/drivers/gpu/drm/arm/display= /komeda/komeda_framebuffer.c#n60 > afbc_superblock_width =3D 32; > afbc_superblock_height =3D 8; > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_64x4: > > + /* fall through */ > > + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4: > > + /* fall through */ > > + default: > > + DRM_DEBUG_KMS("AFBC superblock size is not supported\n"); > > + return false; > > + } > Can you combine the two switch - case confitions (from this function > and the one in drm_afbc_check_size_align()) and put it in a separate > function (say drm_afbc_get_superblock_dimensions()) of its own ? > This will help to avoid code repetition. > = I'm personally a bit on the fence about this - functions should ideally do one thing. That shared helper would be both getting the dimensions _and_ checking the mode_cmd is valid, so one place cares about one half of the function's results, and the other - the second half. =AF\_O_/=AF, opinions, everybody has them :). > > + > > + n_superblocks =3D (mode_cmd->width / afbc_superblock_width) * > > + (mode_cmd->height / afbc_superblock_height); > > + > > + afbc_superblock_size =3D > > + (bpp * afbc_superblock_width * afbc_superblock_height) > > + / BITS_PER_BYTE; > > + > > + afbc_size =3D ALIGN(n_superblocks * AFBC_HEADER_SIZE, > > + AFBC_SUPERBLK_ALIGNMENT); > > + afbc_size +=3D n_superblocks * > > + ALIGN(afbc_superblock_size, AFBC_SUPERBLK_ALIGNMENT); > > + > > + if ((mode_cmd->width * bpp) !=3D (mode_cmd->pitches[0] * BITS_PER_BYT= E)) { > > + DRM_DEBUG_KMS("Invalid value of (pitch * BITS_PER_BYTE) (=3D%u) shou= ld be same as width (=3D%u) * bpp (=3D%u)\n", > > + mode_cmd->pitches[0] * BITS_PER_BYTE, > > + mode_cmd->width, bpp > > + ); > > + return false; > > + } > > + > > + if (objs->size < afbc_size) { > > + DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size =3D = %u\n", > > + objs->size, afbc_size > > + ); > > + > > + return false; > > + } > > + > > + return true; > > +} > > +EXPORT_SYMBOL(drm_afbc_check_fb_size); > > diff --git a/include/drm/drm_afbc.h b/include/drm/drm_afbc.h > > new file mode 100644 > > index 000000000000..ce39c850217b > > --- /dev/null > > +++ b/include/drm/drm_afbc.h > > @@ -0,0 +1,25 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * (C) 2019 Collabora Ltd. > > + * > > + * author: Andrzej Pietrasiewicz > > + * > > + */ > > +#ifndef __DRM_AFBC_H__ > > +#define __DRM_AFBC_H__ > > + > > +struct drm_device; > > +struct drm_mode_fb_cmd2; > > +struct drm_gem_object; > > + > > +bool drm_afbc_check_offset(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd); > > + > > +bool drm_afbc_check_size_align(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd); > > + > > +bool drm_afbc_check_fb_size(struct drm_device *dev, > > + const struct drm_mode_fb_cmd2 *mode_cmd, > > + struct drm_gem_object *objs, int bpp); > > + > > +#endif /* __DRM_AFBC_H__ */ > > -- > > 2.17.1 > > = > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > = Overall the patch LGTM as-is, nice and straightforward mostly-cut-n-paste, just let's sort out the SPDX identifier question I have, then I'll be happy. -- = Mihail _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel