From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v6 01/12] drm/atomic: Handle picture_aspect_ratio in atomic core Date: Mon, 1 May 2017 15:37:53 +0200 Message-ID: <20170501133804.8116-2-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 VGhpcyBpcyBvbmx5IHVzZWQgaW4gaTkxNSwgd2hpY2ggaGFkIHVzZWQgaXRzIG93biBub24tdGFv bWljIHdheSB0bwpkZWFsIHdpdGggdGhlIHBpY3R1cmUgYXNwZWN0IHJhdGlvLiBNb3ZlIHNlbGVj dGVkIGFzcGVjdF9yYXRpbyB0bwphdG9taWMgc3RhdGUgYW5kIHVzZSB0aGUgYXRvbWljIHN0YXRl IGluIHRoZSBhZmZlY3RlZCBpOTE1IGNvbm5lY3RvcnMuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWku YyB8IDE4ICsrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2 by5jIHwgMjMgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvZHJtL2RybV9jb25uZWN0 b3IuaCAgICAgICB8IDEwICsrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9u cygrKSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9h dG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKaW5kZXggMzAyMjlhYjcxOWMw Li43N2JiMzZlOTU2ZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAtMTEyMyw2ICsxMTIzLDggQEAg aW50IGRybV9hdG9taWNfY29ubmVjdG9yX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yLAogCQkgKi8KIAkJaWYgKHN0YXRlLT5saW5rX3N0YXR1cyAhPSBEUk1fTElO S19TVEFUVVNfR09PRCkKIAkJCXN0YXRlLT5saW5rX3N0YXR1cyA9IHZhbDsKKwl9IGVsc2UgaWYg KHByb3BlcnR5ID09IGNvbmZpZy0+YXNwZWN0X3JhdGlvX3Byb3BlcnR5KSB7CisJCXN0YXRlLT5w aWN0dXJlX2FzcGVjdF9yYXRpbyA9IHZhbDsKIAl9IGVsc2UgaWYgKGNvbm5lY3Rvci0+ZnVuY3Mt PmF0b21pY19zZXRfcHJvcGVydHkpIHsKIAkJcmV0dXJuIGNvbm5lY3Rvci0+ZnVuY3MtPmF0b21p Y19zZXRfcHJvcGVydHkoY29ubmVjdG9yLAogCQkJCXN0YXRlLCBwcm9wZXJ0eSwgdmFsKTsKQEAg LTExOTksNiArMTIwMSw4IEBAIGRybV9hdG9taWNfY29ubmVjdG9yX2dldF9wcm9wZXJ0eShzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkqdmFsID0gc3RhdGUtPnR2Lmh1ZTsKIAl9 IGVsc2UgaWYgKHByb3BlcnR5ID09IGNvbmZpZy0+bGlua19zdGF0dXNfcHJvcGVydHkpIHsKIAkJ KnZhbCA9IHN0YXRlLT5saW5rX3N0YXR1czsKKwl9IGVsc2UgaWYgKHByb3BlcnR5ID09IGNvbmZp Zy0+YXNwZWN0X3JhdGlvX3Byb3BlcnR5KSB7CisJCSp2YWwgPSBzdGF0ZS0+cGljdHVyZV9hc3Bl Y3RfcmF0aW87CiAJfSBlbHNlIGlmIChjb25uZWN0b3ItPmZ1bmNzLT5hdG9taWNfZ2V0X3Byb3Bl cnR5KSB7CiAJCXJldHVybiBjb25uZWN0b3ItPmZ1bmNzLT5hdG9taWNfZ2V0X3Byb3BlcnR5KGNv bm5lY3RvciwKIAkJCQlzdGF0ZSwgcHJvcGVydHksIHZhbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDU0ZjNmZjg0MDgxMi4uZDM4ZmVkNzg1MDBiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtODc3LDcgKzg3Nyw2IEBAIHN0cnVjdCBpbnRlbF9oZG1pIHsKIAlib29sIGhh c19hdWRpbzsKIAllbnVtIGhkbWlfZm9yY2VfYXVkaW8gZm9yY2VfYXVkaW87CiAJYm9vbCByZ2Jf cXVhbnRfcmFuZ2Vfc2VsZWN0YWJsZTsKLQllbnVtIGhkbWlfcGljdHVyZV9hc3BlY3QgYXNwZWN0 X3JhdGlvOwogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmF0dGFjaGVkX2Nvbm5lY3RvcjsKIAl2 b2lkICgqd3JpdGVfaW5mb2ZyYW1lKShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJ Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9oZG1pLmMKaW5kZXggNTJmMGIyZDVmYWQyLi41OGQ2OTAzOTNiMjkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9oZG1pLmMKQEAgLTE0MDgsNyArMTQwOCw3IEBAIGJvb2wgaW50ZWxfaGRtaV9j b21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAl9CiAKIAkvKiBT ZXQgdXNlciBzZWxlY3RlZCBQQVIgdG8gaW5jb21pbmcgbW9kZSdzIG1lbWJlciAqLwotCWFkanVz dGVkX21vZGUtPnBpY3R1cmVfYXNwZWN0X3JhdGlvID0gaW50ZWxfaGRtaS0+YXNwZWN0X3JhdGlv OworCWFkanVzdGVkX21vZGUtPnBpY3R1cmVfYXNwZWN0X3JhdGlvID0gY29ubl9zdGF0ZS0+cGlj dHVyZV9hc3BlY3RfcmF0aW87CiAKIAlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCA9IDQ7CiAKQEAg LTE2NTQsMTkgKzE2NTQsNyBAQCBpbnRlbF9oZG1pX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yLAogCX0KIAogCWlmIChwcm9wZXJ0eSA9PSBjb25uZWN0b3ItPmRl di0+bW9kZV9jb25maWcuYXNwZWN0X3JhdGlvX3Byb3BlcnR5KSB7Ci0JCXN3aXRjaCAodmFsKSB7 Ci0JCWNhc2UgRFJNX01PREVfUElDVFVSRV9BU1BFQ1RfTk9ORToKLQkJCWludGVsX2hkbWktPmFz cGVjdF9yYXRpbyA9IEhETUlfUElDVFVSRV9BU1BFQ1RfTk9ORTsKLQkJCWJyZWFrOwotCQljYXNl IERSTV9NT0RFX1BJQ1RVUkVfQVNQRUNUXzRfMzoKLQkJCWludGVsX2hkbWktPmFzcGVjdF9yYXRp byA9IEhETUlfUElDVFVSRV9BU1BFQ1RfNF8zOwotCQkJYnJlYWs7Ci0JCWNhc2UgRFJNX01PREVf UElDVFVSRV9BU1BFQ1RfMTZfOToKLQkJCWludGVsX2hkbWktPmFzcGVjdF9yYXRpbyA9IEhETUlf UElDVFVSRV9BU1BFQ1RfMTZfOTsKLQkJCWJyZWFrOwotCQlkZWZhdWx0OgotCQkJcmV0dXJuIC1F SU5WQUw7Ci0JCX0KKwkJY29ubmVjdG9yLT5zdGF0ZS0+cGljdHVyZV9hc3BlY3RfcmF0aW8gPSB2 YWw7CiAJCWdvdG8gZG9uZTsKIAl9CiAKQEAgLTE4MjgsNyArMTgxNiw3IEBAIGludGVsX2hkbWlf YWRkX3Byb3BlcnRpZXMoc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWksIHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjCiAJaW50ZWxfYXR0YWNoX2Jyb2FkY2FzdF9yZ2JfcHJvcGVydHkoY29ubmVj dG9yKTsKIAlpbnRlbF9oZG1pLT5jb2xvcl9yYW5nZV9hdXRvID0gdHJ1ZTsKIAlpbnRlbF9hdHRh Y2hfYXNwZWN0X3JhdGlvX3Byb3BlcnR5KGNvbm5lY3Rvcik7Ci0JaW50ZWxfaGRtaS0+YXNwZWN0 X3JhdGlvID0gSERNSV9QSUNUVVJFX0FTUEVDVF9OT05FOworCWNvbm5lY3Rvci0+c3RhdGUtPnBp Y3R1cmVfYXNwZWN0X3JhdGlvID0gSERNSV9QSUNUVVJFX0FTUEVDVF9OT05FOwogfQogCiAvKgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCmluZGV4IDgxNmE2ZjVhM2ZkOS4uZWY2ZmE4N2IyZjhh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0xMDcsMTEgKzEwNyw2IEBAIHN0cnVj dCBpbnRlbF9zZHZvIHsKIAlib29sIGNvbG9yX3JhbmdlX2F1dG87CiAKIAkvKioKLQkgKiBIRE1J IHVzZXIgc3BlY2lmaWVkIGFzcGVjdCByYXRpbwotCSAqLwotCWVudW0gaGRtaV9waWN0dXJlX2Fz cGVjdCBhc3BlY3RfcmF0aW87Ci0KLQkvKioKIAkgKiBUaGlzIGlzIHNldCBpZiB3ZSdyZSBnb2lu ZyB0byB0cmVhdCB0aGUgZGV2aWNlIGFzIFRWLW91dC4KIAkgKgogCSAqIFdoaWxlIHdlIGhhdmUg dGhlc2UgbmljZSBmcmllbmRseSBmbGFncyBmb3Igb3V0cHV0IHR5cGVzIHRoYXQgb3VnaHQKQEAg LTExODYsNyArMTE4MSw3IEBAIHN0YXRpYyBib29sIGludGVsX3Nkdm9fY29tcHV0ZV9jb25maWco c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAkvKiBTZXQgdXNlciBzZWxlY3RlZCBQ QVIgdG8gaW5jb21pbmcgbW9kZSdzIG1lbWJlciAqLwogCWlmIChpbnRlbF9zZHZvLT5pc19oZG1p KQotCQlhZGp1c3RlZF9tb2RlLT5waWN0dXJlX2FzcGVjdF9yYXRpbyA9IGludGVsX3Nkdm8tPmFz cGVjdF9yYXRpbzsKKwkJYWRqdXN0ZWRfbW9kZS0+cGljdHVyZV9hc3BlY3RfcmF0aW8gPSBjb25u X3N0YXRlLT5waWN0dXJlX2FzcGVjdF9yYXRpbzsKIAogCXJldHVybiB0cnVlOwogfQpAQCAtMjA2 NywxOSArMjA2Miw3IEBAIGludGVsX3Nkdm9fc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IsCiAJfQogCiAJaWYgKHByb3BlcnR5ID09IGNvbm5lY3Rvci0+ZGV2LT5t b2RlX2NvbmZpZy5hc3BlY3RfcmF0aW9fcHJvcGVydHkpIHsKLQkJc3dpdGNoICh2YWwpIHsKLQkJ Y2FzZSBEUk1fTU9ERV9QSUNUVVJFX0FTUEVDVF9OT05FOgotCQkJaW50ZWxfc2R2by0+YXNwZWN0 X3JhdGlvID0gSERNSV9QSUNUVVJFX0FTUEVDVF9OT05FOwotCQkJYnJlYWs7Ci0JCWNhc2UgRFJN X01PREVfUElDVFVSRV9BU1BFQ1RfNF8zOgotCQkJaW50ZWxfc2R2by0+YXNwZWN0X3JhdGlvID0g SERNSV9QSUNUVVJFX0FTUEVDVF80XzM7Ci0JCQlicmVhazsKLQkJY2FzZSBEUk1fTU9ERV9QSUNU VVJFX0FTUEVDVF8xNl85OgotCQkJaW50ZWxfc2R2by0+YXNwZWN0X3JhdGlvID0gSERNSV9QSUNU VVJFX0FTUEVDVF8xNl85OwotCQkJYnJlYWs7Ci0JCWRlZmF1bHQ6Ci0JCQlyZXR1cm4gLUVJTlZB TDsKLQkJfQorCQljb25uZWN0b3ItPnN0YXRlLT5waWN0dXJlX2FzcGVjdF9yYXRpbyA9IHZhbDsK IAkJZ290byBkb25lOwogCX0KIApAQCAtMjQxOCw3ICsyNDAxLDcgQEAgaW50ZWxfc2R2b19hZGRf aGRtaV9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZvLAogCQlpbnRlbF9z ZHZvLT5jb2xvcl9yYW5nZV9hdXRvID0gdHJ1ZTsKIAl9CiAJaW50ZWxfYXR0YWNoX2FzcGVjdF9y YXRpb19wcm9wZXJ0eSgmY29ubmVjdG9yLT5iYXNlLmJhc2UpOwotCWludGVsX3Nkdm8tPmFzcGVj dF9yYXRpbyA9IEhETUlfUElDVFVSRV9BU1BFQ1RfTk9ORTsKKwljb25uZWN0b3ItPmJhc2UuYmFz ZS5zdGF0ZS0+cGljdHVyZV9hc3BlY3RfcmF0aW8gPSBIRE1JX1BJQ1RVUkVfQVNQRUNUX05PTkU7 CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfc2R2b19jb25uZWN0b3IgKmludGVsX3Nkdm9fY29u bmVjdG9yX2FsbG9jKHZvaWQpCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fY29ubmVjdG9y LmggYi9pbmNsdWRlL2RybS9kcm1fY29ubmVjdG9yLmgKaW5kZXggNGVlZGExMjBlNDZkLi4xZWNm NWYyNjE5YzAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaAorKysgYi9p bmNsdWRlL2RybS9kcm1fY29ubmVjdG9yLmgKQEAgLTI1LDYgKzI1LDcgQEAKIAogI2luY2x1ZGUg PGxpbnV4L2xpc3QuaD4KICNpbmNsdWRlIDxsaW51eC9jdHlwZS5oPgorI2luY2x1ZGUgPGxpbnV4 L2hkbWkuaD4KICNpbmNsdWRlIDxkcm0vZHJtX21vZGVfb2JqZWN0Lmg+CiAKICNpbmNsdWRlIDx1 YXBpL2RybS9kcm1fbW9kZS5oPgpAQCAtMzI2LDYgKzMyNywxNSBAQCBzdHJ1Y3QgZHJtX2Nvbm5l Y3Rvcl9zdGF0ZSB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwogCiAJc3RydWN0 IGRybV90dl9jb25uZWN0b3Jfc3RhdGUgdHY7CisKKwkvKioKKwkgKiBAcGljdHVyZV9hc3BlY3Rf cmF0aW86IENvbm5lY3RvciBwcm9wZXJ0eSB0byBjb250cm9sIHRoZQorCSAqIEhETUkgaW5mb2Zy YW1lIGFzcGVjdCByYXRpbyBzZXR0aW5nLgorCSAqCisJICogVGhlIERSTV9NT0RFX1BJQ1RVUkVf QVNQRUNUX1wqIHZhbHVlcyBtdWNoIG1hdGNoIHRoZQorCSAqIHZhbHVlcyBmb3IgJmVudW0gaGRt aV9waWN0dXJlX2FzcGVjdAorCSAqLworCWVudW0gaGRtaV9waWN0dXJlX2FzcGVjdCBwaWN0dXJl X2FzcGVjdF9yYXRpbzsKIH07CiAKIC8qKgotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=