From: Harry Wentland Subject: [PATCH 24/31] drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr() Date: Tue, 23 May 2017 10:09:02 -0400 Message-ID: <20170523140909.9924-25-harry.wentland@amd.com> References: <20170523140909.9924-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170523140909.9924-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Tom St Denis RnJvbTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgoKQ2hhbmdlLUlkOiBJMGY4 OTNhOWFiYWQ3NmRhOWI0MDNkYTYxMDNiMTkyYWYzOTE3NDA4OApTaWduZWQtb2ZmLWJ5OiBUb20g U3QgRGVuaXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+ClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFu ZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnku Q2hlbmdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2Rj ZV9tZW1faW5wdXQuYyB8IDI1ICsrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA5IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX21lbV9pbnB1dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfbWVtX2lucHV0LmMKaW5kZXggNzE4Njg4YzQxZjdi Li42NzMzNzFlNWY5ZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kY2UvZGNlX21lbV9pbnB1dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kY2UvZGNlX21lbV9pbnB1dC5jCkBAIC02MjUsMTggKzYyNSwxMiBAQCBzdGF0aWMgYm9vbCBk Y2VfbWlfcHJvZ3JhbV9zdXJmYWNlX2ZsaXBfYW5kX2FkZHIoCiAJICogbm9uLVhETUEgTW9kZTog R1JQSF9TVVJGQUNFX1VQREFURV9JTU1FRElBVEVfRU4gPSAxCiAJICogWERNQSBNb2RlOiBHUlBI X1NVUkZBQ0VfVVBEQVRFX0hfUkVUUkFDRV9FTiA9IDEKIAkgKi8KLQlSRUdfVVBEQVRFKEdSUEhf VVBEQVRFLAotCQkJR1JQSF9VUERBVEVfTE9DSywgMSk7Ci0KLQlpZiAoZmxpcF9pbW1lZGlhdGUp IHsKLQkJUkVHX1VQREFURV8yKEdSUEhfRkxJUF9DT05UUk9MLAotCQkJR1JQSF9TVVJGQUNFX1VQ REFURV9JTU1FRElBVEVfRU4sIDAsCi0JCQlHUlBIX1NVUkZBQ0VfVVBEQVRFX0hfUkVUUkFDRV9F TiwgMSk7Ci0JfSBlbHNlIHsKLQkJUkVHX1VQREFURV8yKEdSUEhfRkxJUF9DT05UUk9MLAotCQkJ R1JQSF9TVVJGQUNFX1VQREFURV9JTU1FRElBVEVfRU4sIDAsCi0JCQlHUlBIX1NVUkZBQ0VfVVBE QVRFX0hfUkVUUkFDRV9FTiwgMCk7Ci0JfQorCVJFR19VUERBVEUoR1JQSF9VUERBVEUsIEdSUEhf VVBEQVRFX0xPQ0ssIDEpOworCisJUkVHX1VQREFURV8yKAorCQlHUlBIX0ZMSVBfQ09OVFJPTCwK KwkJR1JQSF9TVVJGQUNFX1VQREFURV9JTU1FRElBVEVfRU4sIDAsCisJCUdSUEhfU1VSRkFDRV9V UERBVEVfSF9SRVRSQUNFX0VOLCBmbGlwX2ltbWVkaWF0ZSA/IDEgOiAwKTsKIAogCXN3aXRjaCAo YWRkcmVzcy0+dHlwZSkgewogCWNhc2UgUExOX0FERFJfVFlQRV9HUkFQSElDUzoKQEAgLTY0NSw4 ICs2MzksOCBAQCBzdGF0aWMgYm9vbCBkY2VfbWlfcHJvZ3JhbV9zdXJmYWNlX2ZsaXBfYW5kX2Fk ZHIoCiAJCXByb2dyYW1fcHJpX2FkZHIoZGNlX21pLCBhZGRyZXNzLT5ncnBoLmFkZHIpOwogCQli cmVhazsKIAljYXNlIFBMTl9BRERSX1RZUEVfR1JQSF9TVEVSRU86Ci0JCWlmIChhZGRyZXNzLT5n cnBoX3N0ZXJlby5sZWZ0X2FkZHIucXVhZF9wYXJ0ID09IDAKLQkJCXx8IGFkZHJlc3MtPmdycGhf c3RlcmVvLnJpZ2h0X2FkZHIucXVhZF9wYXJ0ID09IDApCisJCWlmIChhZGRyZXNzLT5ncnBoX3N0 ZXJlby5sZWZ0X2FkZHIucXVhZF9wYXJ0ID09IDAgfHwKKwkJICAgIGFkZHJlc3MtPmdycGhfc3Rl cmVvLnJpZ2h0X2FkZHIucXVhZF9wYXJ0ID09IDApCiAJCQlicmVhazsKIAkJcHJvZ3JhbV9wcmlf YWRkcihkY2VfbWksIGFkZHJlc3MtPmdycGhfc3RlcmVvLmxlZnRfYWRkcik7CiAJCXByb2dyYW1f c2VjX2FkZHIoZGNlX21pLCBhZGRyZXNzLT5ncnBoX3N0ZXJlby5yaWdodF9hZGRyKTsKQEAgLTY2 Miw4ICs2NTYsNyBAQCBzdGF0aWMgYm9vbCBkY2VfbWlfcHJvZ3JhbV9zdXJmYWNlX2ZsaXBfYW5k X2FkZHIoCiAJaWYgKGZsaXBfaW1tZWRpYXRlKQogCQltZW1faW5wdXQtPmN1cnJlbnRfYWRkcmVz cyA9ICphZGRyZXNzOwogCi0JUkVHX1VQREFURShHUlBIX1VQREFURSwKLQkJCUdSUEhfVVBEQVRF X0xPQ0ssIDApOworCVJFR19VUERBVEUoR1JQSF9VUERBVEUsIEdSUEhfVVBEQVRFX0xPQ0ssIDAp OwogCiAJcmV0dXJuIHRydWU7CiB9Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vYW1kLWdmeAo=