From: Heiko =?ISO-8859-1?Q?St=FCbner?= Subject: [PATCH] drm/rockchip: fix clk enable disable mismatch in vop_crtc_mode_set Date: Fri, 30 Jan 2015 20:28:48 +0100 Message-ID: <5111687.3ndQzftx5M@diego> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from gloria.sntech.de (gloria.sntech.de [95.129.55.99]) by gabe.freedesktop.org (Postfix) with ESMTP id 524656E06E for ; Fri, 30 Jan 2015 11:23:45 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: mark.yao@rock-chips.com, Dave Airlie Cc: linux-rockchip@lists.infradead.org, Daniel Kurtz , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIGZ1bmN0aW9uIGRpc2FibGVzIHRoZSBkY2xrIGF0IHRoZSBiZWdpbm5pbmcsIHNvIGRvbid0 IHNpbXBseSByZXR1cm4Kd2hlbiBhbiBlcnJvciBoYXBwZW5zLCBidXQgaW5zdGVhZCBlbmFibGUg dGhlIGNsb2NrIGFnYWluLCBzbyB0aGF0CmVuYWJsZSBhbmQgZGlzYWJsZSBjYWxscyBhcmUgYmFs YW5jZWQuCgpyZXRfY2xrIGlzIGludHJvZHVjZWQgdG8gaG9sZCB0aGUgY2xrX2VuYWJsZSByZXN1 bHQgYW5kIG5vdCBtYW5nbGUgdGhlCm9yaWdpbmFsIGVycm9yIGNvZGUuCgpTaWduZWQtb2ZmLWJ5 OiBIZWlrbyBTdHVlYm5lciA8aGVpa29Ac250ZWNoLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9y b2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgfCAxOCArKysrKysrKysrLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCmluZGV4IDA0YjYxOWEuLmMwMzg3Zjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwpAQCAtODUy LDcgKzg1Miw3IEBAIHN0YXRpYyBpbnQgdm9wX2NydGNfbW9kZV9zZXQoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCXUxNiB2c3luY19sZW4gPSBhZGp1c3RlZF9tb2RlLT52c3luY19lbmQgLSBhZGp1 c3RlZF9tb2RlLT52c3luY19zdGFydDsKIAl1MTYgdmFjdF9zdCA9IGFkanVzdGVkX21vZGUtPnZ0 b3RhbCAtIGFkanVzdGVkX21vZGUtPnZzeW5jX3N0YXJ0OwogCXUxNiB2YWN0X2VuZCA9IHZhY3Rf c3QgKyB2ZGlzcGxheTsKLQlpbnQgcmV0OworCWludCByZXQsIHJldF9jbGs7CiAJdWludDMyX3Qg dmFsOwogCiAJLyoKQEAgLTg3NCw3ICs4NzQsOCBAQCBzdGF0aWMgaW50IHZvcF9jcnRjX21vZGVf c2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlkZWZhdWx0OgogCQlEUk1fRVJST1IoInVuc3Vw cG9ydCBjb25uZWN0b3JfdHlwZVslZF1cbiIsCiAJCQkgIHZvcC0+Y29ubmVjdG9yX3R5cGUpOwot CQlyZXR1cm4gLUVJTlZBTDsKKwkJcmV0ID0gLUVJTlZBTDsKKwkJZ290byBvdXQ7CiAJfTsKIAlW T1BfQ1RSTF9TRVQodm9wLCBvdXRfbW9kZSwgdm9wLT5jb25uZWN0b3Jfb3V0X21vZGUpOwogCkBA IC04OTcsNyArODk4LDcgQEAgc3RhdGljIGludCB2b3BfY3J0Y19tb2RlX3NldChzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAKIAlyZXQgPSB2b3BfY3J0Y19tb2RlX3NldF9iYXNlKGNydGMsIHgsIHks IGZiKTsKIAlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCQlnb3RvIG91dDsKIAogCS8qCiAJICog cmVzZXQgZGNsaywgdGFrZSBhbGwgbW9kZSBjb25maWcgYWZmZWN0LCBzbyB0aGUgY2xrIHdvdWxk IHJ1biBpbgpAQCAtOTA4LDEzICs5MDksMTQgQEAgc3RhdGljIGludCB2b3BfY3J0Y19tb2RlX3Nl dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmVzZXRfY29udHJvbF9kZWFzc2VydCh2b3AtPmRj bGtfcnN0KTsKIAogCWNsa19zZXRfcmF0ZSh2b3AtPmRjbGssIGFkanVzdGVkX21vZGUtPmNsb2Nr ICogMTAwMCk7Ci0JcmV0ID0gY2xrX2VuYWJsZSh2b3AtPmRjbGspOwotCWlmIChyZXQgPCAwKSB7 Ci0JCWRldl9lcnIodm9wLT5kZXYsICJmYWlsZWQgdG8gZW5hYmxlIGRjbGsgLSAlZFxuIiwgcmV0 KTsKLQkJcmV0dXJuIHJldDsKK291dDoKKwlyZXRfY2xrID0gY2xrX2VuYWJsZSh2b3AtPmRjbGsp OworCWlmIChyZXRfY2xrIDwgMCkgeworCQlkZXZfZXJyKHZvcC0+ZGV2LCAiZmFpbGVkIHRvIGVu YWJsZSBkY2xrIC0gJWRcbiIsIHJldF9jbGspOworCQlyZXR1cm4gcmV0X2NsazsKIAl9CiAKLQly ZXR1cm4gMDsKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCB2b3BfY3J0Y19jb21taXQo c3RydWN0IGRybV9jcnRjICpjcnRjKQotLSAKMi4xLjEKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=