From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v6 03/12] drm/i915: Use atomic scaling_mode instead of panel.fitting_mode Date: Mon, 1 May 2017 15:37:55 +0200 Message-ID: <20170501133804.8116-4-maarten.lankhorst@linux.intel.com> References: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIGZpcnN0IHN0ZXAgaW4gY29udmVydGluZyBjb25uZWN0b3IgcHJvcGVydGllcyB0byBhdG9t aWMgaXMKd2lyaW5nIHVwIHRoZSBhdG9taWMgc3RhdGUuIFdlJ3JlIHN0aWxsIG5vdCBjb21wbGV0 ZWx5IHN1cG9wcnRpbmcKdGhlIHNjYWxpbmcgbW9kZSBpbiB0aGUgYXRvbWljIGNhc2UsIGJ1dCB0 aGlzIGlzIHRoZSBmaXJzdCBzdGVwCnRvd2FyZHMgaXQuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICB8IDEzICsrKysrLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RzaS5jICB8IDExICsrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s dmRzLmMgfCAxMSArKysrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCsp LCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAwODgzNGY3NGQz OTYuLmVhNDM2NmIyNjRmMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xNjg2LDEwICsx Njg2LDEwIEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCiAJCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSkKIAkJCWludGVsX2dt Y2hfcGFuZWxfZml0dGluZyhpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZywKLQkJCQkJCSBpbnRlbF9j b25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSk7CisJCQkJCQkgY29ubl9zdGF0ZS0+c2NhbGlu Z19tb2RlKTsKIAkJZWxzZQogCQkJaW50ZWxfcGNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxfY3J0Yywg cGlwZV9jb25maWcsCi0JCQkJCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSk7 CisJCQkJCQljb25uX3N0YXRlLT5zY2FsaW5nX21vZGUpOwogCX0KIAogCWlmIChhZGp1c3RlZF9t b2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfREJMQ0xLKQpAQCAtNDgyOCw3ICs0ODI4LDYgQEAg aW50ZWxfZHBfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJ CSAgICAgIHVpbnQ2NF90IHZhbCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpp bnRlbF9jb25uZWN0b3IgPSB0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKTsKIAlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9IGludGVsX2F0dGFjaGVkX2VuY29kZXIoY29u bmVjdG9yKTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZp bnRlbF9lbmNvZGVyLT5iYXNlKTsKIAlpbnQgcmV0OwpAQCAtNDg5NywxMSArNDg5NiwxMSBAQCBp bnRlbF9kcF9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJ CXJldHVybiAtRUlOVkFMOwogCQl9CiAKLQkJaWYgKGludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0 dGluZ19tb2RlID09IHZhbCkgeworCQlpZiAoY29ubmVjdG9yLT5zdGF0ZS0+c2NhbGluZ19tb2Rl ID09IHZhbCkgewogCQkJLyogdGhlIGVEUCBzY2FsaW5nIHByb3BlcnR5IGlzIG5vdCBjaGFuZ2Vk ICovCiAJCQlyZXR1cm4gMDsKIAkJfQotCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdf bW9kZSA9IHZhbDsKKwkJY29ubmVjdG9yLT5zdGF0ZS0+c2NhbGluZ19tb2RlID0gdmFsOwogCiAJ CWdvdG8gZG9uZTsKIAl9CkBAIC01MTc5LDggKzUxNzgsNiBAQCBib29sIGludGVsX2RwX2lzX2Vk cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KQogc3Rh dGljIHZvaWQKIGludGVsX2RwX2FkZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAsIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7Ci0Jc3RydWN0IGludGVsX2Nv bm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7 Ci0KIAlpbnRlbF9hdHRhY2hfZm9yY2VfYXVkaW9fcHJvcGVydHkoY29ubmVjdG9yKTsKIAlpbnRl bF9hdHRhY2hfYnJvYWRjYXN0X3JnYl9wcm9wZXJ0eShjb25uZWN0b3IpOwogCWludGVsX2RwLT5j b2xvcl9yYW5nZV9hdXRvID0gdHJ1ZTsKQEAgLTUxOTEsNyArNTE4OCw3IEBAIGludGVsX2RwX2Fk ZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0CiAJCQkmY29ubmVjdG9yLT5iYXNlLAogCQkJY29ubmVjdG9yLT5kZXYtPm1v ZGVfY29uZmlnLnNjYWxpbmdfbW9kZV9wcm9wZXJ0eSwKIAkJCURSTV9NT0RFX1NDQUxFX0FTUEVD VCk7Ci0JCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0dGluZ19tb2RlID0gRFJNX01PREVfU0NB TEVfQVNQRUNUOworCQljb25uZWN0b3ItPnN0YXRlLT5zY2FsaW5nX21vZGUgPSBEUk1fTU9ERV9T Q0FMRV9BU1BFQ1Q7CiAJfQogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGQzOGZl ZDc4NTAwYi4uMmIyNDM0NDRjZjhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjY2 LDcgKzI2Niw2IEBAIHN0cnVjdCBpbnRlbF9lbmNvZGVyIHsKIHN0cnVjdCBpbnRlbF9wYW5lbCB7 CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmZpeGVkX21vZGU7CiAJc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKmRvd25jbG9ja19tb2RlOwotCWludCBmaXR0aW5nX21vZGU7CiAKIAkvKiBiYWNr bGlnaHQgKi8KIAlzdHJ1Y3QgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwppbmRleCBmYzBlZjQ5 MjI1MmEuLmVjMTQxZWI1OWU2ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKQEAgLTMyMCwx MCArMzIwLDEwIEBAIHN0YXRpYyBib29sIGludGVsX2RzaV9jb21wdXRlX2NvbmZpZyhzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXZfcHJp dikpCiAJCQlpbnRlbF9nbWNoX3BhbmVsX2ZpdHRpbmcoY3J0YywgcGlwZV9jb25maWcsCi0JCQkJ CQkgaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUpOworCQkJCQkJIGNvbm5fc3Rh dGUtPnNjYWxpbmdfbW9kZSk7CiAJCWVsc2UKIAkJCWludGVsX3BjaF9wYW5lbF9maXR0aW5nKGNy dGMsIHBpcGVfY29uZmlnLAotCQkJCQkJaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21v ZGUpOworCQkJCQkJY29ubl9zdGF0ZS0+c2NhbGluZ19tb2RlKTsKIAl9CiAKIAkvKiBEU0kgdXNl cyBzaG9ydCBwYWNrZXRzIGZvciBzeW5jIGV2ZW50cywgc28gY2xlYXIgbW9kZSBmbGFncyBmb3Ig RFNJICovCkBAIC0xNTkyLDcgKzE1OTIsNiBAQCBzdGF0aWMgaW50IGludGVsX2RzaV9zZXRfcHJv cGVydHkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCQkgIHVpbnQ2NF90IHZh bCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7Ci0Jc3RydWN0 IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNv bm5lY3Rvcik7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWludCByZXQ7CiAKQEAgLTE2MTEs MTAgKzE2MTAsMTAgQEAgc3RhdGljIGludCBpbnRlbF9kc2lfc2V0X3Byb3BlcnR5KHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCi0JCWlm IChpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSA9PSB2YWwpCisJCWlmIChjb25u ZWN0b3ItPnN0YXRlLT5zY2FsaW5nX21vZGUgPT0gdmFsKQogCQkJcmV0dXJuIDA7CiAKLQkJaW50 ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUgPSB2YWw7CisJCWNvbm5lY3Rvci0+c3Rh dGUtPnNjYWxpbmdfbW9kZSA9IHZhbDsKIAl9CiAKIAljcnRjID0gY29ubmVjdG9yLT5zdGF0ZS0+ Y3J0YzsKQEAgLTE2ODAsNyArMTY3OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RzaV9hZGRfcHJv cGVydGllcyhzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCWRybV9vYmplY3Rf YXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UuYmFzZSwKIAkJCQkJICAgZGV2LT5tb2Rl X2NvbmZpZy5zY2FsaW5nX21vZGVfcHJvcGVydHksCiAJCQkJCSAgIERSTV9NT0RFX1NDQUxFX0FT UEVDVCk7Ci0JCWNvbm5lY3Rvci0+cGFuZWwuZml0dGluZ19tb2RlID0gRFJNX01PREVfU0NBTEVf QVNQRUNUOworCQljb25uZWN0b3ItPmJhc2Uuc3RhdGUtPnNjYWxpbmdfbW9kZSA9IERSTV9NT0RF X1NDQUxFX0FTUEVDVDsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2x2ZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwppbmRleCA4 Yjk0MmVmMmIzZWMuLmExNGJkZWZkY2I4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHZkcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwpA QCAtNDMzLDEwICs0MzMsMTAgQEAgc3RhdGljIGJvb2wgaW50ZWxfbHZkc19jb21wdXRlX2NvbmZp ZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAkJcGlwZV9jb25maWctPmhh c19wY2hfZW5jb2RlciA9IHRydWU7CiAKIAkJaW50ZWxfcGNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxf Y3J0YywgcGlwZV9jb25maWcsCi0JCQkJCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0dGluZ19t b2RlKTsKKwkJCQkJY29ubl9zdGF0ZS0+c2NhbGluZ19tb2RlKTsKIAl9IGVsc2UgewogCQlpbnRl bF9nbWNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCi0JCQkJCSBpbnRl bF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSk7CisJCQkJCSBjb25uX3N0YXRlLT5zY2Fs aW5nX21vZGUpOwogCiAJfQogCkBAIC02MDIsNyArNjAyLDYgQEAgc3RhdGljIGludCBpbnRlbF9s dmRzX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCSAg IHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAogCQkJCSAgIHVpbnQ2NF90IHZhbHVlKQog ewotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvciA9IHRvX2ludGVsX2Nv bm5lY3Rvcihjb25uZWN0b3IpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3It PmRldjsKIAogCWlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVfY29uZmlnLnNjYWxpbmdfbW9kZV9w cm9wZXJ0eSkgewpAQCAtNjEzLDExICs2MTIsMTEgQEAgc3RhdGljIGludCBpbnRlbF9sdmRzX3Nl dF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJcmV0dXJuIC1F SU5WQUw7CiAJCX0KIAotCQlpZiAoaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUg PT0gdmFsdWUpIHsKKwkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPnNjYWxpbmdfbW9kZSA9PSB2YWx1 ZSkgewogCQkJLyogdGhlIExWRFMgc2NhbGluZyBwcm9wZXJ0eSBpcyBub3QgY2hhbmdlZCAqLwog CQkJcmV0dXJuIDA7CiAJCX0KLQkJaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUg PSB2YWx1ZTsKKwkJY29ubmVjdG9yLT5zdGF0ZS0+c2NhbGluZ19tb2RlID0gdmFsdWU7CiAKIAkJ Y3J0YyA9IGludGVsX2F0dGFjaGVkX2VuY29kZXIoY29ubmVjdG9yKS0+YmFzZS5jcnRjOwogCQlp ZiAoY3J0YyAmJiBjcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7CkBAIC0xMDg3LDcgKzEwODYsNyBAQCB2 b2lkIGludGVsX2x2ZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ ZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoJmNvbm5lY3Rvci0+YmFzZSwKIAkJCQkgICAgICBk ZXYtPm1vZGVfY29uZmlnLnNjYWxpbmdfbW9kZV9wcm9wZXJ0eSwKIAkJCQkgICAgICBEUk1fTU9E RV9TQ0FMRV9BU1BFQ1QpOwotCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0dGluZ19tb2RlID0g RFJNX01PREVfU0NBTEVfQVNQRUNUOworCWNvbm5lY3Rvci0+c3RhdGUtPnNjYWxpbmdfbW9kZSA9 IERSTV9NT0RFX1NDQUxFX0FTUEVDVDsKIAogCWludGVsX2x2ZHNfcHBzX2dldF9od19zdGF0ZShk ZXZfcHJpdiwgJmx2ZHNfZW5jb2Rlci0+aW5pdF9wcHMpOwogCWx2ZHNfZW5jb2Rlci0+aW5pdF9s dmRzX3ZhbCA9IGx2ZHM7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==