From nobody Tue Apr 7 11:14:49 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E813D36AB5E for ; Fri, 13 Mar 2026 09:57:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773395828; cv=none; b=pYnzQTWOgfUohejTylklvjLTgBBtqMp6HgqKsyCv6lp4D4j9nfHwgAR3+4i3Ppz+ytaL9n2GImVyr4IMgrOWxHG3QrRwlSdX1qVTWaM3060eWdR9gEFO0Jy33D22rE/LeJvzsWQhmJp4LiDbpQ6uSjenaAbYfv+HwDAZ7E5j4M4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773395828; c=relaxed/simple; bh=oRkOP7dzdb8gYLs9PmrI7X6Kwn8xFQTWyx/CBJ+1Mts=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Img+9LX3+iZ6cPmUV2F+2c0KIWkCKhH+KjZIFPysxDeo2echK+ce5ASHGh9iNdRo3C9MMcufGGEMGexnJ7WB7+++OwMDeYRFWodoZeDgpXoEcWzD7fY0F7kG8dFhIUiUDzP1FhP7uMzfaB62guy5y5clOOSgUED7oefz5h9x9VY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a/UtCAsU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a/UtCAsU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 433F0C2BC86; Fri, 13 Mar 2026 09:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773395827; bh=oRkOP7dzdb8gYLs9PmrI7X6Kwn8xFQTWyx/CBJ+1Mts=; h=From:To:Cc:Subject:Date:From; b=a/UtCAsUe9b430je15Jr+au3UEJ72Cop5WiAiZio+MqqfAqVeq3R4RVCsY7I9H+B8 eG8lTi5vtAwOFG8JbYKoyl1YvJEaxg2nQrHwIA+EjVU/UnRLqxs7tSnL84WbNnETv3 dj/oFxzaUOJP0/BiK/W+IgT8Z8+7DpnOvnYfIEOXz7687FfIIRHrgcjNB6LL4rWXYL Ksl7hHCAmIjUg3wDhoyy1oPTpwbs+x0WLxvULKZUISYxEvs8f+7arJgQUp328wAKS9 WTOapWD8tnWT2Nb25UrVTsvYk79AaAVKovApkOR68bgSc0xJr249t7nLXefm1DX2cB JYM53cK3CLoQg== From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [linux-next mismerge] drm/fbdev-emulation: restore drm_fb_helper_gem_is_fb() dummy Date: Fri, 13 Mar 2026 10:56:33 +0100 Message-Id: <20260313095657.4115599-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann linux-next contains an incorrect merge of the drm tree and the amdgpu tree, which have conflicting patches from Thomas Zimmermann: drivers/gpu/drm/amd/amdgpu/amdgpu_display.c: In function 'amdgpu_display_su= spend_helper': drivers/gpu/drm/amd/amdgpu/amdgpu_display.c:1777:22: error: implicit declar= ation of function 'drm_fb_helper_gem_is_fb'; did you mean 'drm_fb_helper_fr= om_client'? [-Wimplicit-function-declaration] 1777 | if (!drm_fb_helper_gem_is_fb(dev->fb_helper, fb->ob= j[0])) { drivers/gpu/drm/radeon/radeon_device.c: In function 'radeon_suspend_kms': drivers/gpu/drm/radeon/radeon_device.c:1592:22: error: implicit declaration= of function 'drm_fb_helper_gem_is_fb'; did you mean 'drm_fb_helper_from_cl= ient'? [-Wimplicit-function-declaration] 1592 | if (!drm_fb_helper_gem_is_fb(dev->fb_helper, fb->ob= j[0])) { | ^~~~~~~~~~~~~~~~~~~~~~~ | drm_fb_helper_from_client The newly added drm_fb_helper_from_client() stub is in fact needed, while a= ll the other stubs are correctly removed. Fixes: 6d438685340d ("drm/fbdev-emulation: Remove empty placeholders") Fixes: 1837c76b780a ("drm/amdgpu: Move test for fbdev GEM object into gener= ic helper") Fixes: 9c63d743d5cc ("Merge branch 'drm-next' of https://gitlab.freedesktop= .org/agd5f/linux.git") Signed-off-by: Arnd Bergmann Reviewed-by: Thomas Zimmermann --- include/drm/drm_fb_helper.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index bf391903443d..80c81fdb04a2 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -273,6 +273,14 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *= fb_helper); int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper); bool drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper, const struct drm_gem_object *obj); +#else +static inline bool +drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper, + const struct drm_gem_object *obj) +{ + return false; +} + #endif =20 #endif --=20 2.39.5