From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH] drm/i915: Drop pipe_enable checks in vblank funcs Date: Mon, 26 Jan 2015 23:03:14 +0200 Message-ID: <2425125.9hf6c3WN6D@avalon> References: <1422254519-13581-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTP id 5232C6E28B for ; Mon, 26 Jan 2015 13:08:10 -0800 (PST) In-Reply-To: <1422254519-13581-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Daniel Vetter , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org SGkgRGFuaWVsLAoKVGhhbmsgeW91IGZvciB0aGUgcGF0Y2guCgpPbiBNb25kYXkgMjYgSmFudWFy eSAyMDE1IDA3OjQxOjU5IERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gV2l0aCBWaWxsZSdzIHJld29y ayB0byB1c2UgZHJtX2NydGNfdmJsYW5rX29uL29mZiB0aGUgY29yZSB3aWxsIHRha2UKPiBjYXJl IG9mIHJlamVjdGluZyBkcm1fdmJsYW5rX2dldCBjYWxscyB3aGVuIHRoZSBwaXBlIGlzIG9mZi4K CkFmdGVyIGRlYnVnZ2luZyBhIHJlbGF0ZWQgaXNzdWUgaW4gdGhlIG9tYXBkcm0gZHJpdmVyIEkg dGhpbmsgdGhpcyBpcyBvbmx5IApwYXJ0aWFsbHkgdHJ1ZS4gZHJtX3ZibGFua19vZmYoKSB3aWxs IGluY3JlYXNlIHRoZSB2YmxhbmsgcmVmY291bnQsIHJlc3VsdGluZyAKaW4gZHJtX3ZibGFua19n ZXQoKSByZXR1cm5pbmcgYW4gZXJyb3IgaW5zdGVhZCBvZiBjYWxsaW5nIHRoZSBkcml2ZXIncyAK LmVuYWJsZV92Ymxhbmsgb3BlcmF0aW9uLiBIb3dldmVyLCB0aGlzIG9ubHkgd29ya3MgaWYgZHJt X3ZibGFua19vZmYoKSBoYXMgCmJlZW4gY2FsbGVkLCBub3Qgd2hlbiB0aGUgcGlwZSBpcyBvZmYg YmVjYXVzZSBpdCBoYXNuJ3QgYmVlbiB0dXJuZWQgb24geWV0LgoKQ29uc2lkZXIgdGhpcyBjYXNl LiBUaGUgZHJpdmVyIGhhcyBqdXN0IGJlZW4gbG9hZGVkLCBhbGwgcGlwZXMgYXJlIG9mZi4gQW4g CmFwcGxpY2F0aW9uIG9wZW5zIHRoZSBEUk0gZGV2aWNlIG5vZGUgYW5kIGNsb3NlcyBpdCB3aXRo b3V0IGVuYWJsaW5nIHRoZSBwaXBlLiAKVGhlIGxhc3RjbG9zZSBvcGVyYXRpb24gd2lsbCBiZSBj YWxsZWQsIGFuZCBpdCB3aWxsIGNhbGwgCmRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2Rl X3VubG9ja2VkKCkgdG8gcmVzdG9yZSB0aGUgQ1JUQy4gVGhpcyB0cmlnZ2VycyAKdGhlIHRpbWVv dXQgd2FybmluZyBpbiBkcm1fd2FpdF9vbmVfdmJsYW5rIHdpdGggb21hcGRybSB3aGVuIHVzaW5n IHRoZSBhdG9taWMgCnVwZGF0ZSB0cmFuc2l0aW9uYWwgaGVscGVycy4gVGhlIGNhbGxzdGFjayBp cyBhcyBmb2xsb3dzLgoKWzxiZjNiNDZmOD5dIChkcm1fd2FpdF9vbmVfdmJsYW5rIFtkcm1dKQpb PGJmNDI5ZTUwPl0gKGRybV9wbGFuZV9oZWxwZXJfY29tbWl0IFtkcm1fa21zX2hlbHBlcl0pCls8 YmY0MjdhYjA+XSAoZHJtX2NydGNfaGVscGVyX3NldF9tb2RlIFtkcm1fa21zX2hlbHBlcl0pCls8 YmY0Mjg1NzA+XSAoZHJtX2NydGNfaGVscGVyX3NldF9jb25maWcgW2RybV9rbXNfaGVscGVyXSkK WzxiZjNiYWEzND5dIChkcm1fbW9kZV9zZXRfY29uZmlnX2ludGVybmFsIFtkcm1dKQpbPGJmNDMx Mzc0Pl0gKHJlc3RvcmVfZmJkZXZfbW9kZSBbZHJtX2ttc19oZWxwZXJdKQpbPGJmNDMyOTc4Pl0g KGRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9ja2VkIFtkcm1fa21zX2hlbHBl cl0pCls8YmY0NWQ0ZjQ+XSAoZGV2X2xhc3RjbG9zZSBbb21hcGRybV0pCls8YmYzYjEyMTg+XSAo ZHJtX2xhc3RjbG9zZSBbZHJtXSkKWzxiZjNiMTVlMD5dIChkcm1fcmVsZWFzZSBbZHJtXSkKWzxj MDE0OTEwND5dIChfX2ZwdXQpCls8YzAwNTcxZDQ+XSAodGFza193b3JrX3J1bikKWzxjMDAxMTRm OD5dIChkb193b3JrX3BlbmRpbmcpCgpUaGUgZHJtX2NydGNfdmJsYW5rX2dldCgpIGNhbGwgaW4g ZHJtX3BsYW5lX2hlbHBlcl9jb21taXQoKSB3aWxsIG5vdCByZXR1cm4gYW4gCmVycm9yIGFzIGRy bV92Ymxhbmtfb2ZmKCkgaGFzIG5ldmVyIGJlZW4gY2FsbGVkIHNvIGZhci4KClRoZSBleGFjdCBz YW1lIGlzc3VlIG9idmlvdXNseSBkb2Vzbid0IGFmZmVjdCB0aGUgaTkxNSBkcml2ZXIgYXMgaXQg ZG9lc24ndCAKdXNlIHRoZSB0cmFuc2l0aW9uYWwgaGVscGVycywgYnV0IGEgZGlmZmVyZW50IGlz c3VlIGNvdWxkIGJlIHByZXNlbnQgd2l0aCB0aGUgCnNhbWUgcm9vdCBjYXVzZS4KCldoZXJlIGRv IHlvdSB0aGluayB0aGlzIHNob3VsZCBiZSBmaXhlZCA/Cgo+IEFsc28gdGhlIGNvcmUgd29uJ3Qg Y2FsbCB0aGUgZ2V0X3ZibGFua19jb3VudGVyIGhvb2tzIGluIHRoYXQgY2FzZSBlaXRoZXIuCj4g QW5kIHNpbmNlIHdlJ3ZlIGRyb3BwZWQgdW1zIHN1cHBvcnQgcmVjZW50bHkgd2UgY2FuIG5vdyBy ZW1vdmUgdGhlc2UKPiBoYWNrcywgeWF5IQo+IAo+IE5vdGljZWQgd2hpbGUgdHJ5aW5nIHRvIGFu c3dlciBxdWVzdGlvbnMgTGF1cmVudCBoYWQgYWJvdXQgaG93IHRoZSBuZXcKPiBhdG9taWMgaGVs cGVycyB3b3JrLgo+Cj4gQ2M6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hhcnRAaWRl YXNvbmJvYXJkLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8 IDUyIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFu Z2VkLCA1MiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYwo+IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBpbmRleCAy Mzk5ZWFlZDJjYTMuLjQ3NjFmN2ZlNmZiMSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ IEBAIC00OTIsMzEgKzQ5Miw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZW5hYmxlX2FzbGVfcGlwZXN0 YXQoc3RydWN0IGRybV9kZXZpY2UKPiAqZGV2KSBzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5p cnFfbG9jayk7Cj4gIH0KPiAKPiAtLyoqCj4gLSAqIGk5MTVfcGlwZV9lbmFibGVkIC0gY2hlY2sg aWYgYSBwaXBlIGlzIGVuYWJsZWQKPiAtICogQGRldjogRFJNIGRldmljZQo+IC0gKiBAcGlwZTog cGlwZSB0byBjaGVjawo+IC0gKgo+IC0gKiBSZWFkaW5nIGNlcnRhaW4gcmVnaXN0ZXJzIHdoZW4g dGhlIHBpcGUgaXMgZGlzYWJsZWQgY2FuIGhhbmcgdGhlIGNoaXAuCj4gLSAqIFVzZSB0aGlzIHJv dXRpbmUgdG8gbWFrZSBzdXJlIHRoZSBQTEwgaXMgcnVubmluZyBhbmQgdGhlIHBpcGUgaXMgYWN0 aXZlCj4gLSAqIGJlZm9yZSByZWFkaW5nIHN1Y2ggcmVnaXN0ZXJzIGlmIHVuc3VyZS4KPiAtICov Cj4gLXN0YXRpYyBpbnQKPiAtaTkxNV9waXBlX2VuYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgaW50IHBpcGUpCj4gLXsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7Cj4gLQo+IC0JaWYgKGRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2 LCBEUklWRVJfTU9ERVNFVCkpIHsKPiAtCQkvKiBMb2NraW5nIGlzIGhvcnJpYmx5IGJyb2tlbiBo ZXJlLCBidXQgd2hhdGV2ZXIuICovCj4gLQkJc3RydWN0IGRybV9jcnRjICpjcnRjID0gZGV2X3By aXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5nW3BpcGVdOwo+IC0JCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtCj4gLQkJcmV0dXJuIGludGVsX2Ny dGMtPmFjdGl2ZTsKPiAtCX0gZWxzZSB7Cj4gLQkJcmV0dXJuIEk5MTVfUkVBRChQSVBFQ09ORihw aXBlKSkgJiBQSVBFQ09ORl9FTkFCTEU7Cj4gLQl9Cj4gLX0KPiAtCj4gIC8qCj4gICAqIFRoaXMg dGltaW5nIGRpYWdyYW0gZGVwaWN0cyB0aGUgdmlkZW8gc2lnbmFsIGluIGFuZAo+ICAgKiBhcm91 bmQgdGhlIHZlcnRpY2FsIGJsYW5raW5nIHBlcmlvZC4KPiBAQCAtNTgzLDEyICs1NTgsNiBAQCBz dGF0aWMgdTMyIGk5MTVfZ2V0X3ZibGFua19jb3VudGVyKHN0cnVjdCBkcm1fZGV2aWNlCj4gKmRl diwgaW50IHBpcGUpIHVuc2lnbmVkIGxvbmcgbG93X2ZyYW1lOwo+ICAJdTMyIGhpZ2gxLCBoaWdo MiwgbG93LCBwaXhlbCwgdmJsX3N0YXJ0LCBoc3luY19zdGFydCwgaHRvdGFsOwo+IAo+IC0JaWYg KCFpOTE1X3BpcGVfZW5hYmxlZChkZXYsIHBpcGUpKSB7Cj4gLQkJRFJNX0RFQlVHX0RSSVZFUigi dHJ5aW5nIHRvIGdldCB2YmxhbmsgY291bnQgZm9yIGRpc2FibGVkICIKPiAtCQkJCSJwaXBlICVj XG4iLCBwaXBlX25hbWUocGlwZSkpOwo+IC0JCXJldHVybiAwOwo+IC0JfQo+IC0KPiAgCWlmIChk cm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX01PREVTRVQpKSB7Cj4gIAkJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPQo+ICAJCQl0b19pbnRlbF9jcnRjKGRldl9wcml2LT5w aXBlX3RvX2NydGNfbWFwcGluZ1twaXBlXSk7Cj4gQEAgLTY0OCwxMiArNjE3LDYgQEAgc3RhdGlj IHUzMiBnbTQ1X2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3QgZHJtX2RldmljZQo+ICpkZXYsIGlu dCBwaXBlKSBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwo+ICAJaW50IHJlZyA9IFBJUEVfRlJNQ09VTlRfR000NShwaXBlKTsKPiAKPiAtCWlmICgh aTkxNV9waXBlX2VuYWJsZWQoZGV2LCBwaXBlKSkgewo+IC0JCURSTV9ERUJVR19EUklWRVIoInRy eWluZyB0byBnZXQgdmJsYW5rIGNvdW50IGZvciBkaXNhYmxlZCAiCj4gLQkJCQkgInBpcGUgJWNc biIsIHBpcGVfbmFtZShwaXBlKSk7Cj4gLQkJcmV0dXJuIDA7Cj4gLQl9Cj4gLQo+ICAJcmV0dXJu IEk5MTVfUkVBRChyZWcpOwo+ICB9Cj4gCj4gQEAgLTI2NjAsOSArMjYyMyw2IEBAIHN0YXRpYyBp bnQgaTkxNV9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gaW50IHBpcGUp IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4g IAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwo+IAo+IC0JaWYgKCFpOTE1X3BpcGVfZW5hYmxlZChk ZXYsIHBpcGUpKQo+IC0JCXJldHVybiAtRUlOVkFMOwo+IC0KPiAgCXNwaW5fbG9ja19pcnFzYXZl KCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKPiAgCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA+PSA0KQo+ICAJCWk5MTVfZW5hYmxlX3BpcGVzdGF0KGRldl9wcml2LCBwaXBlLAo+IEBA IC0yNjgyLDkgKzI2NDIsNiBAQCBzdGF0aWMgaW50IGlyb25sYWtlX2VuYWJsZV92Ymxhbmsoc3Ry dWN0IGRybV9kZXZpY2UKPiAqZGV2LCBpbnQgcGlwZSkgdWludDMyX3QgYml0ID0gKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDcpID8KPiBERV9QSVBFX1ZCTEFOS19JVkIocGlwZSkgOiBERV9QSVBF X1ZCTEFOSyhwaXBlKTsKPiAKPiAtCWlmICghaTkxNV9waXBlX2VuYWJsZWQoZGV2LCBwaXBlKSkK PiAtCQlyZXR1cm4gLUVJTlZBTDsKPiAtCj4gIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYt PmlycV9sb2NrLCBpcnFmbGFncyk7Cj4gIAlpcm9ubGFrZV9lbmFibGVfZGlzcGxheV9pcnEoZGV2 X3ByaXYsIGJpdCk7Cj4gIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xv Y2ssIGlycWZsYWdzKTsKPiBAQCAtMjY5Nyw5ICsyNjU0LDYgQEAgc3RhdGljIGludCB2YWxsZXl2 aWV3X2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UKPiAqZGV2LCBpbnQgcGlwZSkgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCXVu c2lnbmVkIGxvbmcgaXJxZmxhZ3M7Cj4gCj4gLQlpZiAoIWk5MTVfcGlwZV9lbmFibGVkKGRldiwg cGlwZSkpCj4gLQkJcmV0dXJuIC1FSU5WQUw7Cj4gLQo+ICAJc3Bpbl9sb2NrX2lycXNhdmUoJmRl dl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwo+ICAJaTkxNV9lbmFibGVfcGlwZXN0YXQoZGV2 X3ByaXYsIHBpcGUsCj4gIAkJCSAgICAgUElQRV9TVEFSVF9WQkxBTktfSU5URVJSVVBUX1NUQVRV Uyk7Cj4gQEAgLTI3MTMsOSArMjY2Nyw2IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbmFibGVfdmJsYW5r KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gaW50IHBpcGUpIHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAl1bnNpZ25lZCBsb25nIGlycWZs YWdzOwo+IAo+IC0JaWYgKCFpOTE1X3BpcGVfZW5hYmxlZChkZXYsIHBpcGUpKQo+IC0JCXJldHVy biAtRUlOVkFMOwo+IC0KPiAgCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ss IGlycWZsYWdzKTsKPiAgCWRldl9wcml2LT5kZV9pcnFfbWFza1twaXBlXSAmPSB+R0VOOF9QSVBF X1ZCTEFOSzsKPiAgCUk5MTVfV1JJVEUoR0VOOF9ERV9QSVBFX0lNUihwaXBlKSwgZGV2X3ByaXYt PmRlX2lycV9tYXNrW3BpcGVdKTsKPiBAQCAtMjc2Nyw5ICsyNzE4LDYgQEAgc3RhdGljIHZvaWQg Z2VuOF9kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZQo+ICpkZXYsIGludCBwaXBlKSBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAJ dW5zaWduZWQgbG9uZyBpcnFmbGFnczsKPiAKPiAtCWlmICghaTkxNV9waXBlX2VuYWJsZWQoZGV2 LCBwaXBlKSkKPiAtCQlyZXR1cm47Cj4gLQo+ICAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2 LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwo+ICAJZGV2X3ByaXYtPmRlX2lycV9tYXNrW3BpcGVdIHw9 IEdFTjhfUElQRV9WQkxBTks7Cj4gIAlJOTE1X1dSSVRFKEdFTjhfREVfUElQRV9JTVIocGlwZSks IGRldl9wcml2LT5kZV9pcnFfbWFza1twaXBlXSk7CgotLSAKUmVnYXJkcywKCkxhdXJlbnQgUGlu Y2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==