From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 02/13] drm/i915: Drop FBDEV #ifdev in mst code Date: Tue, 4 Jul 2017 17:18:22 +0200 Message-ID: <20170704151833.17304-3-daniel.vetter@ffwll.ch> References: <20170704151833.17304-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00B0A6E348 for ; Tue, 4 Jul 2017 15:18:43 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u23so27031752wma.2 for ; Tue, 04 Jul 2017 08:18:42 -0700 (PDT) In-Reply-To: <20170704151833.17304-1-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: DRI Development Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org U2luY2UKCmNvbW1pdCBhMDNmZGNiMTg2MzI5NzQ4MWE0YjgxN2MyYTc1OWNhZmNiZGZhMGFlCkF1 dGhvcjogQXJjaGl0IFRhbmVqYSA8YXJjaGl0dEBjb2RlYXVyb3JhLm9yZz4KRGF0ZTogICBXZWQg QXVnIDUgMTI6Mjg6NTcgMjAxNSArMDUzMAoKICAgIGRybTogQWRkIHRvcCBsZXZlbCBLY29uZmln IG9wdGlvbiBmb3IgRFJNIGZiZGV2IGVtdWxhdGlvbgoKdGhpcyBpcyBwcm9wZXJseSBoYW5kbGVk IHVzaW5nIGR1bW15IGZ1bmN0aW9ucy4gVGhpcyBlc3NlbnRpYWxseQp1bmRvZXMKCmNvbW1pdCA3 Mjk2Yzg0OWJmMmVjYTJiZDdkMzRhNDY4NmE1M2UzMDg5MTUwYWMxCkF1dGhvcjogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkRhdGU6ICAgVHVlIEp1bCAyMiAyMDoxMDoy OCAyMDE0ICsxMDAwCgogICAgZHJtL2k5MTU6IGZpeCBidWlsZCB3aXRob3V0IGZiZGUKCnYyOiBX ZSBhbHNvIG5lZWQgdG8gZHJvcCB0aGUgI2lmZGVmIGZyb20gaGVhZGVycy4gU2VlbXMgbGlrZSBh IHNtYWxsCnByaWNlIHRvIHBheSBmb3Igc2xpZ2h0bHkgY2xlYW5lciBjb2RlLgoKQ2M6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwg VmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICB8ICAyIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9t c3QuYyB8IDM4ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggMDAyOWJiOTQ5ZTkwLi4zNzQ5MjA4YjcyMDAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtMjMwNCwxMSArMjMwNCw5IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRl IHsKIAogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICp2bHZfcGN0eDsKIAotI2lmZGVmIENP TkZJR19EUk1fRkJERVZfRU1VTEFUSU9OCiAJLyogbGlzdCBvZiBmYmRldiByZWdpc3RlciBvbiB0 aGlzIGRldmljZSAqLwogCXN0cnVjdCBpbnRlbF9mYmRldiAqZmJkZXY7CiAJc3RydWN0IHdvcmtf c3RydWN0IGZiZGV2X3N1c3BlbmRfd29yazsKLSNlbmRpZgogCiAJc3RydWN0IGRybV9wcm9wZXJ0 eSAqYnJvYWRjYXN0X3JnYl9wcm9wZXJ0eTsKIAlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpmb3JjZV9h dWRpb19wcm9wZXJ0eTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw X21zdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggOWFhOTU5 Mjg0NDk3Li5lNGVhOTY4YjFkNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwX21zdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBA IC00NDMsMjggKzQ0Myw2IEBAIHN0YXRpYyBib29sIGludGVsX2RwX21zdF9nZXRfaHdfc3RhdGUo c3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCXJldHVybiBmYWxzZTsKIH0KIAot c3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2FkZF90b19mYmRldihzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpjb25uZWN0b3IpCi17Ci0jaWZkZWYgQ09ORklHX0RSTV9GQkRFVl9FTVVMQVRJT04K LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+ YmFzZS5kZXYpOwotCi0JaWYgKGRldl9wcml2LT5mYmRldikKLQkJZHJtX2ZiX2hlbHBlcl9hZGRf b25lX2Nvbm5lY3RvcigmZGV2X3ByaXYtPmZiZGV2LT5oZWxwZXIsCi0JCQkJCQkmY29ubmVjdG9y LT5iYXNlKTsKLSNlbmRpZgotfQotCi1zdGF0aWMgdm9pZCBpbnRlbF9jb25uZWN0b3JfcmVtb3Zl X2Zyb21fZmJkZXYoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQotewotI2lmZGVm IENPTkZJR19EUk1fRkJERVZfRU1VTEFUSU9OCi0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShjb25uZWN0b3ItPmJhc2UuZGV2KTsKLQotCWlmIChkZXZfcHJpdi0+ ZmJkZXYpCi0JCWRybV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25uZWN0b3IoJmRldl9wcml2LT5m YmRldi0+aGVscGVyLAotCQkJCQkJICAgJmNvbm5lY3Rvci0+YmFzZSk7Ci0jZW5kaWYKLX0KLQog c3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9yICppbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3Rvcihz dHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwgc3RydWN0IGRybV9kcF9tc3RfcG9y dCAqcG9ydCwgY29uc3QgY2hhciAqcGF0aHByb3ApCiB7CiAJc3RydWN0IGludGVsX2RwICppbnRl bF9kcCA9IGNvbnRhaW5lcl9vZihtZ3IsIHN0cnVjdCBpbnRlbF9kcCwgbXN0X21ncik7CkBAIC01 MDAsMjggKzQ3OCwzMiBAQCBzdGF0aWMgc3RydWN0IGRybV9jb25uZWN0b3IgKmludGVsX2RwX2Fk ZF9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sbwogCiBzdGF0aWMgdm9pZCBp bnRlbF9kcF9yZWdpc3Rlcl9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3IpCiB7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9f aW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShjb25uZWN0b3ItPmRldik7CiAKLQlpbnRlbF9jb25uZWN0b3JfYWRk X3RvX2ZiZGV2KGludGVsX2Nvbm5lY3Rvcik7CisJaWYgKGRldl9wcml2LT5mYmRldikKKwkJZHJt X2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcigmZGV2X3ByaXYtPmZiZGV2LT5oZWxwZXIsCisJ CQkJCQljb25uZWN0b3IpOwogCi0JZHJtX2Nvbm5lY3Rvcl9yZWdpc3RlcigmaW50ZWxfY29ubmVj dG9yLT5iYXNlKTsKKwlkcm1fY29ubmVjdG9yX3JlZ2lzdGVyKGNvbm5lY3Rvcik7CiB9CiAKIHN0 YXRpYyB2b2lkIGludGVsX2RwX2Rlc3Ryb3lfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX21z dF90b3BvbG9neV9tZ3IgKm1nciwKIAkJCQkJICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvcikKIHsKIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSB0b19p bnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+ZGV2KTsKIAogCWRybV9jb25uZWN0b3JfdW5yZWdp c3Rlcihjb25uZWN0b3IpOwogCi0JLyogbmVlZCB0byBudWtlIHRoZSBjb25uZWN0b3IgKi8KLQlp bnRlbF9jb25uZWN0b3JfcmVtb3ZlX2Zyb21fZmJkZXYoaW50ZWxfY29ubmVjdG9yKTsKKwlpZiAo ZGV2X3ByaXYtPmZiZGV2KQorCQlkcm1fZmJfaGVscGVyX3JlbW92ZV9vbmVfY29ubmVjdG9yKCZk ZXZfcHJpdi0+ZmJkZXYtPmhlbHBlciwKKwkJCQkJCSAgIGNvbm5lY3Rvcik7CiAJLyogcHJldmVu dCByYWNlIHdpdGggdGhlIGNoZWNrIGluIC0+ZGV0ZWN0ICovCiAJZHJtX21vZGVzZXRfbG9jaygm Y29ubmVjdG9yLT5kZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwogCWlu dGVsX2Nvbm5lY3Rvci0+bXN0X3BvcnQgPSBOVUxMOwogCWRybV9tb2Rlc2V0X3VubG9jaygmY29u bmVjdG9yLT5kZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOwogCi0JZHJtX2Nvbm5l Y3Rvcl91bnJlZmVyZW5jZSgmaW50ZWxfY29ubmVjdG9yLT5iYXNlKTsKKwlkcm1fY29ubmVjdG9y X3VucmVmZXJlbmNlKGNvbm5lY3Rvcik7CiAJRFJNX0RFQlVHX0tNUygiXG4iKTsKIH0KIAotLSAK Mi4xMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK