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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 3E70BC433E0 for ; Tue, 26 Jan 2021 11:22:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F38BB22795 for ; Tue, 26 Jan 2021 11:22:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392196AbhAZLV2 (ORCPT ); Tue, 26 Jan 2021 06:21:28 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:40166 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2390498AbhAZIpW (ORCPT ); Tue, 26 Jan 2021 03:45:22 -0500 X-UUID: afee96f18aed44fc91e8c0c1edba5bdb-20210126 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=ab5V6Jg+4cCkW2NoySIkH8C7eY3leIfl1X6U8aIDygM=; b=apIkwoLe/pH90rtw1K78KvyWCLKf+jjKm/xUuFHPWs6b4fiDrBjuKIE/t/uOv/aVaH/NEFIe7DsGnEa3XNfrTLbWBgWseG1YZ/x/hhnMZru3sRPtXCBeufP8GFwjURBPq9Ho5xiw7+PggEi+w1YBIyurr/XxVO7pKEfyWZ5yjXE=; X-UUID: afee96f18aed44fc91e8c0c1edba5bdb-20210126 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 76383182; Tue, 26 Jan 2021 16:44:20 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Jan 2021 16:44:17 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Jan 2021 16:44:18 +0800 Message-ID: <1611650658.20687.3.camel@mtksdaap41> Subject: Re: [PATCH 3/3] media: mtk-vcodec: Separating mtk encoder driver From: Tiffany Lin To: Irui Wang CC: Alexandre Courbot , Hans Verkuil , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , "Tomasz Figa" , Hsin-Yi Wang , Maoguang Meng , Longfei Wang , Yunfei Dong , , , , , , Date: Tue, 26 Jan 2021 16:44:18 +0800 In-Reply-To: <20210121061804.26423-3-irui.wang@mediatek.com> References: <20210121061804.26423-1-irui.wang@mediatek.com> <20210121061804.26423-3-irui.wang@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org T24gVGh1LCAyMDIxLTAxLTIxIGF0IDE0OjE4ICswODAwLCBJcnVpIFdhbmcgd3JvdGU6DQo+IE1U SyBIMjY0IEVuY29kZXIoVkVOQ19TWVMpIGFuZCBWUDggRW5jb2RlcihWRU5DX0xUX1NZUykgYXJl IHR3bw0KPiBpbmRlcGVuZGVudCBoYXJkd2FyZSBpbnN0YW5jZS4gVGhleSBoYXZlIHRoZWlyIG93 bmVyIGludGVycnVwdCwNCj4gcmVnaXN0ZXIgbWFwcGluZywgYW5kIHNwZWNpYWwgY2xvY2tzLg0K PiANCj4gVGhpcyBwYXRjaCBzZXBlcmF0ZXMgdGhlbSBpbnRvIHR3byBkcml2ZXJzOg0KPiBVc2Vy IENhbGwgIlZJRElPQ19RVUVSWUNBUCI6DQo+IEgyNjQgRW5jb2RlciByZXR1cm4gZHJpdmVyIG5h bWUgIm10ay12Y29kZWMtZW5jIjsNCj4gVlA4IEVuY29kZXIgcmV0dXJuIGRyaXZlciBuYW1lICJt dGstdmVuYy12cDguDQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBIc2luLVlpIFdhbmcgPGhzaW55aUBj aHJvbWl1bS5vcmc+DQo+IFNpZ25lZC1vZmYtYnk6IE1hb2d1YW5nIE1lbmcgPG1hb2d1YW5nLm1l bmdAbWVkaWF0ZWsuY29tPg0KPiBTaWduZWQtb2ZmLWJ5OiBJcnVpIFdhbmcgPGlydWkud2FuZ0Bt ZWRpYXRlay5jb20+DQo+IA0KQWNrZWQtYnk6IFRpZmZhbnkgTGluIDx0aWZmYW55LmxpbkBtZWRp YXRlay5jb20+DQoNCj4gLS0tDQo+ICAuLi4vcGxhdGZvcm0vbXRrLXZjb2RlYy9tdGtfdmNvZGVj X2Rydi5oICAgICAgfCAgMTAgKy0NCj4gIC4uLi9wbGF0Zm9ybS9tdGstdmNvZGVjL210a192Y29k ZWNfZW5jLmMgICAgICB8ICAyMyArKystDQo+ICAuLi4vcGxhdGZvcm0vbXRrLXZjb2RlYy9tdGtf dmNvZGVjX2VuY19kcnYuYyAgfCAxMjEgKysrKysrKy0tLS0tLS0tLS0tDQo+ICAuLi4vcGxhdGZv cm0vbXRrLXZjb2RlYy9tdGtfdmNvZGVjX2VuY19wbS5jICAgfCAgNDAgKy0tLS0tDQo+ICAuLi4v cGxhdGZvcm0vbXRrLXZjb2RlYy92ZW5jL3ZlbmNfdnA4X2lmLmMgICAgfCAgIDQgKy0NCj4gIDUg ZmlsZXMgY2hhbmdlZCwgODIgaW5zZXJ0aW9ucygrKSwgMTE2IGRlbGV0aW9ucygtKQ0KPiANCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLXZjb2RlYy9tdGtfdmNvZGVj X2Rydi5oIGIvZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9tdGstdmNvZGVjL210a192Y29kZWNfZHJ2 LmgNCj4gaW5kZXggM2RkMDEwY2JhMjNlLi4xNTk0ZWRjYzcwNmQgMTAwNjQ0DQo+IC0tLSBhL2Ry aXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLXZjb2RlYy9tdGtfdmNvZGVjX2Rydi5oDQo+ICsrKyBi L2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLXZjb2RlYy9tdGtfdmNvZGVjX2Rydi5oDQo+IEBA IC0xOSw2ICsxOSw3IEBADQo+ICAjZGVmaW5lIE1US19WQ09ERUNfRFJWX05BTUUJIm10a192Y29k ZWNfZHJ2Ig0KPiAgI2RlZmluZSBNVEtfVkNPREVDX0RFQ19OQU1FCSJtdGstdmNvZGVjLWRlYyIN Cj4gICNkZWZpbmUgTVRLX1ZDT0RFQ19FTkNfTkFNRQkibXRrLXZjb2RlYy1lbmMiDQo+ICsjZGVm aW5lIE1US19WRU5DX1ZQOF9OQU1FCSJtdGstdmVuYy12cDgiDQo+ICAjZGVmaW5lIE1US19QTEFU Rk9STV9TVFIJInBsYXRmb3JtOm10ODE3MyINCj4gIA0KPiAgI2RlZmluZSBNVEtfVkNPREVDX01B WF9QTEFORVMJMw0KPiBAQCAtMTkzLDcgKzE5NCw2IEBAIHN0cnVjdCBtdGtfdmNvZGVjX3BtIHsN Cj4gIA0KPiAgCXN0cnVjdCBtdGtfdmNvZGVjX2Nsawl2ZW5jX2NsazsNCj4gIAlzdHJ1Y3QgZGV2 aWNlCSpsYXJidmVuYzsNCj4gLQlzdHJ1Y3QgZGV2aWNlCSpsYXJidmVuY2x0Ow0KPiAgCXN0cnVj dCBkZXZpY2UJKmRldjsNCj4gIAlzdHJ1Y3QgbXRrX3Zjb2RlY19kZXYJKm10a2RldjsNCj4gIH07 DQo+IEBAIC0zMTEsMjUgKzMxMSwyNyBAQCBlbnVtIG10a19jaGlwIHsNCj4gICAqIEBjaGlwOiBj aGlwIHRoaXMgZW5jb2RlciBpcyBjb21wYXRpYmxlIHdpdGgNCj4gICAqDQo+ICAgKiBAdXNlc19l eHQ6IHdoZXRoZXIgdGhlIGVuY29kZXIgdXNlcyB0aGUgZXh0ZW5kZWQgZmlybXdhcmUgbWVzc2Fn aW5nIGZvcm1hdA0KPiAtICogQGhhc19sdF9pcnE6IHdoZXRoZXIgdGhlIGVuY29kZXIgdXNlcyB0 aGUgTFQgaXJxDQo+ICsgKiBAbmFtZTogd2hldGhlciB0aGUgZW5jb2RlciBjb3JlIGlzIHZwOA0K PiAgICogQG1pbl9iaXJhdGU6IG1pbmltdW0gc3VwcG9ydGVkIGVuY29kaW5nIGJpdHJhdGUNCj4g ICAqIEBtYXhfYml0cmF0ZTogbWF4aW11bSBzdXBwb3J0ZWQgZW5jb2RpbmcgYml0cmF0ZQ0KPiAg ICogQGNhcHR1cmVfZm9ybWF0czogYXJyYXkgb2Ygc3VwcG9ydGVkIGNhcHR1cmUgZm9ybWF0cw0K PiAgICogQG51bV9jYXB0dXJlX2Zvcm1hdHM6IG51bWJlciBvZiBlbnRyaWVzIGluIGNhcHR1cmVf Zm9ybWF0cw0KPiAgICogQG91dHB1dF9mb3JtYXRzOiBhcnJheSBvZiBzdXBwb3J0ZWQgb3V0cHV0 IGZvcm1hdHMNCj4gICAqIEBudW1fb3V0cHV0X2Zvcm1hdHM6IG51bWJlciBvZiBlbnRyaWVzIGlu IG91dHB1dF9mb3JtYXRzDQo+ICsgKiBAY29yZV9pZDogc3RhbmQgZm9yIGgyNjQgb3IgdnA4IGVu Y29kZSBpbmRleA0KPiAgICovDQo+ICBzdHJ1Y3QgbXRrX3Zjb2RlY19lbmNfcGRhdGEgew0KPiAg CWVudW0gbXRrX2NoaXAgY2hpcDsNCj4gIA0KPiAgCWJvb2wgdXNlc19leHQ7DQo+IC0JYm9vbCBo YXNfbHRfaXJxOw0KPiArCWNvbnN0IGNoYXIgKm5hbWU7DQo+ICAJdW5zaWduZWQgbG9uZyBtaW5f Yml0cmF0ZTsNCj4gIAl1bnNpZ25lZCBsb25nIG1heF9iaXRyYXRlOw0KPiAgCWNvbnN0IHN0cnVj dCBtdGtfdmlkZW9fZm10ICpjYXB0dXJlX2Zvcm1hdHM7DQo+ICAJc2l6ZV90IG51bV9jYXB0dXJl X2Zvcm1hdHM7DQo+ICAJY29uc3Qgc3RydWN0IG10a192aWRlb19mbXQgKm91dHB1dF9mb3JtYXRz Ow0KPiAgCXNpemVfdCBudW1fb3V0cHV0X2Zvcm1hdHM7DQo+ICsJaW50IGNvcmVfaWQ7DQo+ICB9 Ow0KPiAgDQo+ICAjZGVmaW5lIE1US19FTkNfQ1RYX0lTX0VYVChjdHgpICgoY3R4KS0+ZGV2LT52 ZW5jX3BkYXRhLT51c2VzX2V4dCkNCj4gQEAgLTM2MSw3ICszNjMsNiBAQCBzdHJ1Y3QgbXRrX3Zj b2RlY19lbmNfcGRhdGEgew0KPiAgICoNCj4gICAqIEBkZWNfaXJxOiBkZWNvZGVyIGlycSByZXNv dXJjZQ0KPiAgICogQGVuY19pcnE6IGgyNjQgZW5jb2RlciBpcnEgcmVzb3VyY2UNCj4gLSAqIEBl bmNfbHRfaXJxOiB2cDggZW5jb2RlciBpcnEgcmVzb3VyY2UNCj4gICAqDQo+ICAgKiBAZGVjX211 dGV4OiBkZWNvZGVyIGhhcmR3YXJlIGxvY2sNCj4gICAqIEBlbmNfbXV0ZXg6IGVuY29kZXIgaGFy ZHdhcmUgbG9jay4NCj4gQEAgLTM5Nyw3ICszOTgsNiBAQCBzdHJ1Y3QgbXRrX3Zjb2RlY19kZXYg ew0KPiAgDQo+ICAJaW50IGRlY19pcnE7DQo+ICAJaW50IGVuY19pcnE7DQo+IC0JaW50IGVuY19s dF9pcnE7DQo+ICANCj4gIAlzdHJ1Y3QgbXV0ZXggZGVjX211dGV4Ow0KPiAgCXN0cnVjdCBtdXRl eCBlbmNfbXV0ZXg7DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12 Y29kZWMvbXRrX3Zjb2RlY19lbmMuYyBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLXZjb2Rl Yy9tdGtfdmNvZGVjX2VuYy5jDQo+IGluZGV4IDIxZGUxNDMxY2ZjYi4uMGRhNjg3MWI0YjM5IDEw MDY0NA0KPiAtLS0gYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMvbXRrX3Zjb2Rl Y19lbmMuYw0KPiArKysgYi9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMvbXRrX3Zj b2RlY19lbmMuYw0KPiBAQCAtOSw2ICs5LDcgQEANCj4gICNpbmNsdWRlIDxtZWRpYS92NGwyLW1l bTJtZW0uaD4NCj4gICNpbmNsdWRlIDxtZWRpYS92aWRlb2J1ZjItZG1hLWNvbnRpZy5oPg0KPiAg I2luY2x1ZGUgPHNvYy9tZWRpYXRlay9zbWkuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9wbV9ydW50 aW1lLmg+DQo+ICANCj4gICNpbmNsdWRlICJtdGtfdmNvZGVjX2Rydi5oIg0KPiAgI2luY2x1ZGUg Im10a192Y29kZWNfZW5jLmgiDQo+IEBAIC0xODksNyArMTkwLDEwIEBAIHN0YXRpYyBpbnQgdmlk aW9jX2VudW1fZm10X3ZpZF9vdXQoc3RydWN0IGZpbGUgKmZpbGUsIHZvaWQgKnByaXYsDQo+ICBz dGF0aWMgaW50IHZpZGlvY192ZW5jX3F1ZXJ5Y2FwKHN0cnVjdCBmaWxlICpmaWxlLCB2b2lkICpw cml2LA0KPiAgCQkJCXN0cnVjdCB2NGwyX2NhcGFiaWxpdHkgKmNhcCkNCj4gIHsNCj4gLQlzdHJz Y3B5KGNhcC0+ZHJpdmVyLCBNVEtfVkNPREVDX0VOQ19OQU1FLCBzaXplb2YoY2FwLT5kcml2ZXIp KTsNCj4gKwljb25zdCBzdHJ1Y3QgbXRrX3Zjb2RlY19lbmNfcGRhdGEgKnBkYXRhID0NCj4gKwkJ ZmhfdG9fY3R4KHByaXYpLT5kZXYtPnZlbmNfcGRhdGE7DQo+ICsNCj4gKwlzdHJzY3B5KGNhcC0+ ZHJpdmVyLCBwZGF0YS0+bmFtZSwgc2l6ZW9mKGNhcC0+ZHJpdmVyKSk7DQo+ICAJc3Ryc2NweShj YXAtPmJ1c19pbmZvLCBNVEtfUExBVEZPUk1fU1RSLCBzaXplb2YoY2FwLT5idXNfaW5mbykpOw0K PiAgCXN0cnNjcHkoY2FwLT5jYXJkLCBNVEtfUExBVEZPUk1fU1RSLCBzaXplb2YoY2FwLT5jYXJk KSk7DQo+ICANCj4gQEAgLTc5Nyw3ICs4MDEsNyBAQCBzdGF0aWMgaW50IHZiMm9wc192ZW5jX3N0 YXJ0X3N0cmVhbWluZyhzdHJ1Y3QgdmIyX3F1ZXVlICpxLCB1bnNpZ25lZCBpbnQgY291bnQpDQo+ ICAJICAqLw0KPiAgCWlmICgoY3R4LT5zdGF0ZSA9PSBNVEtfU1RBVEVfQUJPUlQpIHx8IChjdHgt PnN0YXRlID09IE1US19TVEFURV9GUkVFKSkgew0KPiAgCQlyZXQgPSAtRUlPOw0KPiAtCQlnb3Rv IGVycl9zZXRfcGFyYW07DQo+ICsJCWdvdG8gZXJyX3N0YXJ0X3N0cmVhbTsNCj4gIAl9DQo+ICAN Cj4gIAkvKiBEbyB0aGUgaW5pdGlhbGl6YXRpb24gd2hlbiBib3RoIHN0YXJ0X3N0cmVhbWluZyBo YXZlIGJlZW4gY2FsbGVkICovDQo+IEBAIC04MDksNiArODEzLDEyIEBAIHN0YXRpYyBpbnQgdmIy b3BzX3ZlbmNfc3RhcnRfc3RyZWFtaW5nKHN0cnVjdCB2YjJfcXVldWUgKnEsIHVuc2lnbmVkIGlu dCBjb3VudCkNCj4gIAkJCXJldHVybiAwOw0KPiAgCX0NCj4gIA0KPiArCXJldCA9IHBtX3J1bnRp bWVfZ2V0X3N5bmMoJmN0eC0+ZGV2LT5wbGF0X2Rldi0+ZGV2KTsNCj4gKwlpZiAocmV0IDwgMCkg ew0KPiArCQltdGtfdjRsMl9lcnIoInBtX3J1bnRpbWVfZ2V0X3N5bmMgZmFpbCAlZCIsIHJldCk7 DQo+ICsJCWdvdG8gZXJyX3N0YXJ0X3N0cmVhbTsNCj4gKwl9DQo+ICsNCj4gIAltdGtfdmVuY19z ZXRfcGFyYW0oY3R4LCAmcGFyYW0pOw0KPiAgCXJldCA9IHZlbmNfaWZfc2V0X3BhcmFtKGN0eCwg VkVOQ19TRVRfUEFSQU1fRU5DLCAmcGFyYW0pOw0KPiAgCWlmIChyZXQpIHsNCj4gQEAgLTgzNSw2 ICs4NDUsMTEgQEAgc3RhdGljIGludCB2YjJvcHNfdmVuY19zdGFydF9zdHJlYW1pbmcoc3RydWN0 IHZiMl9xdWV1ZSAqcSwgdW5zaWduZWQgaW50IGNvdW50KQ0KPiAgCXJldHVybiAwOw0KPiAgDQo+ ICBlcnJfc2V0X3BhcmFtOg0KPiArCXJldCA9IHBtX3J1bnRpbWVfcHV0KCZjdHgtPmRldi0+cGxh dF9kZXYtPmRldik7DQo+ICsJaWYgKHJldCA8IDApDQo+ICsJCW10a192NGwyX2VycigicG1fcnVu dGltZV9wdXQgZmFpbCAlZCIsIHJldCk7DQo+ICsNCj4gK2Vycl9zdGFydF9zdHJlYW06DQo+ICAJ Zm9yIChpID0gMDsgaSA8IHEtPm51bV9idWZmZXJzOyArK2kpIHsNCj4gIAkJc3RydWN0IHZiMl9i dWZmZXIgKmJ1ZiA9IHZiMl9nZXRfYnVmZmVyKHEsIGkpOw0KPiAgDQo+IEBAIC04ODgsNiArOTAz LDEwIEBAIHN0YXRpYyB2b2lkIHZiMm9wc192ZW5jX3N0b3Bfc3RyZWFtaW5nKHN0cnVjdCB2YjJf cXVldWUgKnEpDQo+ICAJaWYgKHJldCkNCj4gIAkJbXRrX3Y0bDJfZXJyKCJ2ZW5jX2lmX2RlaW5p dCBmYWlsZWQ9JWQiLCByZXQpOw0KPiAgDQo+ICsJcmV0ID0gcG1fcnVudGltZV9wdXQoJmN0eC0+ ZGV2LT5wbGF0X2Rldi0+ZGV2KTsNCj4gKwlpZiAocmV0IDwgMCkNCj4gKwkJbXRrX3Y0bDJfZXJy KCJwbV9ydW50aW1lX3B1dCBmYWlsICVkIiwgcmV0KTsNCj4gKw0KPiAgCWN0eC0+c3RhdGUgPSBN VEtfU1RBVEVfRlJFRTsNCj4gIH0NCj4gIA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZWRpYS9w bGF0Zm9ybS9tdGstdmNvZGVjL210a192Y29kZWNfZW5jX2Rydi5jIGIvZHJpdmVycy9tZWRpYS9w bGF0Zm9ybS9tdGstdmNvZGVjL210a192Y29kZWNfZW5jX2Rydi5jDQo+IGluZGV4IGRmYjQyZTE5 YmY4MS4uNGJlZTQyNDU0MjUzIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL21lZGlhL3BsYXRmb3Jt L210ay12Y29kZWMvbXRrX3Zjb2RlY19lbmNfZHJ2LmMNCj4gKysrIGIvZHJpdmVycy9tZWRpYS9w bGF0Zm9ybS9tdGstdmNvZGVjL210a192Y29kZWNfZW5jX2Rydi5jDQo+IEBAIC00OSwxMiArNDks MTUgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfdmlkZW9fZm10IG10a192aWRlb19mb3JtYXRz X291dHB1dF9tdDgxNzNbXSA9IHsNCj4gIAl9LA0KPiAgfTsNCj4gIA0KPiAtc3RhdGljIGNvbnN0 IHN0cnVjdCBtdGtfdmlkZW9fZm10IG10a192aWRlb19mb3JtYXRzX2NhcHR1cmVfbXQ4MTczW10g PSAgew0KPiArc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfdmlkZW9fZm10IG10a192aWRlb19mb3Jt YXRzX2NhcHR1cmVfbXQ4MTczX2gyNjRbXSA9ICB7DQo+ICAJew0KPiAgCQkuZm91cmNjID0gVjRM Ml9QSVhfRk1UX0gyNjQsDQo+ICAJCS50eXBlID0gTVRLX0ZNVF9FTkMsDQo+ICAJCS5udW1fcGxh bmVzID0gMSwNCj4gIAl9LA0KPiArfTsNCj4gKw0KPiArc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtf dmlkZW9fZm10IG10a192aWRlb19mb3JtYXRzX2NhcHR1cmVfbXQ4MTczX3ZwOFtdID0gIHsNCj4g IAl7DQo+ICAJCS5mb3VyY2MgPSBWNEwyX1BJWF9GTVRfVlA4LA0KPiAgCQkudHlwZSA9IE1US19G TVRfRU5DLA0KPiBAQCAtMTEwLDM1ICsxMTMsMTMgQEAgc3RhdGljIGlycXJldHVybl90IG10a192 Y29kZWNfZW5jX2lycV9oYW5kbGVyKGludCBpcnEsIHZvaWQgKnByaXYpDQo+ICAJY3R4ID0gZGV2 LT5jdXJyX2N0eDsNCj4gIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXYtPmlycWxvY2ssIGZs YWdzKTsNCj4gIA0KPiAtCW10a192NGwyX2RlYnVnKDEsICJpZD0lZCIsIGN0eC0+aWQpOw0KPiAt CWFkZHIgPSBkZXYtPnJlZ19iYXNlW1ZFTkNfU1lTXSArIE1US19WRU5DX0lSUV9BQ0tfT0ZGU0VU Ow0KPiAtDQo+IC0JY3R4LT5pcnFfc3RhdHVzID0gcmVhZGwoZGV2LT5yZWdfYmFzZVtWRU5DX1NZ U10gKw0KPiAtCQkJCShNVEtfVkVOQ19JUlFfU1RBVFVTX09GRlNFVCkpOw0KPiAtDQo+IC0JY2xl YW5faXJxX3N0YXR1cyhjdHgtPmlycV9zdGF0dXMsIGFkZHIpOw0KPiAtDQo+IC0Jd2FrZV91cF9j dHgoY3R4LCBNVEtfSU5TVF9JUlFfUkVDRUlWRUQpOw0KPiAtCXJldHVybiBJUlFfSEFORExFRDsN Cj4gLX0NCj4gLQ0KPiAtc3RhdGljIGlycXJldHVybl90IG10a192Y29kZWNfZW5jX2x0X2lycV9o YW5kbGVyKGludCBpcnEsIHZvaWQgKnByaXYpDQo+IC17DQo+IC0Jc3RydWN0IG10a192Y29kZWNf ZGV2ICpkZXYgPSBwcml2Ow0KPiAtCXN0cnVjdCBtdGtfdmNvZGVjX2N0eCAqY3R4Ow0KPiAtCXVu c2lnbmVkIGxvbmcgZmxhZ3M7DQo+IC0Jdm9pZCBfX2lvbWVtICphZGRyOw0KPiAtDQo+IC0Jc3Bp bl9sb2NrX2lycXNhdmUoJmRldi0+aXJxbG9jaywgZmxhZ3MpOw0KPiAtCWN0eCA9IGRldi0+Y3Vy cl9jdHg7DQo+IC0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT5pcnFsb2NrLCBmbGFncyk7 DQo+ICsJbXRrX3Y0bDJfZGVidWcoMSwgImlkPSVkIGNvcmVpZDolZCIsIGN0eC0+aWQsIGRldi0+ dmVuY19wZGF0YS0+Y29yZV9pZCk7DQo+ICsJYWRkciA9IGRldi0+cmVnX2Jhc2VbZGV2LT52ZW5j X3BkYXRhLT5jb3JlX2lkXSArDQo+ICsJCQkJTVRLX1ZFTkNfSVJRX0FDS19PRkZTRVQ7DQo+ICAN Cj4gLQltdGtfdjRsMl9kZWJ1ZygxLCAiaWQ9JWQiLCBjdHgtPmlkKTsNCj4gLQljdHgtPmlycV9z dGF0dXMgPSByZWFkbChkZXYtPnJlZ19iYXNlW1ZFTkNfTFRfU1lTXSArDQo+ICsJY3R4LT5pcnFf c3RhdHVzID0gcmVhZGwoZGV2LT5yZWdfYmFzZVtkZXYtPnZlbmNfcGRhdGEtPmNvcmVfaWRdICsN Cj4gIAkJCQkoTVRLX1ZFTkNfSVJRX1NUQVRVU19PRkZTRVQpKTsNCj4gIA0KPiAtCWFkZHIgPSBk ZXYtPnJlZ19iYXNlW1ZFTkNfTFRfU1lTXSArIE1US19WRU5DX0lSUV9BQ0tfT0ZGU0VUOw0KPiAt DQo+ICAJY2xlYW5faXJxX3N0YXR1cyhjdHgtPmlycV9zdGF0dXMsIGFkZHIpOw0KPiAgDQo+ICAJ d2FrZV91cF9jdHgoY3R4LCBNVEtfSU5TVF9JUlFfUkVDRUlWRUQpOw0KPiBAQCAtMjkzLDE3ICsy NzQsMjEgQEAgc3RhdGljIGludCBtdGtfdmNvZGVjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYpDQo+ICAJZGV2LT52ZW5jX3BkYXRhID0gb2ZfZGV2aWNlX2dldF9tYXRjaF9kYXRh KCZwZGV2LT5kZXYpOw0KPiAgCXJldCA9IG10a192Y29kZWNfaW5pdF9lbmNfcG0oZGV2KTsNCj4g IAlpZiAocmV0IDwgMCkgew0KPiAtCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJGYWlsZWQgdG8gZ2V0 IG10IHZjb2RlYyBjbG9jayBzb3VyY2UhIik7DQo+ICsJCWRldl9lcnIoJnBkZXYtPmRldiwgIkZh aWxlZCB0byBnZXQgbXRrIHZjb2RlYyBjbG9jayBzb3VyY2UhIik7DQo+ICAJCWdvdG8gZXJyX2Vu Y19wbTsNCj4gIAl9DQo+ICANCj4gLQlyZXMgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2UocGRldiwg SU9SRVNPVVJDRV9NRU0sIDApOw0KPiAtCWRldi0+cmVnX2Jhc2VbVkVOQ19TWVNdID0gZGV2bV9p b3JlbWFwX3Jlc291cmNlKCZwZGV2LT5kZXYsIHJlcyk7DQo+IC0JaWYgKElTX0VSUigoX19mb3Jj ZSB2b2lkICopZGV2LT5yZWdfYmFzZVtWRU5DX1NZU10pKSB7DQo+IC0JCXJldCA9IFBUUl9FUlIo KF9fZm9yY2Ugdm9pZCAqKWRldi0+cmVnX2Jhc2VbVkVOQ19TWVNdKTsNCj4gKwlwbV9ydW50aW1l X2VuYWJsZSgmcGRldi0+ZGV2KTsNCj4gKw0KPiArCXNucHJpbnRmKGRldi0+djRsMl9kZXYubmFt ZSwgc2l6ZW9mKGRldi0+djRsMl9kZXYubmFtZSksICIlcyIsDQo+ICsJCSBkZXYtPnZlbmNfcGRh dGEtPm5hbWUpOw0KPiArDQo+ICsJZGV2LT5yZWdfYmFzZVtkZXYtPnZlbmNfcGRhdGEtPmNvcmVf aWRdID0NCj4gKwkJZGV2bV9wbGF0Zm9ybV9pb3JlbWFwX3Jlc291cmNlKHBkZXYsIDApOw0KPiAr CWlmIChJU19FUlIoZGV2LT5yZWdfYmFzZVtkZXYtPnZlbmNfcGRhdGEtPmNvcmVfaWRdKSkgew0K PiArCQlyZXQgPSBQVFJfRVJSKGRldi0+cmVnX2Jhc2VbZGV2LT52ZW5jX3BkYXRhLT5jb3JlX2lk XSk7DQo+ICAJCWdvdG8gZXJyX3JlczsNCj4gIAl9DQo+IC0JbXRrX3Y0bDJfZGVidWcoMiwgInJl Z1slZF0gYmFzZT0weCVwIiwgaSwgZGV2LT5yZWdfYmFzZVtWRU5DX1NZU10pOw0KPiAgDQo+ICAJ cmVzID0gcGxhdGZvcm1fZ2V0X3Jlc291cmNlKHBkZXYsIElPUkVTT1VSQ0VfSVJRLCAwKTsNCj4g IAlpZiAocmVzID09IE5VTEwpIHsNCj4gQEAgLTMxOCw0NCArMzAzLDE3IEBAIHN0YXRpYyBpbnQg bXRrX3Zjb2RlY19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiAgCQkJICAg ICAgIG10a192Y29kZWNfZW5jX2lycV9oYW5kbGVyLA0KPiAgCQkJICAgICAgIDAsIHBkZXYtPm5h bWUsIGRldik7DQo+ICAJaWYgKHJldCkgew0KPiAtCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJGYWls ZWQgdG8gaW5zdGFsbCBkZXYtPmVuY19pcnEgJWQgKCVkKSIsDQo+IC0JCQlkZXYtPmVuY19pcnEs DQo+IC0JCQlyZXQpOw0KPiArCQlkZXZfZXJyKCZwZGV2LT5kZXYsDQo+ICsJCQkiRmFpbGVkIHRv IGluc3RhbGwgZGV2LT5lbmNfaXJxICVkICglZCkgY29yZV9pZDolZCIsDQo+ICsJCQlkZXYtPmVu Y19pcnEsIHJldCwgZGV2LT52ZW5jX3BkYXRhLT5jb3JlX2lkKTsNCj4gIAkJcmV0ID0gLUVJTlZB TDsNCj4gIAkJZ290byBlcnJfcmVzOw0KPiAgCX0NCj4gIA0KPiAtCWlmIChkZXYtPnZlbmNfcGRh dGEtPmhhc19sdF9pcnEpIHsNCj4gLQkJcmVzID0gcGxhdGZvcm1fZ2V0X3Jlc291cmNlKHBkZXYs IElPUkVTT1VSQ0VfTUVNLCAxKTsNCj4gLQkJZGV2LT5yZWdfYmFzZVtWRU5DX0xUX1NZU10gPSBk ZXZtX2lvcmVtYXBfcmVzb3VyY2UoJnBkZXYtPmRldiwgcmVzKTsNCj4gLQkJaWYgKElTX0VSUigo X19mb3JjZSB2b2lkICopZGV2LT5yZWdfYmFzZVtWRU5DX0xUX1NZU10pKSB7DQo+IC0JCQlyZXQg PSBQVFJfRVJSKChfX2ZvcmNlIHZvaWQgKilkZXYtPnJlZ19iYXNlW1ZFTkNfTFRfU1lTXSk7DQo+ IC0JCQlnb3RvIGVycl9yZXM7DQo+IC0JCX0NCj4gLQkJbXRrX3Y0bDJfZGVidWcoMiwgInJlZ1sl ZF0gYmFzZT0weCVwIiwgaSwgZGV2LT5yZWdfYmFzZVtWRU5DX0xUX1NZU10pOw0KPiAtDQo+IC0J CWRldi0+ZW5jX2x0X2lycSA9IHBsYXRmb3JtX2dldF9pcnEocGRldiwgMSk7DQo+IC0JCWlycV9z ZXRfc3RhdHVzX2ZsYWdzKGRldi0+ZW5jX2x0X2lycSwgSVJRX05PQVVUT0VOKTsNCj4gLQkJcmV0 ID0gZGV2bV9yZXF1ZXN0X2lycSgmcGRldi0+ZGV2LA0KPiAtCQkJCSAgICAgICBkZXYtPmVuY19s dF9pcnEsDQo+IC0JCQkJICAgICAgIG10a192Y29kZWNfZW5jX2x0X2lycV9oYW5kbGVyLA0KPiAt CQkJCSAgICAgICAwLCBwZGV2LT5uYW1lLCBkZXYpOw0KPiAtCQlpZiAocmV0KSB7DQo+IC0JCQlk ZXZfZXJyKCZwZGV2LT5kZXYsDQo+IC0JCQkJIkZhaWxlZCB0byBpbnN0YWxsIGRldi0+ZW5jX2x0 X2lycSAlZCAoJWQpIiwNCj4gLQkJCQlkZXYtPmVuY19sdF9pcnEsIHJldCk7DQo+IC0JCQlyZXQg PSAtRUlOVkFMOw0KPiAtCQkJZ290byBlcnJfcmVzOw0KPiAtCQl9DQo+IC0JfQ0KPiAtDQo+ICAJ bXV0ZXhfaW5pdCgmZGV2LT5lbmNfbXV0ZXgpOw0KPiAgCW11dGV4X2luaXQoJmRldi0+ZGV2X211 dGV4KTsNCj4gIAlzcGluX2xvY2tfaW5pdCgmZGV2LT5pcnFsb2NrKTsNCj4gIA0KPiAtCXNucHJp bnRmKGRldi0+djRsMl9kZXYubmFtZSwgc2l6ZW9mKGRldi0+djRsMl9kZXYubmFtZSksICIlcyIs DQo+IC0JCSAiW01US19WNEwyX1ZFTkNdIik7DQo+IC0NCj4gIAlyZXQgPSB2NGwyX2RldmljZV9y ZWdpc3RlcigmcGRldi0+ZGV2LCAmZGV2LT52NGwyX2Rldik7DQo+ICAJaWYgKHJldCkgew0KPiAg CQltdGtfdjRsMl9lcnIoInY0bDJfZGV2aWNlX3JlZ2lzdGVyIGVycj0lZCIsIHJldCk7DQo+IEBA IC0zODEsNyArMzM5LDcgQEAgc3RhdGljIGludCBtdGtfdmNvZGVjX3Byb2JlKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICAJCQkJCVY0TDJfQ0FQX1NUUkVBTUlORzsNCj4gIA0KPiAg CXNucHJpbnRmKHZmZF9lbmMtPm5hbWUsIHNpemVvZih2ZmRfZW5jLT5uYW1lKSwgIiVzIiwNCj4g LQkJIE1US19WQ09ERUNfRU5DX05BTUUpOw0KPiArCQkJZGV2LT52ZW5jX3BkYXRhLT5uYW1lKTsN Cj4gIAl2aWRlb19zZXRfZHJ2ZGF0YSh2ZmRfZW5jLCBkZXYpOw0KPiAgCWRldi0+dmZkX2VuYyA9 IHZmZF9lbmM7DQo+ICAJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgZGV2KTsNCj4gQEAgLTQw OSw4ICszNjcsOCBAQCBzdGF0aWMgaW50IG10a192Y29kZWNfcHJvYmUoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldikNCj4gIAkJZ290byBlcnJfZW5jX3JlZzsNCj4gIAl9DQo+ICANCj4gLQlt dGtfdjRsMl9kZWJ1ZygwLCAiZW5jb2RlciByZWdpc3RlcmVkIGFzIC9kZXYvdmlkZW8lZCIsDQo+ IC0JCQl2ZmRfZW5jLT5udW0pOw0KPiArCW10a192NGwyX2RlYnVnKDAsICJlbmNvZGVyICVkIHJl Z2lzdGVyZWQgYXMgL2Rldi92aWRlbyVkIiwNCj4gKwkJICAgICAgIGRldi0+dmVuY19wZGF0YS0+ Y29yZV9pZCwgdmZkX2VuYy0+bnVtKTsNCj4gIA0KPiAgCXJldHVybiAwOw0KPiAgDQo+IEBAIC00 MjksMjAgKzM4NywzMyBAQCBzdGF0aWMgaW50IG10a192Y29kZWNfcHJvYmUoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqcGRldikNCj4gIAlyZXR1cm4gcmV0Ow0KPiAgfQ0KPiAgDQo+IC1zdGF0aWMg Y29uc3Qgc3RydWN0IG10a192Y29kZWNfZW5jX3BkYXRhIG10ODE3M19wZGF0YSA9IHsNCj4gK3N0 YXRpYyBjb25zdCBzdHJ1Y3QgbXRrX3Zjb2RlY19lbmNfcGRhdGEgbXQ4MTczX2F2Y19wZGF0YSA9 IHsNCj4gIAkuY2hpcCA9IE1US19NVDgxNzMsDQo+IC0JLmhhc19sdF9pcnEgPSB0cnVlLA0KPiAt CS5jYXB0dXJlX2Zvcm1hdHMgPSBtdGtfdmlkZW9fZm9ybWF0c19jYXB0dXJlX210ODE3MywNCj4g LQkubnVtX2NhcHR1cmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUobXRrX3ZpZGVvX2Zvcm1hdHNfY2Fw dHVyZV9tdDgxNzMpLA0KPiArCS5uYW1lID0gTVRLX1ZDT0RFQ19FTkNfTkFNRSwNCj4gKwkuY2Fw dHVyZV9mb3JtYXRzID0gbXRrX3ZpZGVvX2Zvcm1hdHNfY2FwdHVyZV9tdDgxNzNfaDI2NCwNCj4g KwkubnVtX2NhcHR1cmVfZm9ybWF0cyA9IDEsDQo+ICAJLm91dHB1dF9mb3JtYXRzID0gbXRrX3Zp ZGVvX2Zvcm1hdHNfb3V0cHV0X210ODE3MywNCj4gIAkubnVtX291dHB1dF9mb3JtYXRzID0gQVJS QVlfU0laRShtdGtfdmlkZW9fZm9ybWF0c19vdXRwdXRfbXQ4MTczKSwNCj4gLQkubWluX2JpdHJh dGUgPSAxLA0KPiArCS5taW5fYml0cmF0ZSA9IDY0LA0KPiArCS5tYXhfYml0cmF0ZSA9IDQwMDAw MDAsDQo+ICsJLmNvcmVfaWQgPSBWRU5DX1NZUywNCj4gK307DQo+ICsNCj4gK3N0YXRpYyBjb25z dCBzdHJ1Y3QgbXRrX3Zjb2RlY19lbmNfcGRhdGEgbXQ4MTczX3ZwOF9wZGF0YSA9IHsNCj4gKwku Y2hpcCA9IE1US19NVDgxNzMsDQo+ICsJLm5hbWUgPSBNVEtfVkVOQ19WUDhfTkFNRSwNCj4gKwku Y2FwdHVyZV9mb3JtYXRzID0gbXRrX3ZpZGVvX2Zvcm1hdHNfY2FwdHVyZV9tdDgxNzNfdnA4LA0K PiArCS5udW1fY2FwdHVyZV9mb3JtYXRzID0gMSwNCj4gKwkub3V0cHV0X2Zvcm1hdHMgPSBtdGtf dmlkZW9fZm9ybWF0c19vdXRwdXRfbXQ4MTczLA0KPiArCS5udW1fb3V0cHV0X2Zvcm1hdHMgPSBB UlJBWV9TSVpFKG10a192aWRlb19mb3JtYXRzX291dHB1dF9tdDgxNzMpLA0KPiArCS5taW5fYml0 cmF0ZSA9IDY0LA0KPiAgCS5tYXhfYml0cmF0ZSA9IDQwMDAwMDAsDQo+ICsJLmNvcmVfaWQgPSBW RU5DX0xUX1NZUywNCj4gIH07DQo+ICANCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbXRrX3Zjb2Rl Y19lbmNfcGRhdGEgbXQ4MTgzX3BkYXRhID0gew0KPiAgCS5jaGlwID0gTVRLX01UODE4MywNCj4g LQkuaGFzX2x0X2lycSA9IGZhbHNlLA0KPiArCS5uYW1lID0gTVRLX1ZDT0RFQ19FTkNfTkFNRSwN Cj4gIAkudXNlc19leHQgPSB0cnVlLA0KPiAgCS5jYXB0dXJlX2Zvcm1hdHMgPSBtdGtfdmlkZW9f Zm9ybWF0c19jYXB0dXJlX210ODE4MywNCj4gIAkubnVtX2NhcHR1cmVfZm9ybWF0cyA9IEFSUkFZ X1NJWkUobXRrX3ZpZGVvX2Zvcm1hdHNfY2FwdHVyZV9tdDgxODMpLA0KPiBAQCAtNDUxLDEwICs0 MjIsMTQgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfdmNvZGVjX2VuY19wZGF0YSBtdDgxODNf cGRhdGEgPSB7DQo+ICAJLm51bV9vdXRwdXRfZm9ybWF0cyA9IEFSUkFZX1NJWkUobXRrX3ZpZGVv X2Zvcm1hdHNfb3V0cHV0X210ODE3MyksDQo+ICAJLm1pbl9iaXRyYXRlID0gNjQsDQo+ICAJLm1h eF9iaXRyYXRlID0gNDAwMDAwMDAsDQo+ICsJLmNvcmVfaWQgPSBWRU5DX1NZUywNCj4gIH07DQo+ ICANCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG10a192Y29kZWNfZW5jX21h dGNoW10gPSB7DQo+IC0Jey5jb21wYXRpYmxlID0gIm1lZGlhdGVrLG10ODE3My12Y29kZWMtZW5j IiwgLmRhdGEgPSAmbXQ4MTczX3BkYXRhfSwNCj4gKwl7LmNvbXBhdGlibGUgPSAibWVkaWF0ZWss bXQ4MTczLXZjb2RlYy1hdmMtZW5jIiwNCj4gKwkJCS5kYXRhID0gJm10ODE3M19hdmNfcGRhdGF9 LA0KPiArCXsuY29tcGF0aWJsZSA9ICJtZWRpYXRlayxtdDgxNzMtdmNvZGVjLXZwOC1lbmMiLA0K PiArCQkJLmRhdGEgPSAmbXQ4MTczX3ZwOF9wZGF0YX0sDQo+ICAJey5jb21wYXRpYmxlID0gIm1l ZGlhdGVrLG10ODE4My12Y29kZWMtZW5jIiwgLmRhdGEgPSAmbXQ4MTgzX3BkYXRhfSwNCj4gIAl7 fSwNCj4gIH07DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29k ZWMvbXRrX3Zjb2RlY19lbmNfcG0uYyBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLXZjb2Rl Yy9tdGtfdmNvZGVjX2VuY19wbS5jDQo+IGluZGV4IDNiN2M1NGQ2YWE4Zi4uMWIyZTQ5MzBlZDI3 IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMvbXRrX3Zj b2RlY19lbmNfcG0uYw0KPiArKysgYi9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMv bXRrX3Zjb2RlY19lbmNfcG0uYw0KPiBAQCAtNDMsMjMgKzQzLDYgQEAgaW50IG10a192Y29kZWNf aW5pdF9lbmNfcG0oc3RydWN0IG10a192Y29kZWNfZGV2ICptdGtkZXYpDQo+ICAJCXJldHVybiAt RU5PREVWOw0KPiAgCX0NCj4gIAlwbS0+bGFyYnZlbmMgPSAmcGRldi0+ZGV2Ow0KPiAtDQo+IC0J bm9kZSA9IG9mX3BhcnNlX3BoYW5kbGUoZGV2LT5vZl9ub2RlLCAibWVkaWF0ZWssbGFyYiIsIDEp Ow0KPiAtCWlmICghbm9kZSkgew0KPiAtCQltdGtfdjRsMl9lcnIoIm5vIG1lZGlhdGVrLGxhcmIg Zm91bmQiKTsNCj4gLQkJcmV0ID0gLUVOT0RFVjsNCj4gLQkJZ290byBwdXRfbGFyYnZlbmM7DQo+ IC0JfQ0KPiAtDQo+IC0JcGRldiA9IG9mX2ZpbmRfZGV2aWNlX2J5X25vZGUobm9kZSk7DQo+IC0J b2Zfbm9kZV9wdXQobm9kZSk7DQo+IC0JaWYgKCFwZGV2KSB7DQo+IC0JCW10a192NGwyX2Vycigi bm8gbWVkaWF0ZWssbGFyYiBkZXZpY2UgZm91bmQiKTsNCj4gLQkJcmV0ID0gLUVOT0RFVjsNCj4g LQkJZ290byBwdXRfbGFyYnZlbmM7DQo+IC0JfQ0KPiAtDQo+IC0JcG0tPmxhcmJ2ZW5jbHQgPSAm cGRldi0+ZGV2Ow0KPiAgCXBkZXYgPSBtdGtkZXYtPnBsYXRfZGV2Ow0KPiAgCXBtLT5kZXYgPSAm cGRldi0+ZGV2Ow0KPiAgDQo+IEBAIC03MSwxMiArNTQsMTIgQEAgaW50IG10a192Y29kZWNfaW5p dF9lbmNfcG0oc3RydWN0IG10a192Y29kZWNfZGV2ICptdGtkZXYpDQo+ICAJCQlHRlBfS0VSTkVM KTsNCj4gIAkJaWYgKCFlbmNfY2xrLT5jbGtfaW5mbykgew0KPiAgCQkJcmV0ID0gLUVOT01FTTsN Cj4gLQkJCWdvdG8gcHV0X2xhcmJ2ZW5jbHQ7DQo+ICsJCQlnb3RvIHB1dF9sYXJidmVuYzsNCj4g IAkJfQ0KPiAgCX0gZWxzZSB7DQo+ICAJCW10a192NGwyX2VycigiRmFpbGVkIHRvIGdldCB2ZW5j IGNsb2NrIGNvdW50Iik7DQo+ICAJCXJldCA9IC1FSU5WQUw7DQo+IC0JCWdvdG8gcHV0X2xhcmJ2 ZW5jbHQ7DQo+ICsJCWdvdG8gcHV0X2xhcmJ2ZW5jOw0KPiAgCX0NCj4gIA0KPiAgCWZvciAoaSA9 IDA7IGkgPCBlbmNfY2xrLT5jbGtfbnVtOyBpKyspIHsNCj4gQEAgLTg1LDcgKzY4LDcgQEAgaW50 IG10a192Y29kZWNfaW5pdF9lbmNfcG0oc3RydWN0IG10a192Y29kZWNfZGV2ICptdGtkZXYpDQo+ ICAJCQkiY2xvY2stbmFtZXMiLCBpLCAmY2xrX2luZm8tPmNsa19uYW1lKTsNCj4gIAkJaWYgKHJl dCkgew0KPiAgCQkJbXRrX3Y0bDJfZXJyKCJ2ZW5jIGZhaWxlZCB0byBnZXQgY2xrIG5hbWUgJWQi LCBpKTsNCj4gLQkJCWdvdG8gcHV0X2xhcmJ2ZW5jbHQ7DQo+ICsJCQlnb3RvIHB1dF9sYXJidmVu YzsNCj4gIAkJfQ0KPiAgCQljbGtfaW5mby0+dmNvZGVjX2NsayA9IGRldm1fY2xrX2dldCgmcGRl di0+ZGV2LA0KPiAgCQkJY2xrX2luZm8tPmNsa19uYW1lKTsNCj4gQEAgLTkzLDE0ICs3NiwxMiBA QCBpbnQgbXRrX3Zjb2RlY19pbml0X2VuY19wbShzdHJ1Y3QgbXRrX3Zjb2RlY19kZXYgKm10a2Rl dikNCj4gIAkJCW10a192NGwyX2VycigidmVuYyBkZXZtX2Nsa19nZXQgKCVkKSVzIGZhaWwiLCBp LA0KPiAgCQkJCWNsa19pbmZvLT5jbGtfbmFtZSk7DQo+ICAJCQlyZXQgPSBQVFJfRVJSKGNsa19p bmZvLT52Y29kZWNfY2xrKTsNCj4gLQkJCWdvdG8gcHV0X2xhcmJ2ZW5jbHQ7DQo+ICsJCQlnb3Rv IHB1dF9sYXJidmVuYzsNCj4gIAkJfQ0KPiAgCX0NCj4gIA0KPiAgCXJldHVybiAwOw0KPiAgDQo+ IC1wdXRfbGFyYnZlbmNsdDoNCj4gLQlwdXRfZGV2aWNlKHBtLT5sYXJidmVuY2x0KTsNCj4gIHB1 dF9sYXJidmVuYzoNCj4gIAlwdXRfZGV2aWNlKHBtLT5sYXJidmVuYyk7DQo+ICAJcmV0dXJuIHJl dDsNCj4gQEAgLTEwOCw3ICs4OSw3IEBAIGludCBtdGtfdmNvZGVjX2luaXRfZW5jX3BtKHN0cnVj dCBtdGtfdmNvZGVjX2RldiAqbXRrZGV2KQ0KPiAgDQo+ICB2b2lkIG10a192Y29kZWNfcmVsZWFz ZV9lbmNfcG0oc3RydWN0IG10a192Y29kZWNfZGV2ICptdGtkZXYpDQo+ICB7DQo+IC0JcHV0X2Rl dmljZShtdGtkZXYtPnBtLmxhcmJ2ZW5jbHQpOw0KPiArCXBtX3J1bnRpbWVfZGlzYWJsZShtdGtk ZXYtPnBtLmRldik7DQo+ICAJcHV0X2RldmljZShtdGtkZXYtPnBtLmxhcmJ2ZW5jKTsNCj4gIH0N Cj4gIA0KPiBAQCAtMTMwLDE4ICsxMTEsMTAgQEAgdm9pZCBtdGtfdmNvZGVjX2VuY19jbG9ja19v bihzdHJ1Y3QgbXRrX3Zjb2RlY19wbSAqcG0pDQo+ICAJcmV0ID0gbXRrX3NtaV9sYXJiX2dldChw bS0+bGFyYnZlbmMpOw0KPiAgCWlmIChyZXQpIHsNCj4gIAkJbXRrX3Y0bDJfZXJyKCJtdGtfc21p X2xhcmJfZ2V0IGxhcmIzIGZhaWwgJWQiLCByZXQpOw0KPiAtCQlnb3RvIGxhcmJ2ZW5jZXJyOw0K PiAtCX0NCj4gLQlyZXQgPSBtdGtfc21pX2xhcmJfZ2V0KHBtLT5sYXJidmVuY2x0KTsNCj4gLQlp ZiAocmV0KSB7DQo+IC0JCW10a192NGwyX2VycigibXRrX3NtaV9sYXJiX2dldCBsYXJiNCBmYWls ICVkIiwgcmV0KTsNCj4gLQkJZ290byBsYXJidmVuY2x0ZXJyOw0KPiArCQlnb3RvIGNsa2VycjsN Cj4gIAl9DQo+ICAJcmV0dXJuOw0KPiAgDQo+IC1sYXJidmVuY2x0ZXJyOg0KPiAtCW10a19zbWlf bGFyYl9wdXQocG0tPmxhcmJ2ZW5jKTsNCj4gLWxhcmJ2ZW5jZXJyOg0KPiAgY2xrZXJyOg0KPiAg CWZvciAoaSAtPSAxOyBpID49IDA7IGktLSkNCj4gIAkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGVu Y19jbGstPmNsa19pbmZvW2ldLnZjb2RlY19jbGspOw0KPiBAQCAtMTUzLDcgKzEyNiw2IEBAIHZv aWQgbXRrX3Zjb2RlY19lbmNfY2xvY2tfb2ZmKHN0cnVjdCBtdGtfdmNvZGVjX3BtICpwbSkNCj4g IAlpbnQgaSA9IDA7DQo+ICANCj4gIAltdGtfc21pX2xhcmJfcHV0KHBtLT5sYXJidmVuYyk7DQo+ IC0JbXRrX3NtaV9sYXJiX3B1dChwbS0+bGFyYnZlbmNsdCk7DQo+ICAJZm9yIChpID0gZW5jX2Ns ay0+Y2xrX251bSAtIDE7IGkgPj0gMDsgaS0tKQ0KPiAgCQljbGtfZGlzYWJsZV91bnByZXBhcmUo ZW5jX2Nsay0+Y2xrX2luZm9baV0udmNvZGVjX2Nsayk7DQo+ICB9DQo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMvdmVuYy92ZW5jX3ZwOF9pZi5jIGIvZHJp dmVycy9tZWRpYS9wbGF0Zm9ybS9tdGstdmNvZGVjL3ZlbmMvdmVuY192cDhfaWYuYw0KPiBpbmRl eCAxMWFiYjE5MWFkYTUuLjgyNjdhOWM0ZmQyNSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tZWRp YS9wbGF0Zm9ybS9tdGstdmNvZGVjL3ZlbmMvdmVuY192cDhfaWYuYw0KPiArKysgYi9kcml2ZXJz L21lZGlhL3BsYXRmb3JtL210ay12Y29kZWMvdmVuYy92ZW5jX3ZwOF9pZi5jDQo+IEBAIC0zNjcs NyArMzY3LDcgQEAgc3RhdGljIGludCB2cDhfZW5jX2VuY29kZSh2b2lkICpoYW5kbGUsDQo+ICAN Cj4gIAltdGtfdmNvZGVjX2RlYnVnX2VudGVyKGluc3QpOw0KPiAgDQo+IC0JZW5hYmxlX2lycShj dHgtPmRldi0+ZW5jX2x0X2lycSk7DQo+ICsJZW5hYmxlX2lycShjdHgtPmRldi0+ZW5jX2lycSk7 DQo+ICANCj4gIAlzd2l0Y2ggKG9wdCkgew0KPiAgCWNhc2UgVkVOQ19TVEFSVF9PUFRfRU5DT0RF X0ZSQU1FOg0KPiBAQCAtMzg2LDcgKzM4Niw3IEBAIHN0YXRpYyBpbnQgdnA4X2VuY19lbmNvZGUo dm9pZCAqaGFuZGxlLA0KPiAgDQo+ICBlbmNvZGVfZXJyOg0KPiAgDQo+IC0JZGlzYWJsZV9pcnEo Y3R4LT5kZXYtPmVuY19sdF9pcnEpOw0KPiArCWRpc2FibGVfaXJxKGN0eC0+ZGV2LT5lbmNfaXJx KTsNCj4gIAltdGtfdmNvZGVjX2RlYnVnX2xlYXZlKGluc3QpOw0KPiAgDQo+ICAJcmV0dXJuIHJl dDsNCg0K 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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 B6772C433E0 for ; Tue, 26 Jan 2021 08:44:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4DB202065C for ; Tue, 26 Jan 2021 08:44:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DB202065C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XYbr9Gk1jjA9WGePSLbfTSDyRWbgksPz89AsRdzYU/I=; b=iROl+4CH99vG6U/1KLELCst/6 W9WIlW27LNPUiz/gSEvRYcy+wPnjMWdjiC2oG9aiG8ogdi7zljwb6VPRHGvM6bpLegbZeXLkpYn4O NxHGbWGtbe716692bu54SU5LJZebNz9Z1qkdb/lzeFOG/gRsVnqxauQPCYOLScPOI3jp0hQ5oh2p+ HIVnkZSV6QmRFTh1HOcUCXJGH0hgX44f5yEsBs46aTb2DWbTfyyClSQJ3tH17jBDoyEjjnG07t4Dk DhTVZ9LHAKkgB3zae6fXcwQhwNBoAmMZXsvM9mwC8rAvZW/ZF8cN/xmPxkgSeSBIZm1GVDpALjn8F Gtcd13OXw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4Jxi-0005lw-HS; Tue, 26 Jan 2021 08:44:34 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4Jxf-0005l7-Sa; Tue, 26 Jan 2021 08:44:33 +0000 X-UUID: b512d35aab184d678273322b937ea88b-20210126 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=ab5V6Jg+4cCkW2NoySIkH8C7eY3leIfl1X6U8aIDygM=; b=sh+wvp2tEXcDdjDyon3lDIimESxyTgzeRomUISiLgOIwDJfBxIvy52KlB1JV+SZjog5Ec+hrzxZQT9VdMdOzMz+bOL+My+KMoki/vmcFV9D0VSDEOd/g1sRW88xvTkyyVyt+uMtPBM4eQttRZmjrdslNmMDTE4ipElHOaxC/LPY=; X-UUID: b512d35aab184d678273322b937ea88b-20210126 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1038153804; Tue, 26 Jan 2021 00:44:27 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Jan 2021 00:44:25 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Jan 2021 16:44:17 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Jan 2021 16:44:18 +0800 Message-ID: <1611650658.20687.3.camel@mtksdaap41> Subject: Re: [PATCH 3/3] media: mtk-vcodec: Separating mtk encoder driver From: Tiffany Lin To: Irui Wang Date: Tue, 26 Jan 2021 16:44:18 +0800 In-Reply-To: <20210121061804.26423-3-irui.wang@mediatek.com> References: <20210121061804.26423-1-irui.wang@mediatek.com> <20210121061804.26423-3-irui.wang@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210126_034432_058890_39D53BEF X-CRM114-Status: GOOD ( 29.82 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew-CT Chen , Maoguang Meng , srv_heupstream@mediatek.com, Alexandre Courbot , Tomasz Figa , Yunfei Dong , Longfei Wang , linux-kernel@vger.kernel.org, Matthias Brugger , devicetree@vger.kernel.org, Rob Herring , linux-mediatek@lists.infradead.org, Hsin-Yi Wang , Hans Verkuil , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Thu, 2021-01-21 at 14:18 +0800, Irui Wang wrote: > MTK H264 Encoder(VENC_SYS) and VP8 Encoder(VENC_LT_SYS) are two > independent hardware instance. They have their owner interrupt, > register mapping, and special clocks. > > This patch seperates them into two drivers: > User Call "VIDIOC_QUERYCAP": > H264 Encoder return driver name "mtk-vcodec-enc"; > VP8 Encoder return driver name "mtk-venc-vp8. > > Signed-off-by: Hsin-Yi Wang > Signed-off-by: Maoguang Meng > Signed-off-by: Irui Wang > Acked-by: Tiffany Lin > --- > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 10 +- > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 23 +++- > .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 121 +++++++----------- > .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 40 +----- > .../platform/mtk-vcodec/venc/venc_vp8_if.c | 4 +- > 5 files changed, 82 insertions(+), 116 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > index 3dd010cba23e..1594edcc706d 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > @@ -19,6 +19,7 @@ > #define MTK_VCODEC_DRV_NAME "mtk_vcodec_drv" > #define MTK_VCODEC_DEC_NAME "mtk-vcodec-dec" > #define MTK_VCODEC_ENC_NAME "mtk-vcodec-enc" > +#define MTK_VENC_VP8_NAME "mtk-venc-vp8" > #define MTK_PLATFORM_STR "platform:mt8173" > > #define MTK_VCODEC_MAX_PLANES 3 > @@ -193,7 +194,6 @@ struct mtk_vcodec_pm { > > struct mtk_vcodec_clk venc_clk; > struct device *larbvenc; > - struct device *larbvenclt; > struct device *dev; > struct mtk_vcodec_dev *mtkdev; > }; > @@ -311,25 +311,27 @@ enum mtk_chip { > * @chip: chip this encoder is compatible with > * > * @uses_ext: whether the encoder uses the extended firmware messaging format > - * @has_lt_irq: whether the encoder uses the LT irq > + * @name: whether the encoder core is vp8 > * @min_birate: minimum supported encoding bitrate > * @max_bitrate: maximum supported encoding bitrate > * @capture_formats: array of supported capture formats > * @num_capture_formats: number of entries in capture_formats > * @output_formats: array of supported output formats > * @num_output_formats: number of entries in output_formats > + * @core_id: stand for h264 or vp8 encode index > */ > struct mtk_vcodec_enc_pdata { > enum mtk_chip chip; > > bool uses_ext; > - bool has_lt_irq; > + const char *name; > unsigned long min_bitrate; > unsigned long max_bitrate; > const struct mtk_video_fmt *capture_formats; > size_t num_capture_formats; > const struct mtk_video_fmt *output_formats; > size_t num_output_formats; > + int core_id; > }; > > #define MTK_ENC_CTX_IS_EXT(ctx) ((ctx)->dev->venc_pdata->uses_ext) > @@ -361,7 +363,6 @@ struct mtk_vcodec_enc_pdata { > * > * @dec_irq: decoder irq resource > * @enc_irq: h264 encoder irq resource > - * @enc_lt_irq: vp8 encoder irq resource > * > * @dec_mutex: decoder hardware lock > * @enc_mutex: encoder hardware lock. > @@ -397,7 +398,6 @@ struct mtk_vcodec_dev { > > int dec_irq; > int enc_irq; > - int enc_lt_irq; > > struct mutex dec_mutex; > struct mutex enc_mutex; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > index 21de1431cfcb..0da6871b4b39 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_vcodec_drv.h" > #include "mtk_vcodec_enc.h" > @@ -189,7 +190,10 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv, > static int vidioc_venc_querycap(struct file *file, void *priv, > struct v4l2_capability *cap) > { > - strscpy(cap->driver, MTK_VCODEC_ENC_NAME, sizeof(cap->driver)); > + const struct mtk_vcodec_enc_pdata *pdata = > + fh_to_ctx(priv)->dev->venc_pdata; > + > + strscpy(cap->driver, pdata->name, sizeof(cap->driver)); > strscpy(cap->bus_info, MTK_PLATFORM_STR, sizeof(cap->bus_info)); > strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); > > @@ -797,7 +801,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > */ > if ((ctx->state == MTK_STATE_ABORT) || (ctx->state == MTK_STATE_FREE)) { > ret = -EIO; > - goto err_set_param; > + goto err_start_stream; > } > > /* Do the initialization when both start_streaming have been called */ > @@ -809,6 +813,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > return 0; > } > > + ret = pm_runtime_get_sync(&ctx->dev->plat_dev->dev); > + if (ret < 0) { > + mtk_v4l2_err("pm_runtime_get_sync fail %d", ret); > + goto err_start_stream; > + } > + > mtk_venc_set_param(ctx, ¶m); > ret = venc_if_set_param(ctx, VENC_SET_PARAM_ENC, ¶m); > if (ret) { > @@ -835,6 +845,11 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > return 0; > > err_set_param: > + ret = pm_runtime_put(&ctx->dev->plat_dev->dev); > + if (ret < 0) > + mtk_v4l2_err("pm_runtime_put fail %d", ret); > + > +err_start_stream: > for (i = 0; i < q->num_buffers; ++i) { > struct vb2_buffer *buf = vb2_get_buffer(q, i); > > @@ -888,6 +903,10 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) > if (ret) > mtk_v4l2_err("venc_if_deinit failed=%d", ret); > > + ret = pm_runtime_put(&ctx->dev->plat_dev->dev); > + if (ret < 0) > + mtk_v4l2_err("pm_runtime_put fail %d", ret); > + > ctx->state = MTK_STATE_FREE; > } > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > index dfb42e19bf81..4bee42454253 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > @@ -49,12 +49,15 @@ static const struct mtk_video_fmt mtk_video_formats_output_mt8173[] = { > }, > }; > > -static const struct mtk_video_fmt mtk_video_formats_capture_mt8173[] = { > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_h264[] = { > { > .fourcc = V4L2_PIX_FMT_H264, > .type = MTK_FMT_ENC, > .num_planes = 1, > }, > +}; > + > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_vp8[] = { > { > .fourcc = V4L2_PIX_FMT_VP8, > .type = MTK_FMT_ENC, > @@ -110,35 +113,13 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv) > ctx = dev->curr_ctx; > spin_unlock_irqrestore(&dev->irqlock, flags); > > - mtk_v4l2_debug(1, "id=%d", ctx->id); > - addr = dev->reg_base[VENC_SYS] + MTK_VENC_IRQ_ACK_OFFSET; > - > - ctx->irq_status = readl(dev->reg_base[VENC_SYS] + > - (MTK_VENC_IRQ_STATUS_OFFSET)); > - > - clean_irq_status(ctx->irq_status, addr); > - > - wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED); > - return IRQ_HANDLED; > -} > - > -static irqreturn_t mtk_vcodec_enc_lt_irq_handler(int irq, void *priv) > -{ > - struct mtk_vcodec_dev *dev = priv; > - struct mtk_vcodec_ctx *ctx; > - unsigned long flags; > - void __iomem *addr; > - > - spin_lock_irqsave(&dev->irqlock, flags); > - ctx = dev->curr_ctx; > - spin_unlock_irqrestore(&dev->irqlock, flags); > + mtk_v4l2_debug(1, "id=%d coreid:%d", ctx->id, dev->venc_pdata->core_id); > + addr = dev->reg_base[dev->venc_pdata->core_id] + > + MTK_VENC_IRQ_ACK_OFFSET; > > - mtk_v4l2_debug(1, "id=%d", ctx->id); > - ctx->irq_status = readl(dev->reg_base[VENC_LT_SYS] + > + ctx->irq_status = readl(dev->reg_base[dev->venc_pdata->core_id] + > (MTK_VENC_IRQ_STATUS_OFFSET)); > > - addr = dev->reg_base[VENC_LT_SYS] + MTK_VENC_IRQ_ACK_OFFSET; > - > clean_irq_status(ctx->irq_status, addr); > > wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED); > @@ -293,17 +274,21 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > dev->venc_pdata = of_device_get_match_data(&pdev->dev); > ret = mtk_vcodec_init_enc_pm(dev); > if (ret < 0) { > - dev_err(&pdev->dev, "Failed to get mt vcodec clock source!"); > + dev_err(&pdev->dev, "Failed to get mtk vcodec clock source!"); > goto err_enc_pm; > } > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - dev->reg_base[VENC_SYS] = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR((__force void *)dev->reg_base[VENC_SYS])) { > - ret = PTR_ERR((__force void *)dev->reg_base[VENC_SYS]); > + pm_runtime_enable(&pdev->dev); > + > + snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s", > + dev->venc_pdata->name); > + > + dev->reg_base[dev->venc_pdata->core_id] = > + devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(dev->reg_base[dev->venc_pdata->core_id])) { > + ret = PTR_ERR(dev->reg_base[dev->venc_pdata->core_id]); > goto err_res; > } > - mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_SYS]); > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (res == NULL) { > @@ -318,44 +303,17 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > mtk_vcodec_enc_irq_handler, > 0, pdev->name, dev); > if (ret) { > - dev_err(&pdev->dev, "Failed to install dev->enc_irq %d (%d)", > - dev->enc_irq, > - ret); > + dev_err(&pdev->dev, > + "Failed to install dev->enc_irq %d (%d) core_id:%d", > + dev->enc_irq, ret, dev->venc_pdata->core_id); > ret = -EINVAL; > goto err_res; > } > > - if (dev->venc_pdata->has_lt_irq) { > - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - dev->reg_base[VENC_LT_SYS] = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR((__force void *)dev->reg_base[VENC_LT_SYS])) { > - ret = PTR_ERR((__force void *)dev->reg_base[VENC_LT_SYS]); > - goto err_res; > - } > - mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_LT_SYS]); > - > - dev->enc_lt_irq = platform_get_irq(pdev, 1); > - irq_set_status_flags(dev->enc_lt_irq, IRQ_NOAUTOEN); > - ret = devm_request_irq(&pdev->dev, > - dev->enc_lt_irq, > - mtk_vcodec_enc_lt_irq_handler, > - 0, pdev->name, dev); > - if (ret) { > - dev_err(&pdev->dev, > - "Failed to install dev->enc_lt_irq %d (%d)", > - dev->enc_lt_irq, ret); > - ret = -EINVAL; > - goto err_res; > - } > - } > - > mutex_init(&dev->enc_mutex); > mutex_init(&dev->dev_mutex); > spin_lock_init(&dev->irqlock); > > - snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s", > - "[MTK_V4L2_VENC]"); > - > ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); > if (ret) { > mtk_v4l2_err("v4l2_device_register err=%d", ret); > @@ -381,7 +339,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > V4L2_CAP_STREAMING; > > snprintf(vfd_enc->name, sizeof(vfd_enc->name), "%s", > - MTK_VCODEC_ENC_NAME); > + dev->venc_pdata->name); > video_set_drvdata(vfd_enc, dev); > dev->vfd_enc = vfd_enc; > platform_set_drvdata(pdev, dev); > @@ -409,8 +367,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > goto err_enc_reg; > } > > - mtk_v4l2_debug(0, "encoder registered as /dev/video%d", > - vfd_enc->num); > + mtk_v4l2_debug(0, "encoder %d registered as /dev/video%d", > + dev->venc_pdata->core_id, vfd_enc->num); > > return 0; > > @@ -429,20 +387,33 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > return ret; > } > > -static const struct mtk_vcodec_enc_pdata mt8173_pdata = { > +static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = { > .chip = MTK_MT8173, > - .has_lt_irq = true, > - .capture_formats = mtk_video_formats_capture_mt8173, > - .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8173), > + .name = MTK_VCODEC_ENC_NAME, > + .capture_formats = mtk_video_formats_capture_mt8173_h264, > + .num_capture_formats = 1, > .output_formats = mtk_video_formats_output_mt8173, > .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > - .min_bitrate = 1, > + .min_bitrate = 64, > + .max_bitrate = 4000000, > + .core_id = VENC_SYS, > +}; > + > +static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = { > + .chip = MTK_MT8173, > + .name = MTK_VENC_VP8_NAME, > + .capture_formats = mtk_video_formats_capture_mt8173_vp8, > + .num_capture_formats = 1, > + .output_formats = mtk_video_formats_output_mt8173, > + .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > + .min_bitrate = 64, > .max_bitrate = 4000000, > + .core_id = VENC_LT_SYS, > }; > > static const struct mtk_vcodec_enc_pdata mt8183_pdata = { > .chip = MTK_MT8183, > - .has_lt_irq = false, > + .name = MTK_VCODEC_ENC_NAME, > .uses_ext = true, > .capture_formats = mtk_video_formats_capture_mt8183, > .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8183), > @@ -451,10 +422,14 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = { > .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > .min_bitrate = 64, > .max_bitrate = 40000000, > + .core_id = VENC_SYS, > }; > > static const struct of_device_id mtk_vcodec_enc_match[] = { > - {.compatible = "mediatek,mt8173-vcodec-enc", .data = &mt8173_pdata}, > + {.compatible = "mediatek,mt8173-vcodec-avc-enc", > + .data = &mt8173_avc_pdata}, > + {.compatible = "mediatek,mt8173-vcodec-vp8-enc", > + .data = &mt8173_vp8_pdata}, > {.compatible = "mediatek,mt8183-vcodec-enc", .data = &mt8183_pdata}, > {}, > }; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > index 3b7c54d6aa8f..1b2e4930ed27 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > @@ -43,23 +43,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > return -ENODEV; > } > pm->larbvenc = &pdev->dev; > - > - node = of_parse_phandle(dev->of_node, "mediatek,larb", 1); > - if (!node) { > - mtk_v4l2_err("no mediatek,larb found"); > - ret = -ENODEV; > - goto put_larbvenc; > - } > - > - pdev = of_find_device_by_node(node); > - of_node_put(node); > - if (!pdev) { > - mtk_v4l2_err("no mediatek,larb device found"); > - ret = -ENODEV; > - goto put_larbvenc; > - } > - > - pm->larbvenclt = &pdev->dev; > pdev = mtkdev->plat_dev; > pm->dev = &pdev->dev; > > @@ -71,12 +54,12 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > GFP_KERNEL); > if (!enc_clk->clk_info) { > ret = -ENOMEM; > - goto put_larbvenclt; > + goto put_larbvenc; > } > } else { > mtk_v4l2_err("Failed to get venc clock count"); > ret = -EINVAL; > - goto put_larbvenclt; > + goto put_larbvenc; > } > > for (i = 0; i < enc_clk->clk_num; i++) { > @@ -85,7 +68,7 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > "clock-names", i, &clk_info->clk_name); > if (ret) { > mtk_v4l2_err("venc failed to get clk name %d", i); > - goto put_larbvenclt; > + goto put_larbvenc; > } > clk_info->vcodec_clk = devm_clk_get(&pdev->dev, > clk_info->clk_name); > @@ -93,14 +76,12 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i, > clk_info->clk_name); > ret = PTR_ERR(clk_info->vcodec_clk); > - goto put_larbvenclt; > + goto put_larbvenc; > } > } > > return 0; > > -put_larbvenclt: > - put_device(pm->larbvenclt); > put_larbvenc: > put_device(pm->larbvenc); > return ret; > @@ -108,7 +89,7 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > > void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev) > { > - put_device(mtkdev->pm.larbvenclt); > + pm_runtime_disable(mtkdev->pm.dev); > put_device(mtkdev->pm.larbvenc); > } > > @@ -130,18 +111,10 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) > ret = mtk_smi_larb_get(pm->larbvenc); > if (ret) { > mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret); > - goto larbvencerr; > - } > - ret = mtk_smi_larb_get(pm->larbvenclt); > - if (ret) { > - mtk_v4l2_err("mtk_smi_larb_get larb4 fail %d", ret); > - goto larbvenclterr; > + goto clkerr; > } > return; > > -larbvenclterr: > - mtk_smi_larb_put(pm->larbvenc); > -larbvencerr: > clkerr: > for (i -= 1; i >= 0; i--) > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk); > @@ -153,7 +126,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm) > int i = 0; > > mtk_smi_larb_put(pm->larbvenc); > - mtk_smi_larb_put(pm->larbvenclt); > for (i = enc_clk->clk_num - 1; i >= 0; i--) > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk); > } > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > index 11abb191ada5..8267a9c4fd25 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > @@ -367,7 +367,7 @@ static int vp8_enc_encode(void *handle, > > mtk_vcodec_debug_enter(inst); > > - enable_irq(ctx->dev->enc_lt_irq); > + enable_irq(ctx->dev->enc_irq); > > switch (opt) { > case VENC_START_OPT_ENCODE_FRAME: > @@ -386,7 +386,7 @@ static int vp8_enc_encode(void *handle, > > encode_err: > > - disable_irq(ctx->dev->enc_lt_irq); > + disable_irq(ctx->dev->enc_irq); > mtk_vcodec_debug_leave(inst); > > return ret; _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 3DB58C433E6 for ; Tue, 26 Jan 2021 08:46:40 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 D63762065C for ; Tue, 26 Jan 2021 08:46:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D63762065C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=d0YUd/wr23XdPClUg02oxSBCXCqvfz+jnaNzeiKk0b8=; b=BZhKPddZq0aNakGhD9+VqEs1B 4YWGvzUSjZSFPqro1xP1GMYPmY6AUNRF+HQvJtT9qpALGcPLmM8hyY9/Cyv9d/uq9fvYk+OdLwi+x qqV54Cdd9dr0LpEocg/j1CnQ6D4qpFXNaQ9Duullr8BhcgR+L7l+dES8EIc0gIJo4qstq3gaQodfd vglmREfU6/s/n0F2aCaxOiKGE7J5YV3H5O13b7i2xwD38CGwy8gfZ/Dsz25rHBa1klO7sITR01mhq H5+V7HLZbJVy1Km5rxb7IUQxhOhzIbnloJctkHE1QosQUMNk9kW9nhiKvxrrCTMVgVKyikviaCprj Ceh3JGQYQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4Jxk-0005mF-8p; Tue, 26 Jan 2021 08:44:36 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4Jxf-0005l7-Sa; Tue, 26 Jan 2021 08:44:33 +0000 X-UUID: b512d35aab184d678273322b937ea88b-20210126 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=ab5V6Jg+4cCkW2NoySIkH8C7eY3leIfl1X6U8aIDygM=; b=sh+wvp2tEXcDdjDyon3lDIimESxyTgzeRomUISiLgOIwDJfBxIvy52KlB1JV+SZjog5Ec+hrzxZQT9VdMdOzMz+bOL+My+KMoki/vmcFV9D0VSDEOd/g1sRW88xvTkyyVyt+uMtPBM4eQttRZmjrdslNmMDTE4ipElHOaxC/LPY=; X-UUID: b512d35aab184d678273322b937ea88b-20210126 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1038153804; Tue, 26 Jan 2021 00:44:27 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Jan 2021 00:44:25 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Jan 2021 16:44:17 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Jan 2021 16:44:18 +0800 Message-ID: <1611650658.20687.3.camel@mtksdaap41> Subject: Re: [PATCH 3/3] media: mtk-vcodec: Separating mtk encoder driver From: Tiffany Lin To: Irui Wang Date: Tue, 26 Jan 2021 16:44:18 +0800 In-Reply-To: <20210121061804.26423-3-irui.wang@mediatek.com> References: <20210121061804.26423-1-irui.wang@mediatek.com> <20210121061804.26423-3-irui.wang@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210126_034432_058890_39D53BEF X-CRM114-Status: GOOD ( 29.82 ) 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: Andrew-CT Chen , Maoguang Meng , srv_heupstream@mediatek.com, Alexandre Courbot , Tomasz Figa , Yunfei Dong , Longfei Wang , linux-kernel@vger.kernel.org, Matthias Brugger , devicetree@vger.kernel.org, Rob Herring , linux-mediatek@lists.infradead.org, Hsin-Yi Wang , Hans Verkuil , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org 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 Thu, 2021-01-21 at 14:18 +0800, Irui Wang wrote: > MTK H264 Encoder(VENC_SYS) and VP8 Encoder(VENC_LT_SYS) are two > independent hardware instance. They have their owner interrupt, > register mapping, and special clocks. > > This patch seperates them into two drivers: > User Call "VIDIOC_QUERYCAP": > H264 Encoder return driver name "mtk-vcodec-enc"; > VP8 Encoder return driver name "mtk-venc-vp8. > > Signed-off-by: Hsin-Yi Wang > Signed-off-by: Maoguang Meng > Signed-off-by: Irui Wang > Acked-by: Tiffany Lin > --- > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 10 +- > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 23 +++- > .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 121 +++++++----------- > .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 40 +----- > .../platform/mtk-vcodec/venc/venc_vp8_if.c | 4 +- > 5 files changed, 82 insertions(+), 116 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > index 3dd010cba23e..1594edcc706d 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > @@ -19,6 +19,7 @@ > #define MTK_VCODEC_DRV_NAME "mtk_vcodec_drv" > #define MTK_VCODEC_DEC_NAME "mtk-vcodec-dec" > #define MTK_VCODEC_ENC_NAME "mtk-vcodec-enc" > +#define MTK_VENC_VP8_NAME "mtk-venc-vp8" > #define MTK_PLATFORM_STR "platform:mt8173" > > #define MTK_VCODEC_MAX_PLANES 3 > @@ -193,7 +194,6 @@ struct mtk_vcodec_pm { > > struct mtk_vcodec_clk venc_clk; > struct device *larbvenc; > - struct device *larbvenclt; > struct device *dev; > struct mtk_vcodec_dev *mtkdev; > }; > @@ -311,25 +311,27 @@ enum mtk_chip { > * @chip: chip this encoder is compatible with > * > * @uses_ext: whether the encoder uses the extended firmware messaging format > - * @has_lt_irq: whether the encoder uses the LT irq > + * @name: whether the encoder core is vp8 > * @min_birate: minimum supported encoding bitrate > * @max_bitrate: maximum supported encoding bitrate > * @capture_formats: array of supported capture formats > * @num_capture_formats: number of entries in capture_formats > * @output_formats: array of supported output formats > * @num_output_formats: number of entries in output_formats > + * @core_id: stand for h264 or vp8 encode index > */ > struct mtk_vcodec_enc_pdata { > enum mtk_chip chip; > > bool uses_ext; > - bool has_lt_irq; > + const char *name; > unsigned long min_bitrate; > unsigned long max_bitrate; > const struct mtk_video_fmt *capture_formats; > size_t num_capture_formats; > const struct mtk_video_fmt *output_formats; > size_t num_output_formats; > + int core_id; > }; > > #define MTK_ENC_CTX_IS_EXT(ctx) ((ctx)->dev->venc_pdata->uses_ext) > @@ -361,7 +363,6 @@ struct mtk_vcodec_enc_pdata { > * > * @dec_irq: decoder irq resource > * @enc_irq: h264 encoder irq resource > - * @enc_lt_irq: vp8 encoder irq resource > * > * @dec_mutex: decoder hardware lock > * @enc_mutex: encoder hardware lock. > @@ -397,7 +398,6 @@ struct mtk_vcodec_dev { > > int dec_irq; > int enc_irq; > - int enc_lt_irq; > > struct mutex dec_mutex; > struct mutex enc_mutex; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > index 21de1431cfcb..0da6871b4b39 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_vcodec_drv.h" > #include "mtk_vcodec_enc.h" > @@ -189,7 +190,10 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv, > static int vidioc_venc_querycap(struct file *file, void *priv, > struct v4l2_capability *cap) > { > - strscpy(cap->driver, MTK_VCODEC_ENC_NAME, sizeof(cap->driver)); > + const struct mtk_vcodec_enc_pdata *pdata = > + fh_to_ctx(priv)->dev->venc_pdata; > + > + strscpy(cap->driver, pdata->name, sizeof(cap->driver)); > strscpy(cap->bus_info, MTK_PLATFORM_STR, sizeof(cap->bus_info)); > strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); > > @@ -797,7 +801,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > */ > if ((ctx->state == MTK_STATE_ABORT) || (ctx->state == MTK_STATE_FREE)) { > ret = -EIO; > - goto err_set_param; > + goto err_start_stream; > } > > /* Do the initialization when both start_streaming have been called */ > @@ -809,6 +813,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > return 0; > } > > + ret = pm_runtime_get_sync(&ctx->dev->plat_dev->dev); > + if (ret < 0) { > + mtk_v4l2_err("pm_runtime_get_sync fail %d", ret); > + goto err_start_stream; > + } > + > mtk_venc_set_param(ctx, ¶m); > ret = venc_if_set_param(ctx, VENC_SET_PARAM_ENC, ¶m); > if (ret) { > @@ -835,6 +845,11 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) > return 0; > > err_set_param: > + ret = pm_runtime_put(&ctx->dev->plat_dev->dev); > + if (ret < 0) > + mtk_v4l2_err("pm_runtime_put fail %d", ret); > + > +err_start_stream: > for (i = 0; i < q->num_buffers; ++i) { > struct vb2_buffer *buf = vb2_get_buffer(q, i); > > @@ -888,6 +903,10 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) > if (ret) > mtk_v4l2_err("venc_if_deinit failed=%d", ret); > > + ret = pm_runtime_put(&ctx->dev->plat_dev->dev); > + if (ret < 0) > + mtk_v4l2_err("pm_runtime_put fail %d", ret); > + > ctx->state = MTK_STATE_FREE; > } > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > index dfb42e19bf81..4bee42454253 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > @@ -49,12 +49,15 @@ static const struct mtk_video_fmt mtk_video_formats_output_mt8173[] = { > }, > }; > > -static const struct mtk_video_fmt mtk_video_formats_capture_mt8173[] = { > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_h264[] = { > { > .fourcc = V4L2_PIX_FMT_H264, > .type = MTK_FMT_ENC, > .num_planes = 1, > }, > +}; > + > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_vp8[] = { > { > .fourcc = V4L2_PIX_FMT_VP8, > .type = MTK_FMT_ENC, > @@ -110,35 +113,13 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv) > ctx = dev->curr_ctx; > spin_unlock_irqrestore(&dev->irqlock, flags); > > - mtk_v4l2_debug(1, "id=%d", ctx->id); > - addr = dev->reg_base[VENC_SYS] + MTK_VENC_IRQ_ACK_OFFSET; > - > - ctx->irq_status = readl(dev->reg_base[VENC_SYS] + > - (MTK_VENC_IRQ_STATUS_OFFSET)); > - > - clean_irq_status(ctx->irq_status, addr); > - > - wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED); > - return IRQ_HANDLED; > -} > - > -static irqreturn_t mtk_vcodec_enc_lt_irq_handler(int irq, void *priv) > -{ > - struct mtk_vcodec_dev *dev = priv; > - struct mtk_vcodec_ctx *ctx; > - unsigned long flags; > - void __iomem *addr; > - > - spin_lock_irqsave(&dev->irqlock, flags); > - ctx = dev->curr_ctx; > - spin_unlock_irqrestore(&dev->irqlock, flags); > + mtk_v4l2_debug(1, "id=%d coreid:%d", ctx->id, dev->venc_pdata->core_id); > + addr = dev->reg_base[dev->venc_pdata->core_id] + > + MTK_VENC_IRQ_ACK_OFFSET; > > - mtk_v4l2_debug(1, "id=%d", ctx->id); > - ctx->irq_status = readl(dev->reg_base[VENC_LT_SYS] + > + ctx->irq_status = readl(dev->reg_base[dev->venc_pdata->core_id] + > (MTK_VENC_IRQ_STATUS_OFFSET)); > > - addr = dev->reg_base[VENC_LT_SYS] + MTK_VENC_IRQ_ACK_OFFSET; > - > clean_irq_status(ctx->irq_status, addr); > > wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED); > @@ -293,17 +274,21 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > dev->venc_pdata = of_device_get_match_data(&pdev->dev); > ret = mtk_vcodec_init_enc_pm(dev); > if (ret < 0) { > - dev_err(&pdev->dev, "Failed to get mt vcodec clock source!"); > + dev_err(&pdev->dev, "Failed to get mtk vcodec clock source!"); > goto err_enc_pm; > } > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - dev->reg_base[VENC_SYS] = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR((__force void *)dev->reg_base[VENC_SYS])) { > - ret = PTR_ERR((__force void *)dev->reg_base[VENC_SYS]); > + pm_runtime_enable(&pdev->dev); > + > + snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s", > + dev->venc_pdata->name); > + > + dev->reg_base[dev->venc_pdata->core_id] = > + devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(dev->reg_base[dev->venc_pdata->core_id])) { > + ret = PTR_ERR(dev->reg_base[dev->venc_pdata->core_id]); > goto err_res; > } > - mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_SYS]); > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (res == NULL) { > @@ -318,44 +303,17 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > mtk_vcodec_enc_irq_handler, > 0, pdev->name, dev); > if (ret) { > - dev_err(&pdev->dev, "Failed to install dev->enc_irq %d (%d)", > - dev->enc_irq, > - ret); > + dev_err(&pdev->dev, > + "Failed to install dev->enc_irq %d (%d) core_id:%d", > + dev->enc_irq, ret, dev->venc_pdata->core_id); > ret = -EINVAL; > goto err_res; > } > > - if (dev->venc_pdata->has_lt_irq) { > - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - dev->reg_base[VENC_LT_SYS] = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR((__force void *)dev->reg_base[VENC_LT_SYS])) { > - ret = PTR_ERR((__force void *)dev->reg_base[VENC_LT_SYS]); > - goto err_res; > - } > - mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_LT_SYS]); > - > - dev->enc_lt_irq = platform_get_irq(pdev, 1); > - irq_set_status_flags(dev->enc_lt_irq, IRQ_NOAUTOEN); > - ret = devm_request_irq(&pdev->dev, > - dev->enc_lt_irq, > - mtk_vcodec_enc_lt_irq_handler, > - 0, pdev->name, dev); > - if (ret) { > - dev_err(&pdev->dev, > - "Failed to install dev->enc_lt_irq %d (%d)", > - dev->enc_lt_irq, ret); > - ret = -EINVAL; > - goto err_res; > - } > - } > - > mutex_init(&dev->enc_mutex); > mutex_init(&dev->dev_mutex); > spin_lock_init(&dev->irqlock); > > - snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s", > - "[MTK_V4L2_VENC]"); > - > ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); > if (ret) { > mtk_v4l2_err("v4l2_device_register err=%d", ret); > @@ -381,7 +339,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > V4L2_CAP_STREAMING; > > snprintf(vfd_enc->name, sizeof(vfd_enc->name), "%s", > - MTK_VCODEC_ENC_NAME); > + dev->venc_pdata->name); > video_set_drvdata(vfd_enc, dev); > dev->vfd_enc = vfd_enc; > platform_set_drvdata(pdev, dev); > @@ -409,8 +367,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > goto err_enc_reg; > } > > - mtk_v4l2_debug(0, "encoder registered as /dev/video%d", > - vfd_enc->num); > + mtk_v4l2_debug(0, "encoder %d registered as /dev/video%d", > + dev->venc_pdata->core_id, vfd_enc->num); > > return 0; > > @@ -429,20 +387,33 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > return ret; > } > > -static const struct mtk_vcodec_enc_pdata mt8173_pdata = { > +static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = { > .chip = MTK_MT8173, > - .has_lt_irq = true, > - .capture_formats = mtk_video_formats_capture_mt8173, > - .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8173), > + .name = MTK_VCODEC_ENC_NAME, > + .capture_formats = mtk_video_formats_capture_mt8173_h264, > + .num_capture_formats = 1, > .output_formats = mtk_video_formats_output_mt8173, > .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > - .min_bitrate = 1, > + .min_bitrate = 64, > + .max_bitrate = 4000000, > + .core_id = VENC_SYS, > +}; > + > +static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = { > + .chip = MTK_MT8173, > + .name = MTK_VENC_VP8_NAME, > + .capture_formats = mtk_video_formats_capture_mt8173_vp8, > + .num_capture_formats = 1, > + .output_formats = mtk_video_formats_output_mt8173, > + .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > + .min_bitrate = 64, > .max_bitrate = 4000000, > + .core_id = VENC_LT_SYS, > }; > > static const struct mtk_vcodec_enc_pdata mt8183_pdata = { > .chip = MTK_MT8183, > - .has_lt_irq = false, > + .name = MTK_VCODEC_ENC_NAME, > .uses_ext = true, > .capture_formats = mtk_video_formats_capture_mt8183, > .num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8183), > @@ -451,10 +422,14 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = { > .num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173), > .min_bitrate = 64, > .max_bitrate = 40000000, > + .core_id = VENC_SYS, > }; > > static const struct of_device_id mtk_vcodec_enc_match[] = { > - {.compatible = "mediatek,mt8173-vcodec-enc", .data = &mt8173_pdata}, > + {.compatible = "mediatek,mt8173-vcodec-avc-enc", > + .data = &mt8173_avc_pdata}, > + {.compatible = "mediatek,mt8173-vcodec-vp8-enc", > + .data = &mt8173_vp8_pdata}, > {.compatible = "mediatek,mt8183-vcodec-enc", .data = &mt8183_pdata}, > {}, > }; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > index 3b7c54d6aa8f..1b2e4930ed27 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > @@ -43,23 +43,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > return -ENODEV; > } > pm->larbvenc = &pdev->dev; > - > - node = of_parse_phandle(dev->of_node, "mediatek,larb", 1); > - if (!node) { > - mtk_v4l2_err("no mediatek,larb found"); > - ret = -ENODEV; > - goto put_larbvenc; > - } > - > - pdev = of_find_device_by_node(node); > - of_node_put(node); > - if (!pdev) { > - mtk_v4l2_err("no mediatek,larb device found"); > - ret = -ENODEV; > - goto put_larbvenc; > - } > - > - pm->larbvenclt = &pdev->dev; > pdev = mtkdev->plat_dev; > pm->dev = &pdev->dev; > > @@ -71,12 +54,12 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > GFP_KERNEL); > if (!enc_clk->clk_info) { > ret = -ENOMEM; > - goto put_larbvenclt; > + goto put_larbvenc; > } > } else { > mtk_v4l2_err("Failed to get venc clock count"); > ret = -EINVAL; > - goto put_larbvenclt; > + goto put_larbvenc; > } > > for (i = 0; i < enc_clk->clk_num; i++) { > @@ -85,7 +68,7 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > "clock-names", i, &clk_info->clk_name); > if (ret) { > mtk_v4l2_err("venc failed to get clk name %d", i); > - goto put_larbvenclt; > + goto put_larbvenc; > } > clk_info->vcodec_clk = devm_clk_get(&pdev->dev, > clk_info->clk_name); > @@ -93,14 +76,12 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i, > clk_info->clk_name); > ret = PTR_ERR(clk_info->vcodec_clk); > - goto put_larbvenclt; > + goto put_larbvenc; > } > } > > return 0; > > -put_larbvenclt: > - put_device(pm->larbvenclt); > put_larbvenc: > put_device(pm->larbvenc); > return ret; > @@ -108,7 +89,7 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > > void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev) > { > - put_device(mtkdev->pm.larbvenclt); > + pm_runtime_disable(mtkdev->pm.dev); > put_device(mtkdev->pm.larbvenc); > } > > @@ -130,18 +111,10 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) > ret = mtk_smi_larb_get(pm->larbvenc); > if (ret) { > mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret); > - goto larbvencerr; > - } > - ret = mtk_smi_larb_get(pm->larbvenclt); > - if (ret) { > - mtk_v4l2_err("mtk_smi_larb_get larb4 fail %d", ret); > - goto larbvenclterr; > + goto clkerr; > } > return; > > -larbvenclterr: > - mtk_smi_larb_put(pm->larbvenc); > -larbvencerr: > clkerr: > for (i -= 1; i >= 0; i--) > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk); > @@ -153,7 +126,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm) > int i = 0; > > mtk_smi_larb_put(pm->larbvenc); > - mtk_smi_larb_put(pm->larbvenclt); > for (i = enc_clk->clk_num - 1; i >= 0; i--) > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk); > } > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > index 11abb191ada5..8267a9c4fd25 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > @@ -367,7 +367,7 @@ static int vp8_enc_encode(void *handle, > > mtk_vcodec_debug_enter(inst); > > - enable_irq(ctx->dev->enc_lt_irq); > + enable_irq(ctx->dev->enc_irq); > > switch (opt) { > case VENC_START_OPT_ENCODE_FRAME: > @@ -386,7 +386,7 @@ static int vp8_enc_encode(void *handle, > > encode_err: > > - disable_irq(ctx->dev->enc_lt_irq); > + disable_irq(ctx->dev->enc_irq); > mtk_vcodec_debug_leave(inst); > > return ret; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel