From mboxrd@z Thu Jan 1 00:00:00 1970 From: YT Shen Subject: [PATCH v6 05/10] drm/mediatek: cleaning up and refine Date: Thu, 4 Aug 2016 19:07:19 +0800 Message-ID: <1470308844-20895-6-git-send-email-yt.shen@mediatek.com> References: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, Philipp Zabel Cc: Mark Rutland , Russell King , Mao Huang , yingjoe.chen@mediatek.com, devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , shaoming chen , linux-arm-kernel@lists.infradead.org, srv_heupstream@mediatek.com, emil.l.velikov@gmail.com, linux-kernel@vger.kernel.org, Sascha Hauer , Kumar Gala List-Id: linux-mediatek@lists.infradead.org Y2xlYW5pbmcgdXAgdW51c2VkIGRlZmluZSBhbmQgcmVmaW5lIGZ1bmN0aW9uIG5hbWUgYW5kIHZh cmlhYmxlCgpTaWduZWQtb2ZmLWJ5OiBzaGFvbWluZyBjaGVuIDxzaGFvbWluZy5jaGVuQG1lZGlh dGVrLmNvbT4KU2lnbmVkLW9mZi1ieTogWVQgU2hlbiA8eXQuc2hlbkBtZWRpYXRlay5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kc2kuYyAgICAgfCAgIDc3ICsrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX21p cGlfdHguYyB8ICAgIDggKystLQogMiBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCA0 NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kc2kuYwppbmRleCAyZDgwOGU1 Li5hOWNmNWExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHNpLmMKQEAgLTI3LDkgKzI3LDYg QEAKIAogI2luY2x1ZGUgIm10a19kcm1fZGRwX2NvbXAuaCIKIAotI2RlZmluZSBEU0lfVklERU9f RklGT19ERVBUSAkoMTkyMCAvIDQpCi0jZGVmaW5lIERTSV9IT1NUX0ZJRk9fREVQVEgJNjQKLQog I2RlZmluZSBEU0lfU1RBUlQJCTB4MDAKIAogI2RlZmluZSBEU0lfQ09OX0NUUkwJCTB4MTAKQEAg LTQ2LDcgKzQzLDcgQEAKICNkZWZpbmUgTUlYX01PREUJCQlCSVQoMTcpCiAKICNkZWZpbmUgRFNJ X1RYUlhfQ1RSTAkJMHgxOAotI2RlZmluZSBWQ19OVU0JCQkJKDIgPDwgMCkKKyNkZWZpbmUgVkNf TlVNCQkJCUJJVCgxKQogI2RlZmluZSBMQU5FX05VTQkJCSgweGYgPDwgMikKICNkZWZpbmUgRElT X0VPVAkJCQlCSVQoNikKICNkZWZpbmUgTlVMTF9FTgkJCQlCSVQoNykKQEAgLTE1OCwxMSArMTU1 LDExIEBAIHN0YXRpYyB2b2lkIG10a19kc2lfbWFzayhzdHJ1Y3QgbXRrX2RzaSAqZHNpLCB1MzIg b2Zmc2V0LCB1MzIgbWFzaywgdTMyIGRhdGEpCiAJd3JpdGVsKCh0ZW1wICYgfm1hc2spIHwgKGRh dGEgJiBtYXNrKSwgZHNpLT5yZWdzICsgb2Zmc2V0KTsKIH0KIAotc3RhdGljIHZvaWQgZHNpX3Bo eV90aW1jb25maWcoc3RydWN0IG10a19kc2kgKmRzaSkKK3N0YXRpYyB2b2lkIG10a19kc2lfcGh5 X3RpbWNvbmZpZyhzdHJ1Y3QgbXRrX2RzaSAqZHNpKQogewogCXUzMiB0aW1jb24wLCB0aW1jb24x LCB0aW1jb24yLCB0aW1jb24zOwotCXVuc2lnbmVkIGludCB1aSwgY3ljbGVfdGltZTsKLQl1bnNp Z25lZCBpbnQgbHB4OworCXUzMiB1aSwgY3ljbGVfdGltZTsKKwl1MzIgbHB4OwogCiAJdWkgPSAx MDAwIC8gZHNpLT5kYXRhX3JhdGUgKyAweDAxOwogCWN5Y2xlX3RpbWUgPSA4MDAwIC8gZHNpLT5k YXRhX3JhdGUgKyAweDAxOwpAQCAtMTkyLDcgKzE4OSw3IEBAIHN0YXRpYyB2b2lkIG10a19kc2lf ZGlzYWJsZShzdHJ1Y3QgbXRrX2RzaSAqZHNpKQogCW10a19kc2lfbWFzayhkc2ksIERTSV9DT05f Q1RSTCwgRFNJX0VOLCAwKTsKIH0KIAotc3RhdGljIHZvaWQgbXRrX2RzaV9yZXNldChzdHJ1Y3Qg bXRrX2RzaSAqZHNpKQorc3RhdGljIHZvaWQgbXRrX2RzaV9yZXNldF9lbmdpbmUoc3RydWN0IG10 a19kc2kgKmRzaSkKIHsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfQ09OX0NUUkwsIERTSV9SRVNF VCwgRFNJX1JFU0VUKTsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfQ09OX0NUUkwsIERTSV9SRVNF VCwgMCk7CkBAIC0yMzUsOCArMjMyLDggQEAgc3RhdGljIGludCBtdGtfZHNpX3Bvd2Vyb24oc3Ry dWN0IG10a19kc2kgKmRzaSkKIAl9CiAKIAltdGtfZHNpX2VuYWJsZShkc2kpOwotCW10a19kc2lf cmVzZXQoZHNpKTsKLQlkc2lfcGh5X3RpbWNvbmZpZyhkc2kpOworCW10a19kc2lfcmVzZXRfZW5n aW5lKGRzaSk7CisJbXRrX2RzaV9waHlfdGltY29uZmlnKGRzaSk7CiAKIAlyZXR1cm4gMDsKIApA QCAtMjQ5LDMzICsyNDYsMzMgQEAgZXJyX3JlZmNvdW50OgogCXJldHVybiByZXQ7CiB9CiAKLXN0 YXRpYyB2b2lkIGRzaV9jbGtfdWxwX21vZGVfZW50ZXIoc3RydWN0IG10a19kc2kgKmRzaSkKK3N0 YXRpYyB2b2lkIG10a19kc2lfY2xrX3VscF9tb2RlX2VudGVyKHN0cnVjdCBtdGtfZHNpICpkc2kp CiB7CiAJbXRrX2RzaV9tYXNrKGRzaSwgRFNJX1BIWV9MQ0NPTiwgTENfSFNfVFhfRU4sIDApOwog CW10a19kc2lfbWFzayhkc2ksIERTSV9QSFlfTENDT04sIExDX1VMUE1fRU4sIDApOwogfQogCi1z dGF0aWMgdm9pZCBkc2lfY2xrX3VscF9tb2RlX2xlYXZlKHN0cnVjdCBtdGtfZHNpICpkc2kpCitz dGF0aWMgdm9pZCBtdGtfZHNpX2Nsa191bHBfbW9kZV9sZWF2ZShzdHJ1Y3QgbXRrX2RzaSAqZHNp KQogewogCW10a19kc2lfbWFzayhkc2ksIERTSV9QSFlfTENDT04sIExDX1VMUE1fRU4sIDApOwog CW10a19kc2lfbWFzayhkc2ksIERTSV9QSFlfTENDT04sIExDX1dBS0VVUF9FTiwgTENfV0FLRVVQ X0VOKTsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfUEhZX0xDQ09OLCBMQ19XQUtFVVBfRU4sIDAp OwogfQogCi1zdGF0aWMgdm9pZCBkc2lfbGFuZTBfdWxwX21vZGVfZW50ZXIoc3RydWN0IG10a19k c2kgKmRzaSkKK3N0YXRpYyB2b2lkIG10a19kc2lfbGFuZTBfdWxwX21vZGVfZW50ZXIoc3RydWN0 IG10a19kc2kgKmRzaSkKIHsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfUEhZX0xEMENPTiwgTEQw X0hTX1RYX0VOLCAwKTsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfUEhZX0xEMENPTiwgTEQwX1VM UE1fRU4sIDApOwogfQogCi1zdGF0aWMgdm9pZCBkc2lfbGFuZTBfdWxwX21vZGVfbGVhdmUoc3Ry dWN0IG10a19kc2kgKmRzaSkKK3N0YXRpYyB2b2lkIG10a19kc2lfbGFuZTBfdWxwX21vZGVfbGVh dmUoc3RydWN0IG10a19kc2kgKmRzaSkKIHsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lfUEhZX0xE MENPTiwgTEQwX1VMUE1fRU4sIDApOwogCW10a19kc2lfbWFzayhkc2ksIERTSV9QSFlfTEQwQ09O LCBMRDBfV0FLRVVQX0VOLCBMRDBfV0FLRVVQX0VOKTsKIAltdGtfZHNpX21hc2soZHNpLCBEU0lf UEhZX0xEMENPTiwgTEQwX1dBS0VVUF9FTiwgMCk7CiB9CiAKLXN0YXRpYyBib29sIGRzaV9jbGtf aHNfc3RhdGUoc3RydWN0IG10a19kc2kgKmRzaSkKK3N0YXRpYyBib29sIG10a19kc2lfY2xrX2hz X3N0YXRlKHN0cnVjdCBtdGtfZHNpICpkc2kpCiB7CiAJdTMyIHRtcF9yZWcxOwogCkBAIC0yODMs MTUgKzI4MCwxNSBAQCBzdGF0aWMgYm9vbCBkc2lfY2xrX2hzX3N0YXRlKHN0cnVjdCBtdGtfZHNp ICpkc2kpCiAJcmV0dXJuICgodG1wX3JlZzEgJiBMQ19IU19UWF9FTikgPT0gMSkgPyB0cnVlIDog ZmFsc2U7CiB9CiAKLXN0YXRpYyB2b2lkIGRzaV9jbGtfaHNfbW9kZShzdHJ1Y3QgbXRrX2RzaSAq ZHNpLCBib29sIGVudGVyKQorc3RhdGljIHZvaWQgbXRrX2RzaV9jbGtfaHNfbW9kZShzdHJ1Y3Qg bXRrX2RzaSAqZHNpLCBib29sIGVudGVyKQogewotCWlmIChlbnRlciAmJiAhZHNpX2Nsa19oc19z dGF0ZShkc2kpKQorCWlmIChlbnRlciAmJiAhbXRrX2RzaV9jbGtfaHNfc3RhdGUoZHNpKSkKIAkJ bXRrX2RzaV9tYXNrKGRzaSwgRFNJX1BIWV9MQ0NPTiwgTENfSFNfVFhfRU4sIExDX0hTX1RYX0VO KTsKLQllbHNlIGlmICghZW50ZXIgJiYgZHNpX2Nsa19oc19zdGF0ZShkc2kpKQorCWVsc2UgaWYg KCFlbnRlciAmJiBtdGtfZHNpX2Nsa19oc19zdGF0ZShkc2kpKQogCQltdGtfZHNpX21hc2soZHNp LCBEU0lfUEhZX0xDQ09OLCBMQ19IU19UWF9FTiwgMCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRzaV9z ZXRfbW9kZShzdHJ1Y3QgbXRrX2RzaSAqZHNpKQorc3RhdGljIHZvaWQgbXRrX2RzaV9zZXRfbW9k ZShzdHJ1Y3QgbXRrX2RzaSAqZHNpKQogewogCXUzMiB2aWRfbW9kZSA9IENNRF9NT0RFOwogCkBA IC0zMDYsNyArMzAzLDcgQEAgc3RhdGljIHZvaWQgZHNpX3NldF9tb2RlKHN0cnVjdCBtdGtfZHNp ICpkc2kpCiAJd3JpdGVsKHZpZF9tb2RlLCBkc2ktPnJlZ3MgKyBEU0lfTU9ERV9DVFJMKTsKIH0K IAotc3RhdGljIHZvaWQgZHNpX3BzX2NvbnRyb2xfdmFjdChzdHJ1Y3QgbXRrX2RzaSAqZHNpKQor c3RhdGljIHZvaWQgbXRrX2RzaV9wc19jb250cm9sX3ZhY3Qoc3RydWN0IG10a19kc2kgKmRzaSkK IHsKIAlzdHJ1Y3QgdmlkZW9tb2RlICp2bSA9ICZkc2ktPnZtOwogCXUzMiBkc2lfYnVmX2JwcCwg cHNfd2M7CkBAIC0zNDAsNyArMzM3LDcgQEAgc3RhdGljIHZvaWQgZHNpX3BzX2NvbnRyb2xfdmFj dChzdHJ1Y3QgbXRrX2RzaSAqZHNpKQogCXdyaXRlbChwc193YywgZHNpLT5yZWdzICsgRFNJX0hT VFhfQ0tMX1dDKTsKIH0KIAotc3RhdGljIHZvaWQgZHNpX3J4dHhfY29udHJvbChzdHJ1Y3QgbXRr X2RzaSAqZHNpKQorc3RhdGljIHZvaWQgbXRrX2RzaV9yeHR4X2NvbnRyb2woc3RydWN0IG10a19k c2kgKmRzaSkKIHsKIAl1MzIgdG1wX3JlZzsKIApAQCAtMzY1LDkgKzM2Miw5IEBAIHN0YXRpYyB2 b2lkIGRzaV9yeHR4X2NvbnRyb2woc3RydWN0IG10a19kc2kgKmRzaSkKIAl3cml0ZWwodG1wX3Jl ZywgZHNpLT5yZWdzICsgRFNJX1RYUlhfQ1RSTCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRzaV9wc19j b250cm9sKHN0cnVjdCBtdGtfZHNpICpkc2kpCitzdGF0aWMgdm9pZCBtdGtfZHNpX3BzX2NvbnRy b2woc3RydWN0IG10a19kc2kgKmRzaSkKIHsKLQl1bnNpZ25lZCBpbnQgZHNpX3RtcF9idWZfYnBw OworCXUzMiBkc2lfdG1wX2J1Zl9icHA7CiAJdTMyIHRtcF9yZWc7CiAKIAlzd2l0Y2ggKGRzaS0+ Zm9ybWF0KSB7CkBAIC0zOTcsMTIgKzM5NCwxMiBAQCBzdGF0aWMgdm9pZCBkc2lfcHNfY29udHJv bChzdHJ1Y3QgbXRrX2RzaSAqZHNpKQogCXdyaXRlbCh0bXBfcmVnLCBkc2ktPnJlZ3MgKyBEU0lf UFNDVFJMKTsKIH0KIAotc3RhdGljIHZvaWQgZHNpX2NvbmZpZ192ZG9fdGltaW5nKHN0cnVjdCBt dGtfZHNpICpkc2kpCitzdGF0aWMgdm9pZCBtdGtfZHNpX2NvbmZpZ192ZG9fdGltaW5nKHN0cnVj dCBtdGtfZHNpICpkc2kpCiB7Ci0JdW5zaWduZWQgaW50IGhvcml6b250YWxfc3luY19hY3RpdmVf Ynl0ZTsKLQl1bnNpZ25lZCBpbnQgaG9yaXpvbnRhbF9iYWNrcG9yY2hfYnl0ZTsKLQl1bnNpZ25l ZCBpbnQgaG9yaXpvbnRhbF9mcm9udHBvcmNoX2J5dGU7Ci0JdW5zaWduZWQgaW50IGRzaV90bXBf YnVmX2JwcDsKKwl1MzIgaG9yaXpvbnRhbF9zeW5jX2FjdGl2ZV9ieXRlOworCXUzMiBob3Jpem9u dGFsX2JhY2twb3JjaF9ieXRlOworCXUzMiBob3Jpem9udGFsX2Zyb250cG9yY2hfYnl0ZTsKKwl1 MzIgZHNpX3RtcF9idWZfYnBwOwogCiAJc3RydWN0IHZpZGVvbW9kZSAqdm0gPSAmZHNpLT52bTsK IApAQCAtNDMxLDcgKzQyOCw3IEBAIHN0YXRpYyB2b2lkIGRzaV9jb25maWdfdmRvX3RpbWluZyhz dHJ1Y3QgbXRrX2RzaSAqZHNpKQogCXdyaXRlbChob3Jpem9udGFsX2JhY2twb3JjaF9ieXRlLCBk c2ktPnJlZ3MgKyBEU0lfSEJQX1dDKTsKIAl3cml0ZWwoaG9yaXpvbnRhbF9mcm9udHBvcmNoX2J5 dGUsIGRzaS0+cmVncyArIERTSV9IRlBfV0MpOwogCi0JZHNpX3BzX2NvbnRyb2woZHNpKTsKKwlt dGtfZHNpX3BzX2NvbnRyb2woZHNpKTsKIH0KIAogc3RhdGljIHZvaWQgbXRrX2RzaV9zdGFydChz dHJ1Y3QgbXRrX2RzaSAqZHNpKQpAQCAtNDQ4LDggKzQ0NSw4IEBAIHN0YXRpYyB2b2lkIG10a19k c2lfcG93ZXJvZmYoc3RydWN0IG10a19kc2kgKmRzaSkKIAlpZiAoLS1kc2ktPnJlZmNvdW50ICE9 IDApCiAJCXJldHVybjsKIAotCWRzaV9sYW5lMF91bHBfbW9kZV9lbnRlcihkc2kpOwotCWRzaV9j bGtfdWxwX21vZGVfZW50ZXIoZHNpKTsKKwltdGtfZHNpX2xhbmUwX3VscF9tb2RlX2VudGVyKGRz aSk7CisJbXRrX2RzaV9jbGtfdWxwX21vZGVfZW50ZXIoZHNpKTsKIAogCW10a19kc2lfZGlzYWJs ZShkc2kpOwogCkBAIC00NzksMTggKzQ3NiwxOCBAQCBzdGF0aWMgdm9pZCBtdGtfb3V0cHV0X2Rz aV9lbmFibGUoc3RydWN0IG10a19kc2kgKmRzaSkKIAkJcmV0dXJuOwogCX0KIAotCWRzaV9yeHR4 X2NvbnRyb2woZHNpKTsKKwltdGtfZHNpX3J4dHhfY29udHJvbChkc2kpOwogCi0JZHNpX2Nsa191 bHBfbW9kZV9sZWF2ZShkc2kpOwotCWRzaV9sYW5lMF91bHBfbW9kZV9sZWF2ZShkc2kpOwotCWRz aV9jbGtfaHNfbW9kZShkc2ksIDApOwotCWRzaV9zZXRfbW9kZShkc2kpOworCW10a19kc2lfY2xr X3VscF9tb2RlX2xlYXZlKGRzaSk7CisJbXRrX2RzaV9sYW5lMF91bHBfbW9kZV9sZWF2ZShkc2kp OworCW10a19kc2lfY2xrX2hzX21vZGUoZHNpLCAwKTsKKwltdGtfZHNpX3NldF9tb2RlKGRzaSk7 CiAKLQlkc2lfcHNfY29udHJvbF92YWN0KGRzaSk7Ci0JZHNpX2NvbmZpZ192ZG9fdGltaW5nKGRz aSk7CisJbXRrX2RzaV9wc19jb250cm9sX3ZhY3QoZHNpKTsKKwltdGtfZHNpX2NvbmZpZ192ZG9f dGltaW5nKGRzaSk7CiAKLQlkc2lfc2V0X21vZGUoZHNpKTsKLQlkc2lfY2xrX2hzX21vZGUoZHNp LCAxKTsKKwltdGtfZHNpX3NldF9tb2RlKGRzaSk7CisJbXRrX2RzaV9jbGtfaHNfbW9kZShkc2ks IDEpOwogCiAJbXRrX2RzaV9zdGFydChkc2kpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vbWVkaWF0ZWsvbXRrX21pcGlfdHguYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtf bWlwaV90eC5jCmluZGV4IGNmOGYzOGQuLjE5NDgxYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tZWRpYXRlay9tdGtfbWlwaV90eC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfbWlwaV90eC5jCkBAIC0xMjYsNyArMTI2LDcgQEAKIHN0cnVjdCBtdGtfbWlwaV90eCB7 CiAJc3RydWN0IGRldmljZSAqZGV2OwogCXZvaWQgX19pb21lbSAqcmVnczsKLQl1bnNpZ25lZCBp bnQgZGF0YV9yYXRlOworCXUzMiBkYXRhX3JhdGU7CiAJc3RydWN0IGNsa19odyBwbGxfaHc7CiAJ c3RydWN0IGNsayAqcGxsOwogfTsKQEAgLTE2Myw3ICsxNjMsNyBAQCBzdGF0aWMgdm9pZCBtdGtf bWlwaV90eF91cGRhdGVfYml0cyhzdHJ1Y3QgbXRrX21pcGlfdHggKm1pcGlfdHgsIHUzMiBvZmZz ZXQsCiBzdGF0aWMgaW50IG10a19taXBpX3R4X3BsbF9wcmVwYXJlKHN0cnVjdCBjbGtfaHcgKmh3 KQogewogCXN0cnVjdCBtdGtfbWlwaV90eCAqbWlwaV90eCA9IG10a19taXBpX3R4X2Zyb21fY2xr X2h3KGh3KTsKLQl1bnNpZ25lZCBpbnQgdHhkaXYsIHR4ZGl2MCwgdHhkaXYxOworCXU4IHR4ZGl2 LCB0eGRpdjAsIHR4ZGl2MTsKIAl1NjQgcGN3OwogCiAJZGV2X2RiZyhtaXBpX3R4LT5kZXYsICJw cmVwYXJlOiAldSBIelxuIiwgbWlwaV90eC0+ZGF0YV9yYXRlKTsKQEAgLTMxMCw3ICszMTAsNyBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGNsa19vcHMgbXRrX21pcGlfdHhfcGxsX29wcyA9IHsKIHN0 YXRpYyBpbnQgbXRrX21pcGlfdHhfcG93ZXJfb25fc2lnbmFsKHN0cnVjdCBwaHkgKnBoeSkKIHsK IAlzdHJ1Y3QgbXRrX21pcGlfdHggKm1pcGlfdHggPSBwaHlfZ2V0X2RydmRhdGEocGh5KTsKLQl1 bnNpZ25lZCBpbnQgcmVnOworCXUzMiByZWc7CiAKIAlmb3IgKHJlZyA9IE1JUElUWF9EU0lfQ0xP Q0tfTEFORTsKIAkgICAgIHJlZyA8PSBNSVBJVFhfRFNJX0RBVEFfTEFORTM7IHJlZyArPSA0KQpA QCAtMzQxLDcgKzM0MSw3IEBAIHN0YXRpYyBpbnQgbXRrX21pcGlfdHhfcG93ZXJfb24oc3RydWN0 IHBoeSAqcGh5KQogc3RhdGljIHZvaWQgbXRrX21pcGlfdHhfcG93ZXJfb2ZmX3NpZ25hbChzdHJ1 Y3QgcGh5ICpwaHkpCiB7CiAJc3RydWN0IG10a19taXBpX3R4ICptaXBpX3R4ID0gcGh5X2dldF9k cnZkYXRhKHBoeSk7Ci0JdW5zaWduZWQgaW50IHJlZzsKKwl1MzIgcmVnOwogCiAJbXRrX21pcGlf dHhfc2V0X2JpdHMobWlwaV90eCwgTUlQSVRYX0RTSV9UT1BfQ09OLAogCQkJICAgICBSR19EU0lf UEFEX1RJRV9MT1dfRU4pOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: yt.shen@mediatek.com (YT Shen) Date: Thu, 4 Aug 2016 19:07:19 +0800 Subject: [PATCH v6 05/10] drm/mediatek: cleaning up and refine In-Reply-To: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> References: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> Message-ID: <1470308844-20895-6-git-send-email-yt.shen@mediatek.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org cleaning up unused define and refine function name and variable Signed-off-by: shaoming chen Signed-off-by: YT Shen --- drivers/gpu/drm/mediatek/mtk_dsi.c | 77 +++++++++++++++----------------- drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 8 ++-- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 2d808e5..a9cf5a1 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -27,9 +27,6 @@ #include "mtk_drm_ddp_comp.h" -#define DSI_VIDEO_FIFO_DEPTH (1920 / 4) -#define DSI_HOST_FIFO_DEPTH 64 - #define DSI_START 0x00 #define DSI_CON_CTRL 0x10 @@ -46,7 +43,7 @@ #define MIX_MODE BIT(17) #define DSI_TXRX_CTRL 0x18 -#define VC_NUM (2 << 0) +#define VC_NUM BIT(1) #define LANE_NUM (0xf << 2) #define DIS_EOT BIT(6) #define NULL_EN BIT(7) @@ -158,11 +155,11 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data) writel((temp & ~mask) | (data & mask), dsi->regs + offset); } -static void dsi_phy_timconfig(struct mtk_dsi *dsi) +static void mtk_dsi_phy_timconfig(struct mtk_dsi *dsi) { u32 timcon0, timcon1, timcon2, timcon3; - unsigned int ui, cycle_time; - unsigned int lpx; + u32 ui, cycle_time; + u32 lpx; ui = 1000 / dsi->data_rate + 0x01; cycle_time = 8000 / dsi->data_rate + 0x01; @@ -192,7 +189,7 @@ static void mtk_dsi_disable(struct mtk_dsi *dsi) mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_EN, 0); } -static void mtk_dsi_reset(struct mtk_dsi *dsi) +static void mtk_dsi_reset_engine(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, DSI_RESET); mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, 0); @@ -235,8 +232,8 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) } mtk_dsi_enable(dsi); - mtk_dsi_reset(dsi); - dsi_phy_timconfig(dsi); + mtk_dsi_reset_engine(dsi); + mtk_dsi_phy_timconfig(dsi); return 0; @@ -249,33 +246,33 @@ err_refcount: return ret; } -static void dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi) +static void mtk_dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); } -static void dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi) +static void mtk_dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, LC_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, 0); } -static void dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi) +static void mtk_dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); } -static void dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) +static void mtk_dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, LD0_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, 0); } -static bool dsi_clk_hs_state(struct mtk_dsi *dsi) +static bool mtk_dsi_clk_hs_state(struct mtk_dsi *dsi) { u32 tmp_reg1; @@ -283,15 +280,15 @@ static bool dsi_clk_hs_state(struct mtk_dsi *dsi) return ((tmp_reg1 & LC_HS_TX_EN) == 1) ? true : false; } -static void dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter) +static void mtk_dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter) { - if (enter && !dsi_clk_hs_state(dsi)) + if (enter && !mtk_dsi_clk_hs_state(dsi)) mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, LC_HS_TX_EN); - else if (!enter && dsi_clk_hs_state(dsi)) + else if (!enter && mtk_dsi_clk_hs_state(dsi)) mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); } -static void dsi_set_mode(struct mtk_dsi *dsi) +static void mtk_dsi_set_mode(struct mtk_dsi *dsi) { u32 vid_mode = CMD_MODE; @@ -306,7 +303,7 @@ static void dsi_set_mode(struct mtk_dsi *dsi) writel(vid_mode, dsi->regs + DSI_MODE_CTRL); } -static void dsi_ps_control_vact(struct mtk_dsi *dsi) +static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi) { struct videomode *vm = &dsi->vm; u32 dsi_buf_bpp, ps_wc; @@ -340,7 +337,7 @@ static void dsi_ps_control_vact(struct mtk_dsi *dsi) writel(ps_wc, dsi->regs + DSI_HSTX_CKL_WC); } -static void dsi_rxtx_control(struct mtk_dsi *dsi) +static void mtk_dsi_rxtx_control(struct mtk_dsi *dsi) { u32 tmp_reg; @@ -365,9 +362,9 @@ static void dsi_rxtx_control(struct mtk_dsi *dsi) writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL); } -static void dsi_ps_control(struct mtk_dsi *dsi) +static void mtk_dsi_ps_control(struct mtk_dsi *dsi) { - unsigned int dsi_tmp_buf_bpp; + u32 dsi_tmp_buf_bpp; u32 tmp_reg; switch (dsi->format) { @@ -397,12 +394,12 @@ static void dsi_ps_control(struct mtk_dsi *dsi) writel(tmp_reg, dsi->regs + DSI_PSCTRL); } -static void dsi_config_vdo_timing(struct mtk_dsi *dsi) +static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi) { - unsigned int horizontal_sync_active_byte; - unsigned int horizontal_backporch_byte; - unsigned int horizontal_frontporch_byte; - unsigned int dsi_tmp_buf_bpp; + u32 horizontal_sync_active_byte; + u32 horizontal_backporch_byte; + u32 horizontal_frontporch_byte; + u32 dsi_tmp_buf_bpp; struct videomode *vm = &dsi->vm; @@ -431,7 +428,7 @@ static void dsi_config_vdo_timing(struct mtk_dsi *dsi) writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); - dsi_ps_control(dsi); + mtk_dsi_ps_control(dsi); } static void mtk_dsi_start(struct mtk_dsi *dsi) @@ -448,8 +445,8 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) if (--dsi->refcount != 0) return; - dsi_lane0_ulp_mode_enter(dsi); - dsi_clk_ulp_mode_enter(dsi); + mtk_dsi_lane0_ulp_mode_enter(dsi); + mtk_dsi_clk_ulp_mode_enter(dsi); mtk_dsi_disable(dsi); @@ -479,18 +476,18 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi) return; } - dsi_rxtx_control(dsi); + mtk_dsi_rxtx_control(dsi); - dsi_clk_ulp_mode_leave(dsi); - dsi_lane0_ulp_mode_leave(dsi); - dsi_clk_hs_mode(dsi, 0); - dsi_set_mode(dsi); + mtk_dsi_clk_ulp_mode_leave(dsi); + mtk_dsi_lane0_ulp_mode_leave(dsi); + mtk_dsi_clk_hs_mode(dsi, 0); + mtk_dsi_set_mode(dsi); - dsi_ps_control_vact(dsi); - dsi_config_vdo_timing(dsi); + mtk_dsi_ps_control_vact(dsi); + mtk_dsi_config_vdo_timing(dsi); - dsi_set_mode(dsi); - dsi_clk_hs_mode(dsi, 1); + mtk_dsi_set_mode(dsi); + mtk_dsi_clk_hs_mode(dsi, 1); mtk_dsi_start(dsi); diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c index cf8f38d..19481c7 100644 --- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c +++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c @@ -126,7 +126,7 @@ struct mtk_mipi_tx { struct device *dev; void __iomem *regs; - unsigned int data_rate; + u32 data_rate; struct clk_hw pll_hw; struct clk *pll; }; @@ -163,7 +163,7 @@ static void mtk_mipi_tx_update_bits(struct mtk_mipi_tx *mipi_tx, u32 offset, static int mtk_mipi_tx_pll_prepare(struct clk_hw *hw) { struct mtk_mipi_tx *mipi_tx = mtk_mipi_tx_from_clk_hw(hw); - unsigned int txdiv, txdiv0, txdiv1; + u8 txdiv, txdiv0, txdiv1; u64 pcw; dev_dbg(mipi_tx->dev, "prepare: %u Hz\n", mipi_tx->data_rate); @@ -310,7 +310,7 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = { static int mtk_mipi_tx_power_on_signal(struct phy *phy) { struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); - unsigned int reg; + u32 reg; for (reg = MIPITX_DSI_CLOCK_LANE; reg <= MIPITX_DSI_DATA_LANE3; reg += 4) @@ -341,7 +341,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy) static void mtk_mipi_tx_power_off_signal(struct phy *phy) { struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); - unsigned int reg; + u32 reg; mtk_mipi_tx_set_bits(mipi_tx, MIPITX_DSI_TOP_CON, RG_DSI_PAD_TIE_LOW_EN); -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933638AbcHDLQk (ORCPT ); Thu, 4 Aug 2016 07:16:40 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:63490 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1757131AbcHDLQd (ORCPT ); Thu, 4 Aug 2016 07:16:33 -0400 From: YT Shen To: , Philipp Zabel CC: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , David Airlie , Matthias Brugger , YT Shen , CK Hu , Mao Huang , Bibby Hsieh , , , , , , Sascha Hauer , , , , shaoming chen Subject: [PATCH v6 05/10] drm/mediatek: cleaning up and refine Date: Thu, 4 Aug 2016 19:07:19 +0800 Message-ID: <1470308844-20895-6-git-send-email-yt.shen@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> References: <1470308844-20895-1-git-send-email-yt.shen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cleaning up unused define and refine function name and variable Signed-off-by: shaoming chen Signed-off-by: YT Shen --- drivers/gpu/drm/mediatek/mtk_dsi.c | 77 +++++++++++++++----------------- drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 8 ++-- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 2d808e5..a9cf5a1 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -27,9 +27,6 @@ #include "mtk_drm_ddp_comp.h" -#define DSI_VIDEO_FIFO_DEPTH (1920 / 4) -#define DSI_HOST_FIFO_DEPTH 64 - #define DSI_START 0x00 #define DSI_CON_CTRL 0x10 @@ -46,7 +43,7 @@ #define MIX_MODE BIT(17) #define DSI_TXRX_CTRL 0x18 -#define VC_NUM (2 << 0) +#define VC_NUM BIT(1) #define LANE_NUM (0xf << 2) #define DIS_EOT BIT(6) #define NULL_EN BIT(7) @@ -158,11 +155,11 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data) writel((temp & ~mask) | (data & mask), dsi->regs + offset); } -static void dsi_phy_timconfig(struct mtk_dsi *dsi) +static void mtk_dsi_phy_timconfig(struct mtk_dsi *dsi) { u32 timcon0, timcon1, timcon2, timcon3; - unsigned int ui, cycle_time; - unsigned int lpx; + u32 ui, cycle_time; + u32 lpx; ui = 1000 / dsi->data_rate + 0x01; cycle_time = 8000 / dsi->data_rate + 0x01; @@ -192,7 +189,7 @@ static void mtk_dsi_disable(struct mtk_dsi *dsi) mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_EN, 0); } -static void mtk_dsi_reset(struct mtk_dsi *dsi) +static void mtk_dsi_reset_engine(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, DSI_RESET); mtk_dsi_mask(dsi, DSI_CON_CTRL, DSI_RESET, 0); @@ -235,8 +232,8 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) } mtk_dsi_enable(dsi); - mtk_dsi_reset(dsi); - dsi_phy_timconfig(dsi); + mtk_dsi_reset_engine(dsi); + mtk_dsi_phy_timconfig(dsi); return 0; @@ -249,33 +246,33 @@ err_refcount: return ret; } -static void dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi) +static void mtk_dsi_clk_ulp_mode_enter(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); } -static void dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi) +static void mtk_dsi_clk_ulp_mode_leave(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, LC_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_WAKEUP_EN, 0); } -static void dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi) +static void mtk_dsi_lane0_ulp_mode_enter(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_HS_TX_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); } -static void dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) +static void mtk_dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) { mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_ULPM_EN, 0); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, LD0_WAKEUP_EN); mtk_dsi_mask(dsi, DSI_PHY_LD0CON, LD0_WAKEUP_EN, 0); } -static bool dsi_clk_hs_state(struct mtk_dsi *dsi) +static bool mtk_dsi_clk_hs_state(struct mtk_dsi *dsi) { u32 tmp_reg1; @@ -283,15 +280,15 @@ static bool dsi_clk_hs_state(struct mtk_dsi *dsi) return ((tmp_reg1 & LC_HS_TX_EN) == 1) ? true : false; } -static void dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter) +static void mtk_dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter) { - if (enter && !dsi_clk_hs_state(dsi)) + if (enter && !mtk_dsi_clk_hs_state(dsi)) mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, LC_HS_TX_EN); - else if (!enter && dsi_clk_hs_state(dsi)) + else if (!enter && mtk_dsi_clk_hs_state(dsi)) mtk_dsi_mask(dsi, DSI_PHY_LCCON, LC_HS_TX_EN, 0); } -static void dsi_set_mode(struct mtk_dsi *dsi) +static void mtk_dsi_set_mode(struct mtk_dsi *dsi) { u32 vid_mode = CMD_MODE; @@ -306,7 +303,7 @@ static void dsi_set_mode(struct mtk_dsi *dsi) writel(vid_mode, dsi->regs + DSI_MODE_CTRL); } -static void dsi_ps_control_vact(struct mtk_dsi *dsi) +static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi) { struct videomode *vm = &dsi->vm; u32 dsi_buf_bpp, ps_wc; @@ -340,7 +337,7 @@ static void dsi_ps_control_vact(struct mtk_dsi *dsi) writel(ps_wc, dsi->regs + DSI_HSTX_CKL_WC); } -static void dsi_rxtx_control(struct mtk_dsi *dsi) +static void mtk_dsi_rxtx_control(struct mtk_dsi *dsi) { u32 tmp_reg; @@ -365,9 +362,9 @@ static void dsi_rxtx_control(struct mtk_dsi *dsi) writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL); } -static void dsi_ps_control(struct mtk_dsi *dsi) +static void mtk_dsi_ps_control(struct mtk_dsi *dsi) { - unsigned int dsi_tmp_buf_bpp; + u32 dsi_tmp_buf_bpp; u32 tmp_reg; switch (dsi->format) { @@ -397,12 +394,12 @@ static void dsi_ps_control(struct mtk_dsi *dsi) writel(tmp_reg, dsi->regs + DSI_PSCTRL); } -static void dsi_config_vdo_timing(struct mtk_dsi *dsi) +static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi) { - unsigned int horizontal_sync_active_byte; - unsigned int horizontal_backporch_byte; - unsigned int horizontal_frontporch_byte; - unsigned int dsi_tmp_buf_bpp; + u32 horizontal_sync_active_byte; + u32 horizontal_backporch_byte; + u32 horizontal_frontporch_byte; + u32 dsi_tmp_buf_bpp; struct videomode *vm = &dsi->vm; @@ -431,7 +428,7 @@ static void dsi_config_vdo_timing(struct mtk_dsi *dsi) writel(horizontal_backporch_byte, dsi->regs + DSI_HBP_WC); writel(horizontal_frontporch_byte, dsi->regs + DSI_HFP_WC); - dsi_ps_control(dsi); + mtk_dsi_ps_control(dsi); } static void mtk_dsi_start(struct mtk_dsi *dsi) @@ -448,8 +445,8 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) if (--dsi->refcount != 0) return; - dsi_lane0_ulp_mode_enter(dsi); - dsi_clk_ulp_mode_enter(dsi); + mtk_dsi_lane0_ulp_mode_enter(dsi); + mtk_dsi_clk_ulp_mode_enter(dsi); mtk_dsi_disable(dsi); @@ -479,18 +476,18 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi) return; } - dsi_rxtx_control(dsi); + mtk_dsi_rxtx_control(dsi); - dsi_clk_ulp_mode_leave(dsi); - dsi_lane0_ulp_mode_leave(dsi); - dsi_clk_hs_mode(dsi, 0); - dsi_set_mode(dsi); + mtk_dsi_clk_ulp_mode_leave(dsi); + mtk_dsi_lane0_ulp_mode_leave(dsi); + mtk_dsi_clk_hs_mode(dsi, 0); + mtk_dsi_set_mode(dsi); - dsi_ps_control_vact(dsi); - dsi_config_vdo_timing(dsi); + mtk_dsi_ps_control_vact(dsi); + mtk_dsi_config_vdo_timing(dsi); - dsi_set_mode(dsi); - dsi_clk_hs_mode(dsi, 1); + mtk_dsi_set_mode(dsi); + mtk_dsi_clk_hs_mode(dsi, 1); mtk_dsi_start(dsi); diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c index cf8f38d..19481c7 100644 --- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c +++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c @@ -126,7 +126,7 @@ struct mtk_mipi_tx { struct device *dev; void __iomem *regs; - unsigned int data_rate; + u32 data_rate; struct clk_hw pll_hw; struct clk *pll; }; @@ -163,7 +163,7 @@ static void mtk_mipi_tx_update_bits(struct mtk_mipi_tx *mipi_tx, u32 offset, static int mtk_mipi_tx_pll_prepare(struct clk_hw *hw) { struct mtk_mipi_tx *mipi_tx = mtk_mipi_tx_from_clk_hw(hw); - unsigned int txdiv, txdiv0, txdiv1; + u8 txdiv, txdiv0, txdiv1; u64 pcw; dev_dbg(mipi_tx->dev, "prepare: %u Hz\n", mipi_tx->data_rate); @@ -310,7 +310,7 @@ static const struct clk_ops mtk_mipi_tx_pll_ops = { static int mtk_mipi_tx_power_on_signal(struct phy *phy) { struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); - unsigned int reg; + u32 reg; for (reg = MIPITX_DSI_CLOCK_LANE; reg <= MIPITX_DSI_DATA_LANE3; reg += 4) @@ -341,7 +341,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy) static void mtk_mipi_tx_power_off_signal(struct phy *phy) { struct mtk_mipi_tx *mipi_tx = phy_get_drvdata(phy); - unsigned int reg; + u32 reg; mtk_mipi_tx_set_bits(mipi_tx, MIPITX_DSI_TOP_CON, RG_DSI_PAD_TIE_LOW_EN); -- 1.7.9.5