Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9A770C04A94 for ; Wed, 2 Aug 2023 10:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bUcRT3YYUtVaWtoA3oQrn5k07fJOUiGW8EeLd9DKP+Q=; b=kZoQcZUdN4o5Ew eanZyySzlYAsUNuYvAoMb7RfPUpjftpjFsi8MkxedduXiF8AlEigBa0HIGrcNo/3vrkR1w/zuhfie YKv0PWkzrg48j8gd7ty7m3pCFpiPXpg0FTnZkim0j2YHdhGVG3Ax6rHL3sq9vI65i02IJiRbagBJA ipjQ6VFsZFm/fkCm5XQL2jgktFAnBhetyfyHV65sxDGR9P7UtwfnknpAb8cibDPAotqcVpriGjdOh Oav+dYNin0rnhud+aPDYez+iKuSfqnFywGiz61uuiBAI0crPuN00KMiQ6iXO89H/WlTdS8jYXZ0Kp bkDEPjsq09QEWdzEwmhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qR9GB-004c7q-30; Wed, 02 Aug 2023 10:39:19 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qR9G6-004c6d-31 for linux-arm-kernel@lists.infradead.org; Wed, 02 Aug 2023 10:39:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1690972754; x=1722508754; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=rySMGvM6Ibnsu5ArZs3AWeRSrSwBPdE1Ny4MHQ4j19Q=; b=cRlJTk7EH0gJZeDZdjvOnT+QtxV1LKgD9MnzlceuxX4ehv706wrMZydG C6yMhKgzo2m/6yZVFid+SoqV3sAGf4UVZu4fyF4WBwgNQ/mym+hFSF1qq xgzznCJAc6hD9TFoDrEagGgN2Aa8eRVsS+EIINitbVKZ3IdWIKLLKTEJV cC0kBPYjNZNVeIBgocQ9QXf6RiolBSBgOQn60rYoqqC3CBHXWaG845Uac s+OJxzSPpGsAYF5ppxoZRMyLZUgscEn3O+NIDVU5W5IA/WWX755yjXAx5 v28VXgji8R6bEpiggDqFBtvWu9Dt0lsuFd773PIF1gCPLXtl6ZwVMGYF7 A==; X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="239332194" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 02 Aug 2023 03:39:10 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 2 Aug 2023 03:39:05 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Wed, 2 Aug 2023 03:39:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B6a/lvAmRFy0nYgW6vN+MyXQjo2yR8QjkjZY0ShHKN6SmkBWYakezfmwSLzw1jlj0MgyqLq2h0zqNj0v4pj0PZHVu+13Oc9kC9vTX+/ecuayQAFZzrWQu01rvVJ/vq5Zs5MNIU4U5H3KqaaHO/zxSYJBv8XBBHrTW84viVe+N4OXW2NcTBu6jsA92XTJzAKIK7TXricmu6pcmliN1SwIPJgHdwQyAQPnJHhZA3YnF6wJV9tQ/nLDC4Jx/eo/sOGE6UC5FgRQ4nRAZyjraWp8PKxllgEBCKU0rNrCYNH6W4yXvdfxDWMxwsCP1hCbEHbB9ExValmgGE23JU6LxA7HLA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rySMGvM6Ibnsu5ArZs3AWeRSrSwBPdE1Ny4MHQ4j19Q=; b=An7K64PwM8dRHjwVTCNg1C71tMv/FEcT6cEbmXrYsgRcSdLxkHbM81MRgHyjCIpbbhsleoZbjvwAXg/4cte6EbrOdG4x/gNOGKVh1ZgnLikIrg/F3p0J5lWtTUEj5Jc4lzs/zEOiKUCCbmPdGmK/Jf4xfsZmLD+o/Jq7rtJ8WcGS29mNX9yQNdeULhfcl79jKAj8w24QDfwwADgzmX7DGGU+rSqtPQGB9RQw3iUocM1Y2aXIqpVV9JL2mItX1sSjVUmnXR2svEZ20zYmKchKZJZ5kQf5tSdoC8B1FDx1we+SfWSUHwKx/Ofo4OYLWzi5w49IvEOm9Vjqsq4z6lthLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rySMGvM6Ibnsu5ArZs3AWeRSrSwBPdE1Ny4MHQ4j19Q=; b=T+eQ2Ams3oGaZeib6mK9LNoSLQJ/qVsZtGup3t3TJy/OEuJQRq3NbXfr1dj7VRz5aTp2d/CNb7Lv+2YXtTy5bltGR4+kVfRkrqWZhVT4fas/EfCmTsibuo6J+ekjfV1Eb/gl7Ir+BFmRc0BsrnXTEJ0cPpwX/DjgsfD66SrYY1c= Received: from DM6PR11MB4185.namprd11.prod.outlook.com (2603:10b6:5:195::29) by PH7PR11MB8251.namprd11.prod.outlook.com (2603:10b6:510:1a9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 10:39:02 +0000 Received: from DM6PR11MB4185.namprd11.prod.outlook.com ([fe80::591f:32f4:3319:e1f8]) by DM6PR11MB4185.namprd11.prod.outlook.com ([fe80::591f:32f4:3319:e1f8%7]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 10:39:02 +0000 From: To: , , , , , , , , , , , , , , , CC: , , , , , Subject: Re: [PATCH v2 6/9] drm: atmel_hlcdc: Add support for XLCDC in atmel LCD driver Thread-Topic: [PATCH v2 6/9] drm: atmel_hlcdc: Add support for XLCDC in atmel LCD driver Thread-Index: AQHZtGqBLPDFAnruw027OonLO3SUkq/W8kgA Date: Wed, 2 Aug 2023 10:39:02 +0000 Message-ID: <7963595c-918b-1cc4-c8c6-b7668e62dfd5@microchip.com> References: <20230712024017.218921-1-manikandan.m@microchip.com> <20230712024017.218921-7-manikandan.m@microchip.com> In-Reply-To: <20230712024017.218921-7-manikandan.m@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microchip.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB4185:EE_|PH7PR11MB8251:EE_ x-ms-office365-filtering-correlation-id: 63f5d2d8-317c-4385-d62d-08db9344b006 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ijKNE4OI6OZyOz53igzRY3cDde5ui8MJUmXvMd+jsmmcsEazMyuQBjBUNxX7zbkPAyGtgvW0AytvHQ8B2W7CcFp+/9Y3bH2UAu+CWsbBsMWUYEHijxKziMCoXZXxmXHoe50ASqBERHvuDQPQk/yG9p7LDX+Ib1+AlgbguJE/OnvmegXQMxCxXy8SoJFGywu1lkRrQR59MdGMJ3M/43IH6aTGBWPtY7kx8s+DLNgfR96HWLYO3Q4J6BbTxaaMG34mZVKAqBoclOfePzomYZOM5xVTTY911AfdK6uGEUViOj4/GXWKFAVgBn6tx9epU/W7MKK/4K/XWlQpCrWPqIszXpZLZ023urxZdeHYqGQ4y66csnHR26R/xZ+r7hJ5Fvf9Wq32mFYgZk555uBkjD5hf/kj242200dj9bLplUZTj4d5MVMp7EeH93PkA61Ndwgrycj6jr3VTB1qOwKek8vz+V5y6Fy9c+ys4p/Q+QtLinnBciMhJmQJst1G0zxDzUadWen6v6KxNzg8wvRhF4E6TtSL6qn5bMc1D5kQwJD7LY1Cf5Dtl5m203mJpu2y5M+xgmDSKbNHogSSdCcA7XBDCGgFOON9+Rtak7hZ0tKbZZSEb3I2jwnhMdfx9eP0tyXP1dMd5Z/brImMQ1/Ty3l1/hxP+iHxDzf4PdGhHSrCo2tGrZ2tvVr/JWSiSB3dWd9P x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4185.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(346002)(396003)(366004)(376002)(451199021)(2616005)(107886003)(53546011)(26005)(6506007)(83380400001)(186003)(30864003)(316002)(4326008)(76116006)(66946007)(66556008)(91956017)(2906002)(64756008)(66446008)(66476007)(5660300002)(7416002)(41300700001)(8676002)(8936002)(71200400001)(6486002)(6512007)(54906003)(478600001)(110136005)(38100700002)(921005)(122000001)(31696002)(86362001)(36756003)(38070700005)(31686004)(21314003)(45980500001)(579004)(559001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?N3QvRFRPM01xT0RyaUFYQ3RmcGE0ZlBtUmljRjdqL2IrVnZiYmRySzQ4ODJw?= =?utf-8?B?YzdyNXpMc0d2cXN0bFhIZU9INEtnME04cmdQS2VmdGFiSmhnWnI1cDRha282?= =?utf-8?B?cENjR1ByM25IYk1IWldobXpTMllmMjl1MjZWNDYyNEZkekJOVW5xbkZxWkx2?= =?utf-8?B?U2FQR2h1b3M5eHJ4VGlXeFZEMUxua3dXM0REMTQwdFNKSmZKS1dua3JPQlM3?= =?utf-8?B?QmYrYVJVUWhRZktRZDVHZCszanNnNkp1QVJnemtIT1pidy9wZ0FhenJPNVN4?= =?utf-8?B?c0FiMkRmN3BXR1lJVlBkanRnQTl0VGdXS0JDdFJ0RjNwQnJyTzBlcWhjZW82?= =?utf-8?B?cEhCMHRZNDFSRzdaaDlXbllWaktWQUt2L0d1L1F0MmUxNVlTOEh1Z2Y4UUVV?= =?utf-8?B?TjVwK25DNmpYVlp1ZUsvdFJKMFlyS1p2bEtSWlpxOHpPdEhQNDRWWFJ0alkw?= =?utf-8?B?OXlDM252R0tuSGVnZld3cDQ0MHpiL20xOFVIMW4yZmppTDNiTDM4cVhKN0Zt?= =?utf-8?B?cGpQYjV1SllVYjE2ZjFkY21kc0t3dW5MMm5JK0FWOTJaamUvdXFHcStST3hD?= =?utf-8?B?Um5uME9NcmZMVDVvWEt1RGVPc05BcS8wNWFQbS9mRC9QQUR3V2RCQ1BiV2Fk?= =?utf-8?B?bW92K3ZPZWUrMUM1NTd1Q3VIbTIvZXdRUlVKdzN5bUlIeFlNbDhNanhZemdS?= =?utf-8?B?M2hHMWR2RTdrbGdMcTJFdVpGQTdWeHNxSzJoVTU4VEp1M3VZRnYvNytLUEhV?= =?utf-8?B?OXBtS3h3UFZLM05MOENqSEN0R05MVWxMUWx4bVJvTWJ6QWhZbFdDb3hmcWNM?= =?utf-8?B?UzBLTVdwNGMzT09vMitRNWFua3d4OGRtWGdXTDI2eWpvUkgyblNnNThuWTJZ?= =?utf-8?B?QUs3VitKbjhteVk3eUdqakhQS1I4YnhaRmNady9lUDFiS3FQazdVUU00Nitt?= =?utf-8?B?K2VTRm85dzcxa2JTNUNyN3czMFlTR0VNVXBmWkR0eTdmelE1SjRrck1SVUdJ?= =?utf-8?B?b0Q2Z3RtT2RKeGErOUVhT3R1TkgxdnFLZGpPZDFrcXlGZ0FRS2hhbHNaTjR1?= =?utf-8?B?M0VsS1ZYd016WmlCMHVzWkd4bytsckNSdGNnc2RlN2U2VDF6bDhLdUh4cmVn?= =?utf-8?B?K3JjYTVUMzJKSXdiMEo3TWVGd0tQL2syU0JQYm1iRFFmbzNuUFEya1pyMDBV?= =?utf-8?B?WG1lbnBOdHVYTWFNUVAzN251bGRTdGlXU2FYZEYwMldOYWw1aHYzMmcvZW1G?= =?utf-8?B?MlB2Mkc1QUVMUGFkY0NrQ3BYQ1h2bmkwWHhiQXhLeFZocVB1MGpCWmJNeGFm?= =?utf-8?B?ZTJBVnl1Q0MvZEVFWlMzQkwwNzRtcWpyWHZERlpvTHJFR0ZJQlR5Mmw4U3lC?= =?utf-8?B?bkVOR3IzdUFBRm9lVUh3NkpWTE03SkdYOVpMNzNkbnJkc2JGNnJhUTYvUjEy?= =?utf-8?B?N3lzMnpEZjFVL2lSK1ZoeHY0b3lEVnlDOHpvQXpUTWFydHM3eHBnMVdQL0ZN?= =?utf-8?B?QTVucGtaUVdUMisvUWNkWFF2WXJ1anBpdkk1eGp3NDRGSmJHYndFaCswYXI4?= =?utf-8?B?S3VvZTEvL1FGVTVKclNVYTVobnRReGhiYU1JdFJ5VTBzWjFQRjEwOUloSm52?= =?utf-8?B?SGpvUkVaZDZCNjcySzMvUmFmbXRPV3piUmw5dGRxeEpXLzVGcS9VVHF4SFQv?= =?utf-8?B?OUdNWklSbStSTXQrdG9tTHFKdWlXaGlvdWRKYXROaUdkVERhZnlGaWpqbjdI?= =?utf-8?B?TXdLNU1mV05LSU0wcXkwdFhyMWdoNExOOFZaMy85WitOZDM2NDVQWEM4RnZw?= =?utf-8?B?TEJuN0xWN1U2WklJOW9mYnJWbGVORmZablN0VjZSditMWTVJNGNvSWRCZzJ2?= =?utf-8?B?ZmlwSzRSa2VzVmtYc1owbkhLOU9oVzhzeXJiUnR0TVRJWnBwY29uZGgrU1My?= =?utf-8?B?Rzc0R1ZTajZJa2p2WXRLbVFLMDM0VW96K1BrZ0pXZ1VTS1YySDlFWUxHcWdF?= =?utf-8?B?YTYrQXpHR1IvM1EycHBpdDA2YVRGU1NjMW5UYkN6YjZpTUNpcys3Zkd3UnVh?= =?utf-8?B?YTZORUhHTHE2Rmp5VVJOaEFQdGNEdDFJSm1lditkMklNL3JKK1Z2Ulh2RE5P?= =?utf-8?B?VXI5MFpOZG91VldsSlJUOERBa2Erb3RCcnZabi9rV2xrc1RtbXI4VmpCaUFU?= =?utf-8?B?aUE9PQ==?= Content-ID: <466FB12FF4D6CF47B36ADE42F8396E60@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4185.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63f5d2d8-317c-4385-d62d-08db9344b006 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2023 10:39:02.3353 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: +LZASjQMJx0ifEKVaYh/drctIS+3R7KQLzUmzvJMPwu1g+hpbpsTlqbF8ZthL4tD85zdGss6LM59cBI1BUtBOEohBbYMhqCgu5AktoyjzGU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB8251 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230802_033915_150720_BF682DE3 X-CRM114-Status: GOOD ( 22.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/07/23 8:10 am, Manikandan Muralidharan wrote: > - XLCDC in SAM9X7 has different sets of registers and additional > configuration bits when compared to previous HLCDC IP. Read/write > operation on the controller registers is now separated using the > XLCDC status flag. > - HEO scaling, window resampling, Alpha blending, YUV-to-RGB > conversion in XLCDC is derived and handled using additional > configuration bits and registers. > - Writing one to the Enable fields of each layer in LCD_ATTRE > is required to reflect the values set in Configuration, FBA, Enable > registers of each layer > > Signed-off-by: Manikandan Muralidharan > Co-developed-by: Hari Prasath Gujulan Elango > Signed-off-by: Hari Prasath Gujulan Elango > Co-developed-by: Durai Manickam KR > Signed-off-by: Durai Manickam KR > --- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 32 +- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 337 +++++++++++++++--- > 2 files changed, 312 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index 58184cd6ab0b..27f86cea8bff 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -139,10 +139,10 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) > state = drm_crtc_state_to_atmel_hlcdc_crtc_state(c->state); > cfg = state->output_mode << 8; > > - if (adj->flags & DRM_MODE_FLAG_NVSYNC) > + if (!crtc->dc->desc->is_xlcdc && (adj->flags & DRM_MODE_FLAG_NVSYNC)) Instead of de-referencing the value of is_xlcdc flag multiple times, can we have it assigned to a local variable instead to make it more readable and avoid multiple memory accesses ? > cfg |= ATMEL_HLCDC_VSPOL; > > - if (adj->flags & DRM_MODE_FLAG_NHSYNC) > + if (!crtc->dc->desc->is_xlcdc && (adj->flags & DRM_MODE_FLAG_NHSYNC)) > cfg |= ATMEL_HLCDC_HSPOL; > > regmap_update_bits(regmap, ATMEL_HLCDC_CFG(5), > @@ -177,6 +177,20 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c, > > pm_runtime_get_sync(dev->dev); > > + if (crtc->dc->desc->is_xlcdc) { > + regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_XLCDC_CM); > + if (!regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status, > + !(status & ATMEL_XLCDC_CM), 10, > + 0)) > + cpu_relax(); cpu_relax() is not required here and at other places below since the above function yields the cpu anyway,remove them. > + > + regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_XLCDC_SD); > + if (!regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status, > + status & ATMEL_XLCDC_SD, 10, > + 0)) > + cpu_relax(); > + } > + > regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_DISP); > while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) && > (status & ATMEL_HLCDC_DISP)) > @@ -231,6 +245,20 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, > !(status & ATMEL_HLCDC_DISP)) > cpu_relax(); > > + if (crtc->dc->desc->is_xlcdc) { > + regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_XLCDC_CM); > + if (!regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status, > + status & ATMEL_XLCDC_CM, 10, > + 0)) > + cpu_relax(); > + > + regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_XLCDC_SD); > + if (!regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status, > + !(status & ATMEL_XLCDC_SD), 10, > + 0)) > + cpu_relax(); > + } > + > pm_runtime_put_sync(dev->dev); > > } > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > index daa508504f47..81f103b1a51f 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > @@ -330,11 +330,59 @@ static void atmel_hlcdc_plane_setup_scaler(struct atmel_hlcdc_plane *plane, > yfactor)); > } > > +static void atmel_xlcdc_plane_setup_scaler(struct atmel_hlcdc_plane *plane, > + struct atmel_hlcdc_plane_state *state) > +{ > + const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + u32 xfactor, yfactor; > + > + if (!desc->layout.scaler_config) > + return; > + > + if (state->crtc_w == state->src_w && state->crtc_h == state->src_h) { > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.scaler_config, 0); > + return; > + } > + > + /* xfactor = round[(2^20 * XMEMSIZE)/XSIZE)] */ > + xfactor = (1048576 * state->src_w) / state->crtc_w; Use the left shift operator to represent 2^20. The comment says we need to round off the result of this math operation but the actual code doesn't implement this.Look for kernel macro's that does this.Shouldn't the variables xfactor & yfactor below be declared as u64 ? > + > + /* yfactor = round[(2^20 * YMEMSIZE)/YSIZE)] */ > + yfactor = (1048576 * state->src_h) / state->crtc_h; > + > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config, > + ATMEL_XLCDC_LAYER_VSCALER_LUMA_ENABLE | > + ATMEL_XLCDC_LAYER_VSCALER_CHROMA_ENABLE | > + ATMEL_XLCDC_LAYER_HSCALER_LUMA_ENABLE | > + ATMEL_XLCDC_LAYER_HSCALER_CHROMA_ENABLE); > + > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 1, > + yfactor); > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 3, > + xfactor); > + > + /* As per YCbCr window resampling configuration */ > + if (state->base.fb->format->format == DRM_FORMAT_YUV420) { > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 2, > + yfactor / 2); > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 4, > + xfactor / 2); > + } else { > + /* As per ARGB window resampling configuration */ > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 2, > + yfactor); > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.scaler_config + 4, > + xfactor); > + } > +} > + > static void > atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane, > struct atmel_hlcdc_plane_state *state) > { > const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; > > if (desc->layout.size) > atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.size, > @@ -352,7 +400,10 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane, > ATMEL_HLCDC_LAYER_POS(state->crtc_x, > state->crtc_y)); > > - atmel_hlcdc_plane_setup_scaler(plane, state); > + if (dc->desc->is_xlcdc) > + atmel_xlcdc_plane_setup_scaler(plane, state); > + else > + atmel_hlcdc_plane_setup_scaler(plane, state); > } > > static void > @@ -393,6 +444,40 @@ atmel_hlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane, > cfg); > } > > +static void > +atmel_xlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane, > + struct atmel_hlcdc_plane_state *state) > +{ > + unsigned int cfg; > + const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + const struct drm_format_info *format = state->base.fb->format; > + > + atmel_hlcdc_layer_write_cfg(&plane->layer, ATMEL_XLCDC_LAYER_DMA_CFG, > + ATMEL_HLCDC_LAYER_DMA_BLEN_INCR16 | state->ahb_id); > + > + cfg = ATMEL_XLCDC_LAYER_DMA | ATMEL_XLCDC_LAYER_REP; > + > + if (plane->base.type != DRM_PLANE_TYPE_PRIMARY) { > + /* > + * Alpha Blending bits specific to SAM9X7 SoC > + */ > + cfg |= ATMEL_XLCDC_LAYER_SFACTC_A0_MULT_AS | > + ATMEL_XLCDC_LAYER_SFACTA_ONE | > + ATMEL_XLCDC_LAYER_DFACTC_M_A0_MULT_AS | > + ATMEL_XLCDC_LAYER_DFACTA_ONE; > + if (format->has_alpha) > + cfg |= ATMEL_XLCDC_LAYER_A0(0xff); > + else > + cfg |= ATMEL_XLCDC_LAYER_A0(state->base.alpha); > + } > + > + if (state->disc_h && state->disc_w) > + cfg |= ATMEL_XLCDC_LAYER_DISCEN; > + > + atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.general_config, > + cfg); > +} > + > static void atmel_hlcdc_plane_update_format(struct atmel_hlcdc_plane *plane, > struct atmel_hlcdc_plane_state *state) > { > @@ -437,36 +522,55 @@ static void atmel_hlcdc_plane_update_clut(struct atmel_hlcdc_plane *plane, > } > } > > +static void update_hlcdc_buffers(struct atmel_hlcdc_plane *plane, > + struct atmel_hlcdc_plane_state *state, u32 sr, int i) > +{ > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_HLCDC_LAYER_PLANE_HEAD(i), > + state->dscrs[i]->self); > + > + if (!(sr & ATMEL_HLCDC_LAYER_EN)) { > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_HLCDC_LAYER_PLANE_ADDR(i), > + state->dscrs[i]->addr); > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_HLCDC_LAYER_PLANE_CTRL(i), > + state->dscrs[i]->ctrl); > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_HLCDC_LAYER_PLANE_NEXT(i), > + state->dscrs[i]->self); > + } > +} > + > +static void update_xlcdc_buffers(struct atmel_hlcdc_plane *plane, > + struct atmel_hlcdc_plane_state *state, int i) > +{ > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_XLCDC_LAYER_PLANE_ADDR(i), > + state->dscrs[i]->addr); > +} > + > static void atmel_hlcdc_plane_update_buffers(struct atmel_hlcdc_plane *plane, > - struct atmel_hlcdc_plane_state *state) > + struct atmel_hlcdc_plane_state *state) > { > const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; > struct drm_framebuffer *fb = state->base.fb; > u32 sr; > int i; > > - sr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHSR); > + if (!dc->desc->is_xlcdc) > + sr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHSR); > > for (i = 0; i < state->nplanes; i++) { > struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i); > > state->dscrs[i]->addr = gem->dma_addr + state->offsets[i]; > > - atmel_hlcdc_layer_write_reg(&plane->layer, > - ATMEL_HLCDC_LAYER_PLANE_HEAD(i), > - state->dscrs[i]->self); > - > - if (!(sr & ATMEL_HLCDC_LAYER_EN)) { > - atmel_hlcdc_layer_write_reg(&plane->layer, > - ATMEL_HLCDC_LAYER_PLANE_ADDR(i), > - state->dscrs[i]->addr); > - atmel_hlcdc_layer_write_reg(&plane->layer, > - ATMEL_HLCDC_LAYER_PLANE_CTRL(i), > - state->dscrs[i]->ctrl); > - atmel_hlcdc_layer_write_reg(&plane->layer, > - ATMEL_HLCDC_LAYER_PLANE_NEXT(i), > - state->dscrs[i]->self); > - } > + if (dc->desc->is_xlcdc) > + update_xlcdc_buffers(plane, state, i); > + else > + update_hlcdc_buffers(plane, state, sr, i); > > if (desc->layout.xstride[i]) > atmel_hlcdc_layer_write_cfg(&plane->layer, > @@ -712,11 +816,8 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, > return 0; > } > > -static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p, > - struct drm_atomic_state *state) > +static void hlcdc_atomic_disable(struct atmel_hlcdc_plane *plane) > { > - struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p); > - > /* Disable interrupts */ > atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_HLCDC_LAYER_IDR, > 0xffffffff); > @@ -731,6 +832,72 @@ static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p, > atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_ISR); > } > > +static void xlcdc_atomic_disable(struct atmel_hlcdc_plane *plane) > +{ > + /* Disable interrupts */ > + atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_XLCDC_LAYER_IDR, > + 0xffffffff); > + > + /* Disable the layer */ > + atmel_hlcdc_layer_write_reg(&plane->layer, > + ATMEL_XLCDC_LAYER_ENR, 0); > + > + /* Clear all pending interrupts */ > + atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_XLCDC_LAYER_ISR); > +} > + > +static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p, > + struct drm_atomic_state *state) > +{ > + struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p); > + struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; > + > + if (dc->desc->is_xlcdc) > + xlcdc_atomic_disable(plane); > + else > + hlcdc_atomic_disable(plane); > +} > + > +static void hlcdc_atomic_update(struct atmel_hlcdc_plane *plane) > +{ > + u32 sr; > + > + /* Enable the overrun interrupts. */ > + atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_HLCDC_LAYER_IER, > + ATMEL_HLCDC_LAYER_OVR_IRQ(0) | > + ATMEL_HLCDC_LAYER_OVR_IRQ(1) | > + ATMEL_HLCDC_LAYER_OVR_IRQ(2)); > + > + /* Apply the new config at the next SOF event. */ > + sr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHSR); > + atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHER, > + ATMEL_HLCDC_LAYER_UPDATE | > + (sr & ATMEL_HLCDC_LAYER_EN ? > + ATMEL_HLCDC_LAYER_A2Q : ATMEL_HLCDC_LAYER_EN)); > +} > + > +static void xlcdc_atomic_update(struct atmel_hlcdc_plane *plane, > + struct atmel_hlcdc_dc *dc) > +{ > + /* Enable the overrun interrupts. */ > + atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_XLCDC_LAYER_IER, > + ATMEL_XLCDC_LAYER_OVR_IRQ(0) | > + ATMEL_XLCDC_LAYER_OVR_IRQ(1) | > + ATMEL_XLCDC_LAYER_OVR_IRQ(2)); > + > + atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_XLCDC_LAYER_ENR, > + ATMEL_XLCDC_LAYER_EN); > + > + /* > + * Updating XLCDC_xxxCFGx, XLCDC_xxxFBA and XLCDC_xxxEN, > + * (where xxx indicates each layer) requires writing one to the > + * Update Attribute field for each layer in LCDC_ATTRE register for SAM9X7. > + */ > + regmap_write(dc->hlcdc->regmap, ATMEL_XLCDC_ATTRE, ATMEL_XLCDC_BASE_UPDATE | > + ATMEL_XLCDC_OVR1_UPDATE | ATMEL_XLCDC_OVR3_UPDATE | > + ATMEL_XLCDC_HEO_UPDATE); > +} > + > static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p, > struct drm_atomic_state *state) > { > @@ -739,7 +906,7 @@ static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p, > struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p); > struct atmel_hlcdc_plane_state *hstate = > drm_plane_state_to_atmel_hlcdc_plane_state(new_s); > - u32 sr; > + struct atmel_hlcdc_dc *dc = p->dev->dev_private; > > if (!new_s->crtc || !new_s->fb) > return; > @@ -750,29 +917,73 @@ static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p, > } > > atmel_hlcdc_plane_update_pos_and_size(plane, hstate); > - atmel_hlcdc_plane_update_general_settings(plane, hstate); > + if (dc->desc->is_xlcdc) > + atmel_xlcdc_plane_update_general_settings(plane, hstate); > + else > + atmel_hlcdc_plane_update_general_settings(plane, hstate); > atmel_hlcdc_plane_update_format(plane, hstate); > atmel_hlcdc_plane_update_clut(plane, hstate); > atmel_hlcdc_plane_update_buffers(plane, hstate); > atmel_hlcdc_plane_update_disc_area(plane, hstate); > > - /* Enable the overrun interrupts. */ > - atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_HLCDC_LAYER_IER, > - ATMEL_HLCDC_LAYER_OVR_IRQ(0) | > - ATMEL_HLCDC_LAYER_OVR_IRQ(1) | > - ATMEL_HLCDC_LAYER_OVR_IRQ(2)); > + if (dc->desc->is_xlcdc) > + xlcdc_atomic_update(plane, dc); > + else > + hlcdc_atomic_update(plane); > +} > > - /* Apply the new config at the next SOF event. */ > - sr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHSR); > - atmel_hlcdc_layer_write_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHER, > - ATMEL_HLCDC_LAYER_UPDATE | > - (sr & ATMEL_HLCDC_LAYER_EN ? > - ATMEL_HLCDC_LAYER_A2Q : ATMEL_HLCDC_LAYER_EN)); > +static void hlcdc_csc_init(struct atmel_hlcdc_plane *plane, > + const struct atmel_hlcdc_layer_desc *desc) > +{ > + /* > + * TODO: declare a "yuv-to-rgb-conv-factors" property to let > + * userspace modify these factors (using a BLOB property ?). > + */ > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc, > + 0x4c900091); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 1, > + 0x7a5f5090); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 2, > + 0x40040890); > +} > + > +static void xlcdc_csc_init(struct atmel_hlcdc_plane *plane, > + const struct atmel_hlcdc_layer_desc *desc) > +{ > + /* > + * yuv-to-rgb-conv-factors are now defined from LCDC_HEOCFG16 to > + * LCDC_HEOCFG21 registers in SAM9X7. > + */ > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc, > + 0x00000488); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 1, > + 0x00000648); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 2, > + 0x1EA00480); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 3, > + 0x00001D28); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 4, > + 0x08100480); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 5, > + 0x00000000); > + atmel_hlcdc_layer_write_cfg(&plane->layer, > + desc->layout.csc + 6, > + 0x00000007); > } > Both the above functions can be made more readable/easier to maintain by having the configs in an array and just loop through them. > static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane) > { > const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; > > if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER || > desc->type == ATMEL_HLCDC_CURSOR_LAYER) { > @@ -796,31 +1007,19 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane) > return ret; > } > > - if (desc->layout.csc) { > - /* > - * TODO: decare a "yuv-to-rgb-conv-factors" property to let > - * userspace modify these factors (using a BLOB property ?). > - */ > - atmel_hlcdc_layer_write_cfg(&plane->layer, > - desc->layout.csc, > - 0x4c900091); > - atmel_hlcdc_layer_write_cfg(&plane->layer, > - desc->layout.csc + 1, > - 0x7a5f5090); > - atmel_hlcdc_layer_write_cfg(&plane->layer, > - desc->layout.csc + 2, > - 0x40040890); > - } Same as above. > + if (dc->desc->is_xlcdc && desc->layout.csc) > + xlcdc_csc_init(plane, desc); > + else > + if (desc->layout.csc) > + hlcdc_csc_init(plane, desc); > > return 0; > } > > -void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) > +void hlcdc_irq_dbg(struct atmel_hlcdc_plane *plane, > + const struct atmel_hlcdc_layer_desc *desc) > { > - const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > - u32 isr; > - > - isr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_ISR); > + u32 isr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_ISR); > > /* > * There's not much we can do in case of overrun except informing > @@ -834,6 +1033,34 @@ void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) > desc->name); > } > > +void xlcdc_irq_dbg(struct atmel_hlcdc_plane *plane, > + const struct atmel_hlcdc_layer_desc *desc) > +{ > + u32 isr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_XLCDC_LAYER_ISR); > + > + /* > + * There's not much we can do in case of overrun except informing > + * the user. However, we are in interrupt context here, hence the > + * use of dev_dbg(). > + */ > + if (isr & > + (ATMEL_XLCDC_LAYER_OVR_IRQ(0) | ATMEL_XLCDC_LAYER_OVR_IRQ(1) | > + ATMEL_XLCDC_LAYER_OVR_IRQ(2))) > + dev_dbg(plane->base.dev->dev, "overrun on plane %s\n", > + desc->name); use pr_warn() instead. > +} > + > +void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) > +{ > + const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; > + struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; > + > + if (dc->desc->is_xlcdc) > + xlcdc_irq_dbg(plane, desc); > + else > + hlcdc_irq_dbg(plane, desc); > +} > + > static const struct drm_plane_helper_funcs atmel_hlcdc_layer_plane_helper_funcs = { > .atomic_check = atmel_hlcdc_plane_atomic_check, > .atomic_update = atmel_hlcdc_plane_atomic_update, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel