Message ID | 20241014142439.40e63852@canb.auug.org.au (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <intel-gfx-bounces@lists.freedesktop.org> 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 4C1E1CFC5E7 for <intel-gfx@archiver.kernel.org>; Mon, 14 Oct 2024 03:24:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC81A10E1C5; Mon, 14 Oct 2024 03:24:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="i52m3GTZ"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id C594510E1C5; Mon, 14 Oct 2024 03:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1728876281; bh=vsCrLNHWS9aX1Ot8mwWPJBHzbluUUToFirZ71fWGFDg=; h=Date:From:To:Cc:Subject:From; b=i52m3GTZPdS/NbEffenH7z35LD1OSo/ryvAKSA1lY6+S5x2uIEx86jNor6ePLYO3m 5muO1kuCKmK8MBqypRqVo0LDSIuSc+KrlOpZmUyXcTKbiSpHEkU7yotF4USrTpLVTf 6Gy/lnI4KFJO2dLJZOEgvTRmpGqwtH8bWuQYDR1Oyp0VVV1dRNbRHEWJgbeyBc+JiI sgRNsmziLITOjjvMLLL4sQVAHay+qlEusidxQmNUf9oKI4iuyiOkTWL91UYef0YQzi wKagNBz0MEFdFib2NkXdc5F4O6uEEQzZTmaucZTqXgzNRgBiZrpUwcTlFkYBF7CGBI fYVP7OkknGkMQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XRjJl5vVQz4x8H; Mon, 14 Oct 2024 14:24:39 +1100 (AEDT) Date: Mon, 14 Oct 2024 14:24:39 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Lucas De Marchi <lucas.demarchi@intel.com>, Thomas =?utf-8?q?Hellstr?= =?utf-8?q?=C3=B6m?= <thomas.hellstrom@linux.intel.com>, Simona Vetter <simona.vetter@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Imre Deak <imre.deak@intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, DRM XE List <intel-xe@lists.freedesktop.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Ville =?utf-8?b?U3ly?= =?utf-8?b?asOkbMOk?= <ville.syrjala@linux.intel.com> Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree Message-ID: <20241014142439.40e63852@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/KeC9M0Dl/+gIMMc_bQsZZ3e"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development <intel-gfx.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/intel-gfx> List-Post: <mailto:intel-gfx@lists.freedesktop.org> List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe> Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org> |
Series |
linux-next: manual merge of the drm-xe tree with the drm-intel tree
|
expand
|
diff --cc drivers/gpu/drm/xe/display/xe_display.c index 957ae763531d,5c6b74c36b60..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c