From patchwork Sun Sep 15 21:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 11146157 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6915A76 for ; Sun, 15 Sep 2019 21:18:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C6B02067D for ; Sun, 15 Sep 2019 21:18:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C6B02067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 52B0E6E042; Sun, 15 Sep 2019 21:18:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [IPv6:2a01:7e01::f03c:91ff:fed4:a3b6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 996B56E042 for ; Sun, 15 Sep 2019 21:18:24 +0000 (UTC) Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9buV-0001PF-0w; Sun, 15 Sep 2019 21:18:19 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 412E627415FF; Sun, 15 Sep 2019 22:18:18 +0100 (BST) Date: Sun, 15 Sep 2019 22:18:18 +0100 From: Mark Brown To: Vasily Khoruzhick , Qiang Yu , Christian =?iso-8859-1?q?K=F6nig?= , Chris Wilson , Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20190915211818.GH4352@sirena.co.uk> MIME-Version: 1.0 X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=D/Z/DXNZ/ZVcvc0jLU37vcbECmBAnSYgyR5Gc9IOvzA=; b=LwZp3BUvgprsHm2BIbc+p9Jjs 10cJCpaldCpKGLrnvqE+TW+71VDIrzIoqvk6/y9cWe8lXdt4qGDlsRwm5PbCXm2tZJ5pFb6+MHZnt DrNrJPafofm90sgUHeRxtU9ex9wTdMjxlqQvUd6UB3Ib4327PzCPnqFwHDwSROCe9u2OQ=; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/lima/lima_gem.c between commit: 21670bd78a25001cf8e ("drm/lima: fix lima_gem_wait() return value") from the drm-misc-fixes tree and commit: 52791eeec1d9f4a7e7f ("dma-buf: rename reservation_object to dma_resv") 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. +++ b/drivers/gpu/drm/lima/lima_gem.c @@@ -341,8 -341,8 +341,8 @@@ int lima_gem_wait(struct drm_file *file timeout = drm_timeout_abs_to_jiffies(timeout_ns); - ret = drm_gem_reservation_object_wait(file, handle, write, timeout); + ret = drm_gem_dma_resv_wait(file, handle, write, timeout); - if (ret == 0) + if (ret == -ETIME) ret = timeout ? -ETIMEDOUT : -EBUSY; return ret; diff --cc drivers/gpu/drm/lima/lima_gem.c index b609dc030d6ca,ff3d9acc24fcf..0000000000000 --- a/drivers/gpu/drm/lima/lima_gem.c