From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 2/4] drm/i915: Drop pipe_enable checks in vblank funcs Date: Fri, 13 Feb 2015 00:37:27 +0200 Message-ID: <1423780647.3277.18.camel@ideak-mobl> References: <1422959414-18968-1-git-send-email-daniel.vetter@ffwll.ch> <1422959414-18968-2-git-send-email-daniel.vetter@ffwll.ch> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1422959414-18968-2-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: Daniel Vetter , Intel Graphics Development , Laurent Pinchart , DRI Development List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAyMDE1LTAyLTAzIGF0IDExOjMwICswMTAwLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+ IFdpdGggVmlsbGUncyByZXdvcmsgdG8gdXNlIGRybV9jcnRjX3ZibGFua19vbi9vZmYgdGhlIGNv cmUgd2lsbCB0YWtlCj4gY2FyZSBvZiByZWplY3RpbmcgZHJtX3ZibGFua19nZXQgY2FsbHMgd2hl biB0aGUgcGlwZSBpcyBvZmYuIEFsc28gdGhlCj4gY29yZSB3b24ndCBjYWxsIHRoZSBnZXRfdmJs YW5rX2NvdW50ZXIgaG9va3MgaW4gdGhhdCBjYXNlIGVpdGhlci4gQW5kCj4gc2luY2Ugd2UndmUg ZHJvcHBlZCB1bXMgc3VwcG9ydCByZWNlbnRseSB3ZSBjYW4gbm93IHJlbW92ZSB0aGVzZQo+IGhh Y2tzLCB5YXkhCj4gCj4gTm90aWNlZCB3aGlsZSB0cnlpbmcgdG8gYW5zd2VyIHF1ZXN0aW9ucyBM YXVyZW50IGhhZCBhYm91dCBob3cgdGhlIG5ldwo+IGF0b21pYyBoZWxwZXJzIHdvcmsuCj4gCj4g Q2M6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4K PiBTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4K PiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8IDUyIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA1MiBkZWxl dGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiBpbmRleCAyM2JmZTIyMzJiNmEu LjgwZjM1ZGNmZmVhNCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IEBAIC00OTIsMzEg KzQ5Miw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZW5hYmxlX2FzbGVfcGlwZXN0YXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKPiAgCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsK PiAgfQo+ICAKPiAtLyoqCj4gLSAqIGk5MTVfcGlwZV9lbmFibGVkIC0gY2hlY2sgaWYgYSBwaXBl IGlzIGVuYWJsZWQKPiAtICogQGRldjogRFJNIGRldmljZQo+IC0gKiBAcGlwZTogcGlwZSB0byBj aGVjawo+IC0gKgo+IC0gKiBSZWFkaW5nIGNlcnRhaW4gcmVnaXN0ZXJzIHdoZW4gdGhlIHBpcGUg aXMgZGlzYWJsZWQgY2FuIGhhbmcgdGhlIGNoaXAuCj4gLSAqIFVzZSB0aGlzIHJvdXRpbmUgdG8g bWFrZSBzdXJlIHRoZSBQTEwgaXMgcnVubmluZyBhbmQgdGhlIHBpcGUgaXMgYWN0aXZlCj4gLSAq IGJlZm9yZSByZWFkaW5nIHN1Y2ggcmVnaXN0ZXJzIGlmIHVuc3VyZS4KPiAtICovCj4gLXN0YXRp YyBpbnQKPiAtaTkxNV9waXBlX2VuYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBp cGUpCj4gLXsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7Cj4gLQo+IC0JaWYgKGRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJf TU9ERVNFVCkpIHsKPiAtCQkvKiBMb2NraW5nIGlzIGhvcnJpYmx5IGJyb2tlbiBoZXJlLCBidXQg d2hhdGV2ZXIuICovCj4gLQkJc3RydWN0IGRybV9jcnRjICpjcnRjID0gZGV2X3ByaXYtPnBpcGVf dG9fY3J0Y19tYXBwaW5nW3BpcGVdOwo+IC0JCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtCj4gLQkJcmV0dXJuIGludGVsX2NydGMtPmFjdGl2 ZTsKPiAtCX0gZWxzZSB7Cj4gLQkJcmV0dXJuIEk5MTVfUkVBRChQSVBFQ09ORihwaXBlKSkgJiBQ SVBFQ09ORl9FTkFCTEU7Cj4gLQl9Cj4gLX0KPiAtCj4gIC8qCj4gICAqIFRoaXMgdGltaW5nIGRp YWdyYW0gZGVwaWN0cyB0aGUgdmlkZW8gc2lnbmFsIGluIGFuZAo+ICAgKiBhcm91bmQgdGhlIHZl cnRpY2FsIGJsYW5raW5nIHBlcmlvZC4KPiBAQCAtNTgzLDEyICs1NTgsNiBAQCBzdGF0aWMgdTMy IGk5MTVfZ2V0X3ZibGFua19jb3VudGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBl KQo+ICAJdW5zaWduZWQgbG9uZyBsb3dfZnJhbWU7Cj4gIAl1MzIgaGlnaDEsIGhpZ2gyLCBsb3cs IHBpeGVsLCB2Ymxfc3RhcnQsIGhzeW5jX3N0YXJ0LCBodG90YWw7Cj4gIAo+IC0JaWYgKCFpOTE1 X3BpcGVfZW5hYmxlZChkZXYsIHBpcGUpKSB7Cj4gLQkJRFJNX0RFQlVHX0RSSVZFUigidHJ5aW5n IHRvIGdldCB2YmxhbmsgY291bnQgZm9yIGRpc2FibGVkICIKPiAtCQkJCSJwaXBlICVjXG4iLCBw aXBlX25hbWUocGlwZSkpOwo+IC0JCXJldHVybiAwOwo+IC0JfQoKV291bGRuJ3QgaXQgbWFrZSBz ZW5zZSB0byBzdGlsbCBrZWVwIHRoZXNlIGFzIGFuIGFzc2VydCAoYnkgdGhyb3dpbmcKYXdheSB0 aGUgIU1PREVTRVQgcGFydCBpbiBpOTE1X3BpcGVfZW5hYmxlZCkuIFRvIG1lIGl0IHNlZW1zIHdl IGNvdWxkCnN0aWxsIGdldCBoZXJlIHdpdGggdGhlIHBpcGUgZGlzYWJsZWQgYXQgbGVhc3Qgdmlh IGRybV9pcnFfdW5pbnN0YWxsKCkuCgo+IC0KPiAgCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJl KGRldiwgRFJJVkVSX01PREVTRVQpKSB7Cj4gIAkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPQo+ICAJCQl0b19pbnRlbF9jcnRjKGRldl9wcml2LT5waXBlX3RvX2NydGNfbWFwcGluZ1tw aXBlXSk7Cj4gQEAgLTY0OCwxMiArNjE3LDYgQEAgc3RhdGljIHUzMiBnbTQ1X2dldF92Ymxhbmtf Y291bnRlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKPiAgCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAlpbnQgcmVnID0g UElQRV9GUk1DT1VOVF9HTTQ1KHBpcGUpOwo+ICAKPiAtCWlmICghaTkxNV9waXBlX2VuYWJsZWQo ZGV2LCBwaXBlKSkgewo+IC0JCURSTV9ERUJVR19EUklWRVIoInRyeWluZyB0byBnZXQgdmJsYW5r IGNvdW50IGZvciBkaXNhYmxlZCAiCj4gLQkJCQkgInBpcGUgJWNcbiIsIHBpcGVfbmFtZShwaXBl KSk7Cj4gLQkJcmV0dXJuIDA7Cj4gLQl9Cj4gLQo+ICAJcmV0dXJuIEk5MTVfUkVBRChyZWcpOwo+ ICB9Cj4gIAo+IEBAIC0yNjYwLDkgKzI2MjMsNiBAQCBzdGF0aWMgaW50IGk5MTVfZW5hYmxlX3Zi bGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAl1bnNpZ25lZCBsb25n IGlycWZsYWdzOwo+ICAKPiAtCWlmICghaTkxNV9waXBlX2VuYWJsZWQoZGV2LCBwaXBlKSkKPiAt CQlyZXR1cm4gLUVJTlZBTDsKPiAtCj4gIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmly cV9sb2NrLCBpcnFmbGFncyk7Cj4gIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKPiAg CQlpOTE1X2VuYWJsZV9waXBlc3RhdChkZXZfcHJpdiwgcGlwZSwKPiBAQCAtMjY4Miw5ICsyNjQy LDYgQEAgc3RhdGljIGludCBpcm9ubGFrZV9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBwaXBlKQo+ICAJdWludDMyX3QgYml0ID0gKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDcpID8gREVfUElQRV9WQkxBTktfSVZCKHBpcGUpIDoKPiAgCQkJCQkJICAgICBERV9QSVBF X1ZCTEFOSyhwaXBlKTsKPiAgCj4gLQlpZiAoIWk5MTVfcGlwZV9lbmFibGVkKGRldiwgcGlwZSkp Cj4gLQkJcmV0dXJuIC1FSU5WQUw7Cj4gLQo+ICAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2 LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwo+ICAJaXJvbmxha2VfZW5hYmxlX2Rpc3BsYXlfaXJxKGRl dl9wcml2LCBiaXQpOwo+ICAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPmlycV9s b2NrLCBpcnFmbGFncyk7Cj4gQEAgLTI2OTcsOSArMjY1NCw2IEBAIHN0YXRpYyBpbnQgdmFsbGV5 dmlld19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQo+ICAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAg CXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7Cj4gIAo+IC0JaWYgKCFpOTE1X3BpcGVfZW5hYmxlZChk ZXYsIHBpcGUpKQo+IC0JCXJldHVybiAtRUlOVkFMOwo+IC0KPiAgCXNwaW5fbG9ja19pcnFzYXZl KCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKPiAgCWk5MTVfZW5hYmxlX3BpcGVzdGF0 KGRldl9wcml2LCBwaXBlLAo+ICAJCQkgICAgIFBJUEVfU1RBUlRfVkJMQU5LX0lOVEVSUlVQVF9T VEFUVVMpOwo+IEBAIC0yNzEzLDkgKzI2NjcsNiBAQCBzdGF0aWMgaW50IGdlbjhfZW5hYmxlX3Zi bGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAl1bnNpZ25lZCBsb25n IGlycWZsYWdzOwo+ICAKPiAtCWlmICghaTkxNV9waXBlX2VuYWJsZWQoZGV2LCBwaXBlKSkKPiAt CQlyZXR1cm4gLUVJTlZBTDsKPiAtCj4gIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmly cV9sb2NrLCBpcnFmbGFncyk7Cj4gIAlkZXZfcHJpdi0+ZGVfaXJxX21hc2tbcGlwZV0gJj0gfkdF TjhfUElQRV9WQkxBTks7Cj4gIAlJOTE1X1dSSVRFKEdFTjhfREVfUElQRV9JTVIocGlwZSksIGRl dl9wcml2LT5kZV9pcnFfbWFza1twaXBlXSk7Cj4gQEAgLTI3NjcsOSArMjcxOCw2IEBAIHN0YXRp YyB2b2lkIGdlbjhfZGlzYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBp cGUpCj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwo+ICAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKPiAgCj4gLQlpZiAoIWk5MTVfcGlwZV9l bmFibGVkKGRldiwgcGlwZSkpCj4gLQkJcmV0dXJuOwo+IC0KPiAgCXNwaW5fbG9ja19pcnFzYXZl KCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKPiAgCWRldl9wcml2LT5kZV9pcnFfbWFz a1twaXBlXSB8PSBHRU44X1BJUEVfVkJMQU5LOwo+ICAJSTkxNV9XUklURShHRU44X0RFX1BJUEVf SU1SKHBpcGUpLCBkZXZfcHJpdi0+ZGVfaXJxX21hc2tbcGlwZV0pOwoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==