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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 098E6C07E99 for ; Mon, 12 Jul 2021 19:23:12 +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 8B8C0610FA for ; Mon, 12 Jul 2021 19:23:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B8C0610FA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=emeril.freedesktop.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C38689CF9; Mon, 12 Jul 2021 19:23:11 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [IPv6:2610:10:20:722:a800:ff:feee:56cf]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A3C8893A7; Mon, 12 Jul 2021 19:23:10 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id 13D6EA8836; Mon, 12 Jul 2021 19:23:10 +0000 (UTC) MIME-Version: 1.0 From: Patchwork To: "John Harrison" Date: Mon, 12 Jul 2021 19:23:10 -0000 Message-ID: <162611779007.23771.14634252887137653538@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20210624070516.21893-1-matthew.brost@intel.com> In-Reply-To: <20210624070516.21893-1-matthew.brost@intel.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBH?= =?utf-8?q?uC_submission_support_=28rev2=29?= 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: , Reply-To: intel-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: GuC submission support (rev2) URL : https://patchwork.freedesktop.org/series/91840/ State : failure == Summary == Applying: drm/i915/guc: Relax CTB response timeout Applying: drm/i915/guc: Improve error message for unsolicited CT response Applying: drm/i915/guc: Increase size of CTB buffers Applying: drm/i915/guc: Add non blocking CTB send function Applying: drm/i915/guc: Add stall timer to non blocking CTB send function Applying: drm/i915/guc: Optimize CTB writes and reads Applying: drm/i915/guc: Module load failure test for CT buffer creation Applying: drm/i915/guc: Add new GuC interface defines and structures Applying: drm/i915/guc: Remove GuC stage descriptor, add lrc descriptor Applying: drm/i915/guc: Add lrc descriptor context lookup array Applying: drm/i915/guc: Implement GuC submission tasklet Applying: drm/i915/guc: Add bypass tasklet submission path to GuC Applying: drm/i915/guc: Implement GuC context operations for new inteface Applying: drm/i915/guc: Insert fence on context when deregistering Applying: drm/i915/guc: Defer context unpin until scheduling is disabled Applying: drm/i915/guc: Disable engine barriers with GuC during unpin Applying: drm/i915/guc: Extend deregistration fence to schedule disable Applying: drm/i915: Disable preempt busywait when using GuC scheduling Applying: drm/i915/guc: Ensure request ordering via completion fences Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_request.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0019 drm/i915/guc: Ensure request ordering via completion fences When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx