From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH 4/5] drm/fb: small cleanup Date: Fri, 6 Mar 2015 16:23:09 -0500 Message-ID: <1425676990-14341-5-git-send-email-robdclark@gmail.com> References: <1425676990-14341-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qc0-f180.google.com (mail-qc0-f180.google.com [209.85.216.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 6029E6E911 for ; Fri, 6 Mar 2015 13:23:27 -0800 (PST) Received: by qcvs11 with SMTP id s11so19766572qcv.6 for ; Fri, 06 Mar 2015 13:23:26 -0800 (PST) In-Reply-To: <1425676990-14341-1-git-send-email-robdclark@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RmxpcCBjb25kaXRpb25hbCB0byByZWR1Y2UgaW5kZW50YXRpb24gbGV2ZWwgb2YgcmVzdCBvZiBm eG4sIGFuZCB1c2UKbWluL21heCB0byBtYWtlIHRoZSBjb2RlIGNsZWFyZXIuCgpTaWduZWQtb2Zm LWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2RybV9mYl9oZWxwZXIuYyB8IDI4ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9m Yl9oZWxwZXIuYwppbmRleCAxZTZhMGM3Li41ZWMzODQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vZHJtX2ZiX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVy LmMKQEAgLTEwMzUsMjIgKzEwMzUsMjQgQEAgc3RhdGljIGludCBkcm1fZmJfaGVscGVyX3Npbmds ZV9mYl9wcm9iZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAogCWZvciAoaSA9IDA7 IGkgPCBmYl9oZWxwZXItPmNydGNfY291bnQ7IGkrKykgewogCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqZGVzaXJlZF9tb2RlOwogCQlpbnQgeCwgeTsKKwogCQlkZXNpcmVkX21vZGUgPSBmYl9o ZWxwZXItPmNydGNfaW5mb1tpXS5kZXNpcmVkX21vZGU7CisKKwkJaWYgKCFkZXNpcmVkX21vZGUp CisJCQljb250aW51ZTsKKworCQljcnRjX2NvdW50Kys7CisKIAkJeCA9IGZiX2hlbHBlci0+Y3J0 Y19pbmZvW2ldLng7CiAJCXkgPSBmYl9oZWxwZXItPmNydGNfaW5mb1tpXS55OwotCQlpZiAoZGVz aXJlZF9tb2RlKSB7Ci0JCQlpZiAoZ2FtbWFfc2l6ZSA9PSAwKQotCQkJCWdhbW1hX3NpemUgPSBm Yl9oZWxwZXItPmNydGNfaW5mb1tpXS5tb2RlX3NldC5jcnRjLT5nYW1tYV9zaXplOwotCQkJaWYg KGRlc2lyZWRfbW9kZS0+aGRpc3BsYXkgKyB4IDwgc2l6ZXMuZmJfd2lkdGgpCi0JCQkJc2l6ZXMu ZmJfd2lkdGggPSBkZXNpcmVkX21vZGUtPmhkaXNwbGF5ICsgeDsKLQkJCWlmIChkZXNpcmVkX21v ZGUtPnZkaXNwbGF5ICsgeSA8IHNpemVzLmZiX2hlaWdodCkKLQkJCQlzaXplcy5mYl9oZWlnaHQg PSBkZXNpcmVkX21vZGUtPnZkaXNwbGF5ICsgeTsKLQkJCWlmIChkZXNpcmVkX21vZGUtPmhkaXNw bGF5ICsgeCA+IHNpemVzLnN1cmZhY2Vfd2lkdGgpCi0JCQkJc2l6ZXMuc3VyZmFjZV93aWR0aCA9 IGRlc2lyZWRfbW9kZS0+aGRpc3BsYXkgKyB4OwotCQkJaWYgKGRlc2lyZWRfbW9kZS0+dmRpc3Bs YXkgKyB5ID4gc2l6ZXMuc3VyZmFjZV9oZWlnaHQpCi0JCQkJc2l6ZXMuc3VyZmFjZV9oZWlnaHQg PSBkZXNpcmVkX21vZGUtPnZkaXNwbGF5ICsgeTsKLQkJCWNydGNfY291bnQrKzsKLQkJfQorCisJ CWlmIChnYW1tYV9zaXplID09IDApCisJCQlnYW1tYV9zaXplID0gZmJfaGVscGVyLT5jcnRjX2lu Zm9baV0ubW9kZV9zZXQuY3J0Yy0+Z2FtbWFfc2l6ZTsKKworCQlzaXplcy5zdXJmYWNlX3dpZHRo ICA9IG1heF90KHUzMiwgZGVzaXJlZF9tb2RlLT5oZGlzcGxheSArIHgsIHNpemVzLnN1cmZhY2Vf d2lkdGgpOworCQlzaXplcy5zdXJmYWNlX2hlaWdodCA9IG1heF90KHUzMiwgZGVzaXJlZF9tb2Rl LT52ZGlzcGxheSArIHksIHNpemVzLnN1cmZhY2Vfd2lkdGgpOworCQlzaXplcy5mYl93aWR0aCAg PSBtaW5fdCh1MzIsIGRlc2lyZWRfbW9kZS0+aGRpc3BsYXkgKyB4LCBzaXplcy5mYl93aWR0aCk7 CisJCXNpemVzLmZiX2hlaWdodCA9IG1pbl90KHUzMiwgZGVzaXJlZF9tb2RlLT52ZGlzcGxheSAr IHksIHNpemVzLmZiX2hlaWdodCk7CiAJfQogCiAJaWYgKGNydGNfY291bnQgPT0gMCB8fCBzaXpl cy5mYl93aWR0aCA9PSAtMSB8fCBzaXplcy5mYl9oZWlnaHQgPT0gLTEpIHsKLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=