From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH RFC 3/5] drm/i915: use intel_crtc_control everywhere Date: Mon, 4 May 2015 15:44:20 +0200 Message-ID: <20150504134420.GA30184@phenom.ffwll.local> References: <1429701862-22970-1-git-send-email-maarten.lankhorst@linux.intel.com> <1429701862-22970-4-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 881816E3C1 for ; Mon, 4 May 2015 06:42:01 -0700 (PDT) Received: by wizk4 with SMTP id k4so122045489wiz.1 for ; Mon, 04 May 2015 06:42:00 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1429701862-22970-4-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: maarten.lankhorst@linux.intel.com Cc: Ander Conselvan de Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBBcHIgMjIsIDIwMTUgYXQgMDE6MjQ6MjBQTSArMDIwMCwgbWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tIHdyb3RlOgo+IEZyb206IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CgpBIGJpdCBtb3JlIGV4cGxhbmF0aW9uIGlu IHRoZSBjb21taXQgbWVzc2FnZSBoZXJlIHdvdWxkIGJlIHVzZWZ1bCwgaS5lLgp3aGF0IGNoYW5n ZWQgdGhhdCB3ZSBuZWVkIHRoaXMgbm93LgotRGFuaWVsCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0K PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgIHwgMTggKysrKysrKystLQo+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2OCArKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmggICAgIHwgIDEgLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDQ4IGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gaW5kZXggNjBl ODZmMzMxMzEzLi45MWM5YTRmYzhiNmEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYwo+IEBAIC0zNTg5LDEyICszNTg5LDE4IEBAIHN0YXRpYyB2b2lkIGhzd190cmFuc19lZHBf cGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJICovCj4gIAlpZiAoY3J0 Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCAmJgo+ICAJICAgICFj cnRjLT5jb25maWctPnBjaF9wZml0LmVuYWJsZWQpIHsKPiArCQlib29sIGFjdGl2ZSA9IGNydGMt PmFjdGl2ZTsKPiArCj4gKwkJaWYgKGFjdGl2ZSkKPiArCQkJaW50ZWxfY3J0Y19jb250cm9sKCZj cnRjLT5iYXNlLCBmYWxzZSk7Cj4gKwo+ICAJCWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2Vf dGhydSA9IHRydWU7Cj4gIAo+ICAJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LAo+ ICAJCQkJCVBPV0VSX0RPTUFJTl9QSVBFX1BBTkVMX0ZJVFRFUihQSVBFX0EpKTsKPiAgCj4gLQkJ aW50ZWxfY3J0Y19yZXNldCgmY3J0Yy0+YmFzZSk7Cj4gKwkJaWYgKGFjdGl2ZSkKPiArCQkJaW50 ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCB0cnVlKTsKPiAgCX0KPiAgCWRybV9tb2Rlc2V0 X3VubG9ja19hbGwoZGV2KTsKPiAgfQo+IEBAIC0zNjEzLDEyICszNjE5LDE4IEBAIHN0YXRpYyB2 b2lkIGhzd191bmRvX3RyYW5zX2VkcF9waXBlX0FfY3JjX3dhKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCj4gIAkgKiByb3V0aW5nLgo+ICAJICovCj4gIAlpZiAoY3J0Yy0+Y29uZmlnLT5wY2hfcGZp dC5mb3JjZV90aHJ1KSB7Cj4gLQkJY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1ID0g ZmFsc2U7Cj4gKwkJYm9vbCBhY3RpdmUgPSBjcnRjLT5hY3RpdmU7Cj4gIAo+IC0JCWludGVsX2Ny dGNfcmVzZXQoJmNydGMtPmJhc2UpOwo+ICsJCWlmIChhY3RpdmUpCj4gKwkJCWludGVsX2NydGNf Y29udHJvbCgmY3J0Yy0+YmFzZSwgZmFsc2UpOwo+ICsKPiArCQljcnRjLT5jb25maWctPnBjaF9w Zml0LmZvcmNlX3RocnUgPSBmYWxzZTsKPiAgCj4gIAkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQo ZGV2X3ByaXYsCj4gIAkJCQkJUE9XRVJfRE9NQUlOX1BJUEVfUEFORUxfRklUVEVSKFBJUEVfQSkp Owo+ICsKPiArCQlpZiAoYWN0aXZlKQo+ICsJCQlpbnRlbF9jcnRjX2NvbnRyb2woJmNydGMtPmJh c2UsIHRydWUpOwo+ICAJfQo+ICAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwo+ICB9Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDQzOGQ4ZTIxMzc0OC4uMmZm YWNiNGMzYTEyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0z MTAxLDIyICszMTAxLDggQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAl9Cj4gIH0KPiAgCj4gLXZvaWQgaW50ZWxfY3J0 Y19yZXNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiAtewo+IC0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Cj4gLQo+IC0JaWYg KCFjcnRjLT5hY3RpdmUpCj4gLQkJcmV0dXJuOwo+IC0KPiAtCWludGVsX2NydGNfZGlzYWJsZV9w bGFuZXMoJmNydGMtPmJhc2UpOwo+IC0JZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKCZj cnRjLT5iYXNlKTsKPiAtCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlKCZjcnRjLT5iYXNl KTsKPiAtCWludGVsX2NydGNfZW5hYmxlX3BsYW5lcygmY3J0Yy0+YmFzZSk7Cj4gLX0KPiAtCj4g IHZvaWQgaW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICB7Cj4g LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Cj4gIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKPiAgCj4gIAkvKiBubyByZXNldCBzdXBwb3J0IGZvciBn ZW4yICovCj4gQEAgLTMxMjgsMTggKzMxMTQsMTIgQEAgdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCWRybV9tb2Rlc2V0 X2xvY2tfYWxsKGRldik7Cj4gLQo+ICAJLyoKPiAgCSAqIERpc2FibGluZyB0aGUgY3J0Y3MgZ3Jh Y2VmdWxseSBzZWVtcyBuaWNlci4gQWxzbyB0aGUKPiAgCSAqIGczMyBkb2NzIHNheSB3ZSBzaG91 bGQgYXQgbGVhc3QgZGlzYWJsZSBhbGwgdGhlIHBsYW5lcy4KPiAgCSAqLwo+IC0JZm9yX2VhY2hf aW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKPiAtCQlpZiAoIWNydGMtPmFjdGl2ZSkKPiAtCQkJY29u dGludWU7Cj4gLQo+IC0JCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoJmNydGMtPmJhc2UpOwo+ IC0JCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSgmY3J0Yy0+YmFzZSk7Cj4gLQl9Cj4g Kwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykKPiArCQlpbnRlbF9jcnRjX2NvbnRyb2wo JmNydGMtPmJhc2UsIGZhbHNlKTsKPiAgfQo+ICAKPiAgdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKPiBAQCAtNTczOSwyNiArNTcxOSwyOSBAQCB2b2lkIGlu dGVsX2NydGNfY29udHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxlKQo+ICAJ ZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47Cj4gIAl1bnNpZ25lZCBsb25n IGRvbWFpbnM7Cj4gIAo+ICsJaWYgKGVuYWJsZSA9PSBpbnRlbF9jcnRjLT5hY3RpdmUpCj4gKwkJ cmV0dXJuOwo+ICsKPiArCWlmIChlbmFibGUgJiYgIWNydGMtPnN0YXRlLT5lbmFibGUpCj4gKwkJ cmV0dXJuOwo+ICsKPiArCWNydGMtPnN0YXRlLT5hY3RpdmUgPSBlbmFibGU7Cj4gIAlpZiAoZW5h YmxlKSB7Cj4gLQkJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpIHsKPiAtCQkJZG9tYWlucyA9IGdl dF9jcnRjX3Bvd2VyX2RvbWFpbnMoY3J0Yyk7Cj4gLQkJCWZvcl9lYWNoX3Bvd2VyX2RvbWFpbihk b21haW4sIGRvbWFpbnMpCj4gLQkJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwg ZG9tYWluKTsKPiAtCQkJaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0gZG9tYWlu czsKPiAtCj4gLQkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlKGNydGMpOwo+IC0JCQlp bnRlbF9jcnRjX2VuYWJsZV9wbGFuZXMoY3J0Yyk7Cj4gLQkJfQo+ICsJCWRvbWFpbnMgPSBnZXRf Y3J0Y19wb3dlcl9kb21haW5zKGNydGMpOwo+ICsJCWZvcl9lYWNoX3Bvd2VyX2RvbWFpbihkb21h aW4sIGRvbWFpbnMpCj4gKwkJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBkb21h aW4pOwo+ICsJCWludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IGRvbWFpbnM7Cj4g Kwo+ICsJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlKGNydGMpOwo+ICsJCWludGVsX2Ny dGNfZW5hYmxlX3BsYW5lcyhjcnRjKTsKPiAgCX0gZWxzZSB7Cj4gLQkJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkgewo+IC0JCQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMpOwo+IC0JCQlk ZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7Cj4gLQo+IC0JCQlkb21haW5zID0g aW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwo+IC0JCQlmb3JfZWFjaF9wb3dlcl9k b21haW4oZG9tYWluLCBkb21haW5zKQo+IC0JCQkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2 X3ByaXYsIGRvbWFpbik7Cj4gLQkJCWludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9 IDA7Cj4gLQkJfQo+ICsJCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Cj4gKwkJZGV2 X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwo+ICsKPiArCQlkb21haW5zID0gaW50 ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwo+ICsJCWZvcl9lYWNoX3Bvd2VyX2RvbWFp bihkb21haW4sIGRvbWFpbnMpCj4gKwkJCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2 LCBkb21haW4pOwo+ICsJCWludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IDA7Cj4g IAl9Cj4gIH0KPiAgCj4gQEAgLTU3NzUsOCArNTc1OCw2IEBAIHZvaWQgaW50ZWxfY3J0Y191cGRh dGVfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAkJZW5hYmxlIHw9IGludGVsX2VuY29k ZXItPmNvbm5lY3RvcnNfYWN0aXZlOwo+ICAKPiAgCWludGVsX2NydGNfY29udHJvbChjcnRjLCBl bmFibGUpOwo+IC0KPiAtCWNydGMtPnN0YXRlLT5hY3RpdmUgPSBlbmFibGU7Cj4gIH0KPiAgCj4g IHZvaWQgaW50ZWxfZW5jb2Rlcl9kZXN0cm95KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikK PiBAQCAtMTQwODcsOCArMTQwNjgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRj KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICAJCXBsYW5lID0gY3J0Yy0+cGxhbmU7Cj4gIAkJ dG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+YmFzZS5wcmltYXJ5LT5zdGF0ZSktPnZpc2libGUg PSB0cnVlOwo+ICAJCWNydGMtPnBsYW5lID0gIXBsYW5lOwo+IC0JCWludGVsX2NydGNfZGlzYWJs ZV9wbGFuZXMoJmNydGMtPmJhc2UpOwo+IC0JCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJs ZSgmY3J0Yy0+YmFzZSk7Cj4gKwkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCBmYWxz ZSk7Cj4gIAkJY3J0Yy0+cGxhbmUgPSBwbGFuZTsKPiAgCj4gIAkJLyogLi4uIGFuZCBicmVhayBh bGwgbGlua3MuICovCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBpbmRleCBmYjg5ZjVmMzQ5 OGMuLjk2NjhiMTdkN2UwZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gQEAgLTk4 Nyw3ICs5ODcsNiBAQCB2b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKPiAgdm9pZCBpbnRlbF9tYXJrX2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4gIHZv aWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKPiAgdm9p ZCBpbnRlbF9jcnRjX2NvbnRyb2woc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGVuYWJsZSk7 Cj4gLXZvaWQgaW50ZWxfY3J0Y19yZXNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Cj4gIHZv aWQgaW50ZWxfY3J0Y191cGRhdGVfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwo+ICB2b2lk IGludGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpOwo+ICBp bnQgaW50ZWxfY29ubmVjdG9yX2luaXQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqKTsKPiAtLSAK PiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9y YXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK