From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966273AbdGUB0L (ORCPT ); Thu, 20 Jul 2017 21:26:11 -0400 Received: from ozlabs.org ([103.22.144.67]:55913 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965688AbdGUB0J (ORCPT ); Thu, 20 Jul 2017 21:26:09 -0400 Date: Fri, 21 Jul 2017 11:26:07 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Maarten Lankhorst , Jani Nikula , Mahesh Kumar Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20170721112607.63ac1237@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: 9cc5bb18bd0a ("drm/i915: Fix bad comparison in skl_compute_plane_wm") from the drm-intel-fixes tree and commit: eac2cb81fb87 ("drm/i915: cleanup fixed-point wrappers naming") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_pm.c index 40b224b44d1b,ee2a349cfe68..000000000000 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@@ -4463,11 -4459,11 +4459,11 @@@ static int skl_compute_plane_wm(const s if ((cpp * cstate->base.adjusted_mode.crtc_htotal / 512 < 1) && (plane_bytes_per_line / 512 < 1)) selected_result = method2; - else if ((ddb_allocation && ddb_allocation / - fixed16_to_u32_round_up(plane_blocks_per_line)) >= 1) + else if (ddb_allocation >= - fixed_16_16_to_u32_round_up(plane_blocks_per_line)) - selected_result = min_fixed_16_16(method1, method2); ++ fixed16_to_u32_round_up(plane_blocks_per_line)) + selected_result = min_fixed16(method1, method2); else if (latency >= linetime_us) - selected_result = min_fixed_16_16(method1, method2); + selected_result = min_fixed16(method1, method2); else selected_result = method1; } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Fri, 21 Jul 2017 11:26:07 +1000 Message-ID: <20170721112607.63ac1237@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Jani Nikula , Mahesh Kumar , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0gdHJlZSBnb3QgYSBj b25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwoKYmV0d2VlbiBj b21taXQ6CgogIDljYzViYjE4YmQwYSAoImRybS9pOTE1OiBGaXggYmFkIGNvbXBhcmlzb24gaW4g c2tsX2NvbXB1dGVfcGxhbmVfd20iKQoKZnJvbSB0aGUgZHJtLWludGVsLWZpeGVzIHRyZWUgYW5k IGNvbW1pdDoKCiAgZWFjMmNiODFmYjg3ICgiZHJtL2k5MTU6IGNsZWFudXAgZml4ZWQtcG9pbnQg d3JhcHBlcnMgbmFtaW5nIikKCmZyb20gdGhlIGRybSB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoc2Vl IGJlbG93KSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMgbmVjZXNzYXJ5LiBUaGlzCmlzIG5vdyBm aXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9uIHRyaXZp YWwKY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFp bmVyIHdoZW4geW91ciB0cmVlCmlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxz byB3YW50IHRvIGNvbnNpZGVyIGNvb3BlcmF0aW5nCndpdGggdGhlIG1haW50YWluZXIgb2YgdGhl IGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQpjb21wbGV4IGNv bmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKCmRpZmYgLS1jYyBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDQwYjIyNGI0NGQxYixlZTJhMzQ5Y2ZlNjgu LjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEBAIC00NDYzLDExIC00NDU5LDExICs0 NDU5LDExIEBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHMKICAJCWlm ICgoY3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWwgLyA1MTIgPCAx KSAmJgogIAkJICAgIChwbGFuZV9ieXRlc19wZXJfbGluZSAvIDUxMiA8IDEpKQogIAkJCXNlbGVj dGVkX3Jlc3VsdCA9IG1ldGhvZDI7CiAtCQllbHNlIGlmICgoZGRiX2FsbG9jYXRpb24gJiYgZGRi X2FsbG9jYXRpb24gLwogLQkJCWZpeGVkMTZfdG9fdTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19w ZXJfbGluZSkpID49IDEpCiArCQllbHNlIGlmIChkZGJfYWxsb2NhdGlvbiA+PQotIAkJCSBmaXhl ZF8xNl8xNl90b191MzJfcm91bmRfdXAocGxhbmVfYmxvY2tzX3Blcl9saW5lKSkKLSAJCQlzZWxl Y3RlZF9yZXN1bHQgPSBtaW5fZml4ZWRfMTZfMTYobWV0aG9kMSwgbWV0aG9kMik7CisrCQkJIGZp eGVkMTZfdG9fdTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19wZXJfbGluZSkpCisgCQkJc2VsZWN0 ZWRfcmVzdWx0ID0gbWluX2ZpeGVkMTYobWV0aG9kMSwgbWV0aG9kMik7CiAgCQllbHNlIGlmIChs YXRlbmN5ID49IGxpbmV0aW1lX3VzKQotIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1pbl9maXhlZF8x Nl8xNihtZXRob2QxLCBtZXRob2QyKTsKKyAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtaW5fZml4ZWQx NihtZXRob2QxLCBtZXRob2QyKTsKICAJCWVsc2UKICAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtZXRo b2QxOwogIAl9Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=