From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0B392ECAAA1 for ; Tue, 6 Sep 2022 11:57:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D76C110E09E; Tue, 6 Sep 2022 11:57:40 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A147A10E625 for ; Tue, 6 Sep 2022 11:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662465458; x=1694001458; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=yvqQHkR+unaW/DdzKmqlPtInTmoFfL4AKTz1L522+UY=; b=DW6rBRYGbgh6cckFX3bGXfkDMWTH27XwJZqS1nJbd/lN/a04q2Rf/UQC KfCwPXzdlPFV8ZS2xVb/XTg9cEKRDAU7CwFV+FFqdtwPO34bVkzNRBwsQ QU4ZaLE9fAAlTcmz2ZumNDHni03MVntoGeu5Jm5ZX7kWSgpFnDfVejFd6 X+CO5sMEGR9U9PVe67XhqiZPez4VV4zosZ8eFSErqL7ejhIYq0Bgjkr0o lun26AlmVNSDY88VhaOK1X6oDci6QK6W8yKSayPcXA38liRNIS+cnufnk 2yqtNV1qX/94s75n4dV7bM0ekr5wl6ruM0udFpkqa5RiYCYj19W1q7H2n Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10461"; a="358289018" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="358289018" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 04:57:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="675661007" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.191]) by fmsmga008.fm.intel.com with SMTP; 06 Sep 2022 04:57:35 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 06 Sep 2022 14:57:34 +0300 Date: Tue, 6 Sep 2022 14:57:34 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Stanislav Lisovskiy Message-ID: References: <20220906102329.7073-1-stanislav.lisovskiy@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220906102329.7073-1-stanislav.lisovskiy@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix intel_dp_atomic_find_vcpi_slots function X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Sep 06, 2022 at 01:23:29PM +0300, Stanislav Lisovskiy wrote: > drm_dp_atomic_find_vcpi_slots no longer exists and needs > to be used as drm_dp_atomic_find_time_slots. > Also rename the function itself. > > Signed-off-by: Stanislav Lisovskiy > Fixes: 7ae5ab441402 ("Extract drm_dp_atomic_find_vcpi_slots cycle to separate function") The problem only exists in drm-tip. You need to revert the bad merge from rerere-cache and redo it. And please always test build drm-tip after solving merge conflicts! -- Ville Syrjälä Intel