From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 04/18] drm/i915: Do not use plane_config in intel_fbdev.c Date: Thu, 2 Jul 2015 16:36:48 +0200 Message-ID: <1435847822-5318-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1435847822-5318-1-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 mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CFAF6EC9C for ; Thu, 2 Jul 2015 07:37:24 -0700 (PDT) In-Reply-To: <1435847822-5318-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VXNlIHRoZSBhdG9taWMgc3RhdGUgaW5zdGVhZCwgdGhpcyBhbGxvd3MgcmVtb3ZpbmcgcGxhbmVf Y29uZmlnCmZyb20gdGhlIGNydGMgYWZ0ZXIgdGhlIGZ1bGwgaHcgcmVhZG91dCBpcyBjb21wbGV0 ZWQuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMg fCAxNCArKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRl di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCAyYTE3MjRlMzRh MzYuLjNkNWJiNTY0NzdhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC01ODIs NyArNTgyLDYgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJkZXZfaW5pdF9iaW9zKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICpmYiA9IE5VTEw7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCXN0 cnVjdCBpbnRlbF9pbml0aWFsX3BsYW5lX2NvbmZpZyAqcGxhbmVfY29uZmlnID0gTlVMTDsKIAl1 bnNpZ25lZCBpbnQgbWF4X3NpemUgPSAwOwogCiAJaWYgKCFpOTE1LmZhc3Rib290KQpAQCAtNTkw LDIwICs1ODksMjEgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJkZXZfaW5pdF9iaW9zKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAKIAkvKiBGaW5kIHRoZSBsYXJnZXN0IGZiICovCiAJZm9yX2VhY2hf Y3J0YyhkZXYsIGNydGMpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9CisJ CQlpbnRlbF9mYl9vYmooY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiKTsKIAkJaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKLQkJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUgfHwgIWNy dGMtPnByaW1hcnktPmZiKSB7CisJCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlIHx8ICFvYmopIHsK IAkJCURSTV9ERUJVR19LTVMoInBpcGUgJWMgbm90IGFjdGl2ZSBvciBubyBmYiwgc2tpcHBpbmdc biIsCiAJCQkJICAgICAgcGlwZV9uYW1lKGludGVsX2NydGMtPnBpcGUpKTsKIAkJCWNvbnRpbnVl OwogCQl9CiAKLQkJaWYgKGludGVsX2NydGMtPnBsYW5lX2NvbmZpZy5zaXplID4gbWF4X3NpemUp IHsKKwkJaWYgKG9iai0+YmFzZS5zaXplID4gbWF4X3NpemUpIHsKIAkJCURSTV9ERUJVR19LTVMo ImZvdW5kIHBvc3NpYmxlIGZiIGZyb20gcGxhbmUgJWNcbiIsCiAJCQkJICAgICAgcGlwZV9uYW1l KGludGVsX2NydGMtPnBpcGUpKTsKLQkJCXBsYW5lX2NvbmZpZyA9ICZpbnRlbF9jcnRjLT5wbGFu ZV9jb25maWc7Ci0JCQlmYiA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKGNydGMtPnByaW1hcnktPmZi KTsKLQkJCW1heF9zaXplID0gcGxhbmVfY29uZmlnLT5zaXplOworCQkJZmIgPSB0b19pbnRlbF9m cmFtZWJ1ZmZlcihjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpOworCQkJbWF4X3NpemUgPSBvYmot PmJhc2Uuc2l6ZTsKIAkJfQogCX0KIApAQCAtNjM4LDcgKzYzOCw2IEBAIHN0YXRpYyBib29sIGlu dGVsX2ZiZGV2X2luaXRfYmlvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJRFJNX0RFQlVH X0tNUygiZmIgbm90IHdpZGUgZW5vdWdoIGZvciBwbGFuZSAlYyAoJWQgdnMgJWQpXG4iLAogCQkJ CSAgICAgIHBpcGVfbmFtZShpbnRlbF9jcnRjLT5waXBlKSwKIAkJCQkgICAgICBjdXJfc2l6ZSwg ZmItPmJhc2UucGl0Y2hlc1swXSk7Ci0JCQlwbGFuZV9jb25maWcgPSBOVUxMOwogCQkJZmIgPSBO VUxMOwogCQkJYnJlYWs7CiAJCX0KQEAgLTY1OSw3ICs2NTgsNiBAQCBzdGF0aWMgYm9vbCBpbnRl bF9mYmRldl9pbml0X2Jpb3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCURSTV9ERUJVR19L TVMoImZiIG5vdCBiaWcgZW5vdWdoIGZvciBwbGFuZSAlYyAoJWQgdnMgJWQpXG4iLAogCQkJCSAg ICAgIHBpcGVfbmFtZShpbnRlbF9jcnRjLT5waXBlKSwKIAkJCQkgICAgICBjdXJfc2l6ZSwgbWF4 X3NpemUpOwotCQkJcGxhbmVfY29uZmlnID0gTlVMTDsKIAkJCWZiID0gTlVMTDsKIAkJCWJyZWFr OwogCQl9Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK