From nobody Tue Dec 2 00:03:22 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F37831D74B for ; Tue, 25 Nov 2025 13:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076005; cv=none; b=FCiCuO3onnbOzfngJBnpdjcEo1K/0BaAdRIBsF3G/R1H5GByLtRLy/txBJ+ZQvmDPtuPEoSf8JDGesJD9eB805oqsq5b1rMjE1KzBCTSu39Brj5u32Ae65NWB/NXlK+i8Gd4jH0ZvgM/mUKyMd5Z7fwpgm1XG6Cw9Bk+UQCSxbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076005; c=relaxed/simple; bh=qqnC1liJOOKQo5C9ltxr+p5WOg9RfMNIHzaLkMumSJc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tkmiClDrapdKazO/jlY0vnazKdfDI0kh8NzGL2tn3ARtxjxqhZu6pw3y6pnreRSEzrtxDyGE3/VTo6mBU3y4vrraVAQDV5x39wQPsuw8H9QtcIzDjudY0VBwTkNeTO/k+ukSoRTxY7qb5Ap/3koylobZMeJSvSZ2YR3aiJw4keQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=PvrdcP/4; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=i+WvfWyp; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=PvrdcP/4; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=i+WvfWyp; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="PvrdcP/4"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="i+WvfWyp"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="PvrdcP/4"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="i+WvfWyp" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7A27F5BD0D; Tue, 25 Nov 2025 13:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076001; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0sC2HJYxKCzy96Ro96xgmCeeBmGBvc+kZjWBpAXpVtA=; b=PvrdcP/4RwHsOxcWskpYm/MUChy1s0hRFoPT4nejjtypeWjmXSYHwOcoo0bmin3H3xI/Tn vpxwaGhzYHOII0CB2CwJK3B2inw1VDuBrSxwjq9REU4Q+LkaxqVNaDeyx/xJVLY+aLqZKW CdZtfLF3hlvn3OEvDoPXGoAd2U3tiyY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076001; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0sC2HJYxKCzy96Ro96xgmCeeBmGBvc+kZjWBpAXpVtA=; b=i+WvfWyp3SKoSMBItTJ6aSp4JRw1wrsDO11R/4XTPaonjudptsuLRO1hAnJWs2qvGJQ7/f ktUu20xPNW4RU6Dg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="PvrdcP/4"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=i+WvfWyp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076001; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0sC2HJYxKCzy96Ro96xgmCeeBmGBvc+kZjWBpAXpVtA=; b=PvrdcP/4RwHsOxcWskpYm/MUChy1s0hRFoPT4nejjtypeWjmXSYHwOcoo0bmin3H3xI/Tn vpxwaGhzYHOII0CB2CwJK3B2inw1VDuBrSxwjq9REU4Q+LkaxqVNaDeyx/xJVLY+aLqZKW CdZtfLF3hlvn3OEvDoPXGoAd2U3tiyY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076001; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0sC2HJYxKCzy96Ro96xgmCeeBmGBvc+kZjWBpAXpVtA=; b=i+WvfWyp3SKoSMBItTJ6aSp4JRw1wrsDO11R/4XTPaonjudptsuLRO1hAnJWs2qvGJQ7/f ktUu20xPNW4RU6Dg== Received: from imap1.dmz-prg2.suse.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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id ECAE63EA65; Tue, 25 Nov 2025 13:06:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id +GNcOOCpJWkDFAAAD6G6ig (envelope-from ); Tue, 25 Nov 2025 13:06:40 +0000 From: Thomas Zimmermann To: simona@ffwll.ch, airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, lyude@redhat.com, dakr@kernel.org, deller@gmx.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, jason.wessel@windriver.com, danielt@kernel.org, dianders@chromium.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 1/5] drm/amdgpu: Do not implement mode_set_base_atomic callback Date: Tue, 25 Nov 2025 13:52:13 +0100 Message-ID: <20251125130634.1080966-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125130634.1080966-1-tzimmermann@suse.de> References: <20251125130634.1080966-1-tzimmermann@suse.de> 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 X-Rspamd-Queue-Id: 7A27F5BD0D X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[19]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,amd.com,redhat.com,kernel.org,gmx.de,linux.intel.com,windriver.com,chromium.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_RATELIMIT(0.00)[to_ip_from(RLgosu6qu4h11rje89ht7rjgg5)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Remove all implementations of the CRTC helper mode_set_base_atomic from amdgpu. It pretends to provide mode setting for kdb debugging, but has been broken for some time. Kdb output has been supported only for non-atomic mode setting since commit 9c79e0b1d096 ("drm/fb-helper: Give up on kgdb for atomic drivers") from 2017. While amdgpu provides non-atomic mode setting for some devices, kdb assumes that the GEM buffer object is at a fixed location in video memory. This has not been the case since commit 087451f372bf ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.") from 2021. Fbdev-ttm helpers use a shadow buffer with a movable GEM buffer object. Triggering kdb does not update the display. Hence remove the whole kdb support from amdgpu. Signed-off-by: Thomas Zimmermann Acked-by: Daniel Thompson (RISCstar) --- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 35 ++++++++------------------ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 35 ++++++++------------------ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 ++++++++------------------ 3 files changed, 33 insertions(+), 72 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/a= mdgpu/dce_v10_0.c index 72ca6538b2e4..61302204e9b4 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1838,7 +1838,7 @@ static void dce_v10_0_grph_enable(struct drm_crtc *cr= tc, bool enable) =20 static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct amdgpu_crtc *amdgpu_crtc =3D to_amdgpu_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -1855,15 +1855,12 @@ static int dce_v10_0_crtc_do_set_base(struct drm_cr= tc *crtc, bool bypass_lut =3D false; =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 /* If atomic, assume fb object is pinned & idle & fenced and * just update base pointers @@ -1874,13 +1871,11 @@ static int dce_v10_0_crtc_do_set_base(struct drm_cr= tc *crtc, if (unlikely(r !=3D 0)) return r; =20 - if (!atomic) { - abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; - r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); - if (unlikely(r !=3D 0)) { - amdgpu_bo_unreserve(abo); - return -EINVAL; - } + abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; + r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); + if (unlikely(r !=3D 0)) { + amdgpu_bo_unreserve(abo); + return -EINVAL; } fb_location =3D amdgpu_bo_gpu_offset(abo); =20 @@ -2068,7 +2063,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc= *crtc, /* set pageflip to happen anywhere in vblank interval */ WREG32(mmMASTER_UPDATE_MODE + amdgpu_crtc->crtc_offset, 0); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { abo =3D gem_to_amdgpu_bo(fb->obj[0]); r =3D amdgpu_bo_reserve(abo, true); if (unlikely(r !=3D 0)) @@ -2611,7 +2606,7 @@ static int dce_v10_0_crtc_mode_set(struct drm_crtc *c= rtc, =20 amdgpu_atombios_crtc_set_pll(crtc, adjusted_mode); amdgpu_atombios_crtc_set_dtd_timing(crtc, adjusted_mode); - dce_v10_0_crtc_do_set_base(crtc, old_fb, x, y, 0); + dce_v10_0_crtc_do_set_base(crtc, old_fb, x, y); amdgpu_atombios_crtc_overscan_setup(crtc, mode, adjusted_mode); amdgpu_atombios_crtc_scaler_setup(crtc); dce_v10_0_cursor_reset(crtc); @@ -2659,14 +2654,7 @@ static bool dce_v10_0_crtc_mode_fixup(struct drm_crt= c *crtc, static int dce_v10_0_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - return dce_v10_0_crtc_do_set_base(crtc, old_fb, x, y, 0); -} - -static int dce_v10_0_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - return dce_v10_0_crtc_do_set_base(crtc, fb, x, y, 1); + return dce_v10_0_crtc_do_set_base(crtc, old_fb, x, y); } =20 static const struct drm_crtc_helper_funcs dce_v10_0_crtc_helper_funcs =3D { @@ -2674,7 +2662,6 @@ static const struct drm_crtc_helper_funcs dce_v10_0_c= rtc_helper_funcs =3D { .mode_fixup =3D dce_v10_0_crtc_mode_fixup, .mode_set =3D dce_v10_0_crtc_mode_set, .mode_set_base =3D dce_v10_0_crtc_set_base, - .mode_set_base_atomic =3D dce_v10_0_crtc_set_base_atomic, .prepare =3D dce_v10_0_crtc_prepare, .commit =3D dce_v10_0_crtc_commit, .disable =3D dce_v10_0_crtc_disable, diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/am= dgpu/dce_v6_0.c index acc887a58518..8f4b4c2e36b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -1876,7 +1876,7 @@ static void dce_v6_0_grph_enable(struct drm_crtc *crt= c, bool enable) =20 static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct amdgpu_crtc *amdgpu_crtc =3D to_amdgpu_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -1892,15 +1892,12 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crt= c *crtc, bool bypass_lut =3D false; =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 /* If atomic, assume fb object is pinned & idle & fenced and * just update base pointers @@ -1911,13 +1908,11 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crt= c *crtc, if (unlikely(r !=3D 0)) return r; =20 - if (!atomic) { - abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; - r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); - if (unlikely(r !=3D 0)) { - amdgpu_bo_unreserve(abo); - return -EINVAL; - } + abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; + r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); + if (unlikely(r !=3D 0)) { + amdgpu_bo_unreserve(abo); + return -EINVAL; } fb_location =3D amdgpu_bo_gpu_offset(abo); =20 @@ -2083,7 +2078,7 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc = *crtc, /* set pageflip to happen anywhere in vblank interval */ WREG32(mmMASTER_UPDATE_MODE + amdgpu_crtc->crtc_offset, 0); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { abo =3D gem_to_amdgpu_bo(fb->obj[0]); r =3D amdgpu_bo_reserve(abo, true); if (unlikely(r !=3D 0)) @@ -2578,7 +2573,7 @@ static int dce_v6_0_crtc_mode_set(struct drm_crtc *cr= tc, =20 amdgpu_atombios_crtc_set_pll(crtc, adjusted_mode); amdgpu_atombios_crtc_set_dtd_timing(crtc, adjusted_mode); - dce_v6_0_crtc_do_set_base(crtc, old_fb, x, y, 0); + dce_v6_0_crtc_do_set_base(crtc, old_fb, x, y); amdgpu_atombios_crtc_overscan_setup(crtc, mode, adjusted_mode); amdgpu_atombios_crtc_scaler_setup(crtc); dce_v6_0_cursor_reset(crtc); @@ -2626,14 +2621,7 @@ static bool dce_v6_0_crtc_mode_fixup(struct drm_crtc= *crtc, static int dce_v6_0_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - return dce_v6_0_crtc_do_set_base(crtc, old_fb, x, y, 0); -} - -static int dce_v6_0_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - return dce_v6_0_crtc_do_set_base(crtc, fb, x, y, 1); + return dce_v6_0_crtc_do_set_base(crtc, old_fb, x, y); } =20 static const struct drm_crtc_helper_funcs dce_v6_0_crtc_helper_funcs =3D { @@ -2641,7 +2629,6 @@ static const struct drm_crtc_helper_funcs dce_v6_0_cr= tc_helper_funcs =3D { .mode_fixup =3D dce_v6_0_crtc_mode_fixup, .mode_set =3D dce_v6_0_crtc_mode_set, .mode_set_base =3D dce_v6_0_crtc_set_base, - .mode_set_base_atomic =3D dce_v6_0_crtc_set_base_atomic, .prepare =3D dce_v6_0_crtc_prepare, .commit =3D dce_v6_0_crtc_commit, .disable =3D dce_v6_0_crtc_disable, diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/am= dgpu/dce_v8_0.c index 2ccd6aad8dd6..9d1853c41fcd 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1785,7 +1785,7 @@ static void dce_v8_0_grph_enable(struct drm_crtc *crt= c, bool enable) =20 static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct amdgpu_crtc *amdgpu_crtc =3D to_amdgpu_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -1802,15 +1802,12 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crt= c *crtc, bool bypass_lut =3D false; =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 /* If atomic, assume fb object is pinned & idle & fenced and * just update base pointers @@ -1821,13 +1818,11 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crt= c *crtc, if (unlikely(r !=3D 0)) return r; =20 - if (!atomic) { - abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; - r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); - if (unlikely(r !=3D 0)) { - amdgpu_bo_unreserve(abo); - return -EINVAL; - } + abo->flags |=3D AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS; + r =3D amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM); + if (unlikely(r !=3D 0)) { + amdgpu_bo_unreserve(abo); + return -EINVAL; } fb_location =3D amdgpu_bo_gpu_offset(abo); =20 @@ -1995,7 +1990,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc = *crtc, /* set pageflip to happen anywhere in vblank interval */ WREG32(mmMASTER_UPDATE_MODE + amdgpu_crtc->crtc_offset, 0); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { abo =3D gem_to_amdgpu_bo(fb->obj[0]); r =3D amdgpu_bo_reserve(abo, true); if (unlikely(r !=3D 0)) @@ -2537,7 +2532,7 @@ static int dce_v8_0_crtc_mode_set(struct drm_crtc *cr= tc, =20 amdgpu_atombios_crtc_set_pll(crtc, adjusted_mode); amdgpu_atombios_crtc_set_dtd_timing(crtc, adjusted_mode); - dce_v8_0_crtc_do_set_base(crtc, old_fb, x, y, 0); + dce_v8_0_crtc_do_set_base(crtc, old_fb, x, y); amdgpu_atombios_crtc_overscan_setup(crtc, mode, adjusted_mode); amdgpu_atombios_crtc_scaler_setup(crtc); dce_v8_0_cursor_reset(crtc); @@ -2585,14 +2580,7 @@ static bool dce_v8_0_crtc_mode_fixup(struct drm_crtc= *crtc, static int dce_v8_0_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - return dce_v8_0_crtc_do_set_base(crtc, old_fb, x, y, 0); -} - -static int dce_v8_0_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - return dce_v8_0_crtc_do_set_base(crtc, fb, x, y, 1); + return dce_v8_0_crtc_do_set_base(crtc, old_fb, x, y); } =20 static const struct drm_crtc_helper_funcs dce_v8_0_crtc_helper_funcs =3D { @@ -2600,7 +2588,6 @@ static const struct drm_crtc_helper_funcs dce_v8_0_cr= tc_helper_funcs =3D { .mode_fixup =3D dce_v8_0_crtc_mode_fixup, .mode_set =3D dce_v8_0_crtc_mode_set, .mode_set_base =3D dce_v8_0_crtc_set_base, - .mode_set_base_atomic =3D dce_v8_0_crtc_set_base_atomic, .prepare =3D dce_v8_0_crtc_prepare, .commit =3D dce_v8_0_crtc_commit, .disable =3D dce_v8_0_crtc_disable, --=20 2.51.1 From nobody Tue Dec 2 00:03:22 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 209103242C8 for ; Tue, 25 Nov 2025 13:06:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076010; cv=none; b=Q2Q8HHPnMNJpw/iaaAMHhJv87PD5Ai4OAPrH8Ftc/n3Xa8iVG0w4qNrXxNF5pwJTBEOJacCxzVYDJa9xFqHNJdbbrVrqwMQYjaE5Eb4Rt0TZ1hbmt7rD78OjkDJemsKwt/GI8BUZldDmi02zFJ3yyitRLHuCx92NRT04M3KawRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076010; c=relaxed/simple; bh=yRMOTY47vb15xMWzjsn+Mh0OWZMU1/RIdPqgL1j6+CM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cm2mO1MR19T+DYVbEzqKsvIa95wP0bAEugDSI9FeZUJev6bXLoJcaqRDuHvU9aZw0GXWg4KxsQRmnShN6J8Ak52f/3c7znYqXoE8SDs7aYm1C/UsS0OS3ILJwumDXyLVIyd1028+uuatDscZS9UrOqcgugM91/Cm4rgodMQ8GXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jAdjHSx8; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=yUSvzEys; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jAdjHSx8; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=yUSvzEys; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jAdjHSx8"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="yUSvzEys"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jAdjHSx8"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="yUSvzEys" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0D26222802; Tue, 25 Nov 2025 13:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xo6OrbjBcCILD7HYBy/ieXFNo9FxPgLKVxPTqUByuuw=; b=jAdjHSx8FJhRCyesmVxTlp9e0vNIf57P+zPekc9ykypTuM7ehAsjDddaWqVLB4hk9CM2CD +gfI51GG7yddsagy/o50MrHhz/AlfUqcq7DNW23rAxdE32nJeEmYVEYyPph0QpOGzpIJcH tLKq3344bKDdWjVHGhIsGpiWWd10nho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xo6OrbjBcCILD7HYBy/ieXFNo9FxPgLKVxPTqUByuuw=; b=yUSvzEysnq2n35o7/88DykRHj6/QfjR4pfEKh1uai6vdiRlvOVPd7FapDvf/ngvLlcKni3 vLHqAzr4tXevo8BQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xo6OrbjBcCILD7HYBy/ieXFNo9FxPgLKVxPTqUByuuw=; b=jAdjHSx8FJhRCyesmVxTlp9e0vNIf57P+zPekc9ykypTuM7ehAsjDddaWqVLB4hk9CM2CD +gfI51GG7yddsagy/o50MrHhz/AlfUqcq7DNW23rAxdE32nJeEmYVEYyPph0QpOGzpIJcH tLKq3344bKDdWjVHGhIsGpiWWd10nho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xo6OrbjBcCILD7HYBy/ieXFNo9FxPgLKVxPTqUByuuw=; b=yUSvzEysnq2n35o7/88DykRHj6/QfjR4pfEKh1uai6vdiRlvOVPd7FapDvf/ngvLlcKni3 vLHqAzr4tXevo8BQ== Received: from imap1.dmz-prg2.suse.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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8174A3EA63; Tue, 25 Nov 2025 13:06:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id yIcjHuGpJWkDFAAAD6G6ig (envelope-from ); Tue, 25 Nov 2025 13:06:41 +0000 From: Thomas Zimmermann To: simona@ffwll.ch, airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, lyude@redhat.com, dakr@kernel.org, deller@gmx.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, jason.wessel@windriver.com, danielt@kernel.org, dianders@chromium.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 2/5] drm/nouveau: Do not implement mode_set_base_atomic callback Date: Tue, 25 Nov 2025 13:52:14 +0100 Message-ID: <20251125130634.1080966-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125130634.1080966-1-tzimmermann@suse.de> References: <20251125130634.1080966-1-tzimmermann@suse.de> 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 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[19]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,amd.com,redhat.com,kernel.org,gmx.de,linux.intel.com,windriver.com,chromium.org]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 Content-Type: text/plain; charset="utf-8" Remove the implementation of the CRTC helper mode_set_base_atomic from nouveau. It pretends to provide mode setting for kdb debugging, but has been broken for some time. Kdb output has been supported only for non-atomic mode setting since commit 9c79e0b1d096 ("drm/fb-helper: Give up on kgdb for atomic drivers") from 2017. While nouveau provides non-atomic mode setting for some devices, kdb assumes that the GEM buffer object is at a fixed location in video memory. This has not been the case since commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers") from 2022. Fbdev-ttm helpers use a shadow buffer with a movable GEM buffer object. Triggering kdb does therefore not update the display. Hence remove the whole kdb support from nouveau. Signed-off-by: Thomas Zimmermann Acked-by: Daniel Thompson (RISCstar) Reviewed-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouv= eau/dispnv04/crtc.c index c063756eaea3..80493224eb6c 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -837,7 +837,7 @@ nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g= , u16 *b, static int nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, struct drm_framebuffer *passed_fb, - int x, int y, bool atomic) + int x, int y) { struct nouveau_crtc *nv_crtc =3D nouveau_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -850,19 +850,12 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, NV_DEBUG(drm, "index %d\n", nv_crtc->index); =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { NV_DEBUG(drm, "No FB bound\n"); return 0; } =20 - /* If atomic, we want to switch to the fb we were passed, so - * now we update pointers to do that. - */ - if (atomic) { - drm_fb =3D passed_fb; - } else { - drm_fb =3D crtc->primary->fb; - } + drm_fb =3D crtc->primary->fb; =20 nvbo =3D nouveau_gem_object(drm_fb->obj[0]); nv_crtc->fb.offset =3D nvbo->offset; @@ -920,15 +913,7 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, = int y, int ret =3D nv_crtc_swap_fbs(crtc, old_fb); if (ret) return ret; - return nv04_crtc_do_mode_set_base(crtc, old_fb, x, y, false); -} - -static int -nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true); + return nv04_crtc_do_mode_set_base(crtc, old_fb, x, y); } =20 static void nv04_cursor_upload(struct drm_device *dev, struct nouveau_bo *= src, @@ -1274,7 +1259,6 @@ static const struct drm_crtc_helper_funcs nv04_crtc_h= elper_funcs =3D { .commit =3D nv_crtc_commit, .mode_set =3D nv_crtc_mode_set, .mode_set_base =3D nv04_crtc_mode_set_base, - .mode_set_base_atomic =3D nv04_crtc_mode_set_base_atomic, .disable =3D nv_crtc_disable, .get_scanout_position =3D nouveau_display_scanoutpos, }; --=20 2.51.1 From nobody Tue Dec 2 00:03:22 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C20A3242CD for ; Tue, 25 Nov 2025 13:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076011; cv=none; b=JiiAZg389r4m7n6PZSPd0FbPpsD7lqJENfYNkABWWlQ8Lm7JuTl7y3XchyzC6TpIXXMwHKSHQ3Gx9yB+TeSjltMGQh94YouAdATKSnOduVNhdSf38DTxJtJcuWxkdYrqZEKXKI30+/J8oVXuTX9lNrEkakbgF3k9CVNAwcEFn9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076011; c=relaxed/simple; bh=Xo2yPccsIyILaG1RgyK9CWKln29pNw0gSWOdoivUUj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gi9xoesZJvKcxLgZ0cihZ98S+ps7Z9VA4PHZgh0mwjWlZUKD3u+p4fKuYB1BR2+mcx9yy+TDmnxZLSZCs3NZT33WA9L30op8rKIuMdOrvbVX8jU76flVwb2gFhXNWHtR5yXlV//U3S66m85566R5WS44F+M8gjKAHLh4kuQWwmU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=FGCFp5HQ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=hj+bWIsv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=FGCFp5HQ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=hj+bWIsv; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="FGCFp5HQ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hj+bWIsv"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="FGCFp5HQ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hj+bWIsv" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9569E5BD12; Tue, 25 Nov 2025 13:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+U4vrIbgsgliUNxgUtxijRtJqOxydX2VEPK/MIi84Fo=; b=FGCFp5HQ63OodYpyDIJt2551sLCB1Scd6uNRs6OdqP4fT1OcV2jbLC4iw+IdIsUZr0FxaX 2uHqAjTxai3rSexI1uEscKuVSqD8IaKkRfsE9vHy8KpeA+/6eveo6Ii8Flx69/mkoP68sT B5Zo0HM8KyJi18dQ79nHW/CQOoKd0ro= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+U4vrIbgsgliUNxgUtxijRtJqOxydX2VEPK/MIi84Fo=; b=hj+bWIsv2zq+rBDW+akfq9R91Et4iwN9vh95lhyiecqFlP/NT9NHZU8PZSQBE0V1ZK1NS/ Cl2PxTttZSALhXBg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+U4vrIbgsgliUNxgUtxijRtJqOxydX2VEPK/MIi84Fo=; b=FGCFp5HQ63OodYpyDIJt2551sLCB1Scd6uNRs6OdqP4fT1OcV2jbLC4iw+IdIsUZr0FxaX 2uHqAjTxai3rSexI1uEscKuVSqD8IaKkRfsE9vHy8KpeA+/6eveo6Ii8Flx69/mkoP68sT B5Zo0HM8KyJi18dQ79nHW/CQOoKd0ro= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+U4vrIbgsgliUNxgUtxijRtJqOxydX2VEPK/MIi84Fo=; b=hj+bWIsv2zq+rBDW+akfq9R91Et4iwN9vh95lhyiecqFlP/NT9NHZU8PZSQBE0V1ZK1NS/ Cl2PxTttZSALhXBg== Received: from imap1.dmz-prg2.suse.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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 150173EA65; Tue, 25 Nov 2025 13:06:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id oMS1A+KpJWkDFAAAD6G6ig (envelope-from ); Tue, 25 Nov 2025 13:06:42 +0000 From: Thomas Zimmermann To: simona@ffwll.ch, airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, lyude@redhat.com, dakr@kernel.org, deller@gmx.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, jason.wessel@windriver.com, danielt@kernel.org, dianders@chromium.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 3/5] drm/radeon: Do not implement mode_set_base_atomic callback Date: Tue, 25 Nov 2025 13:52:15 +0100 Message-ID: <20251125130634.1080966-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125130634.1080966-1-tzimmermann@suse.de> References: <20251125130634.1080966-1-tzimmermann@suse.de> 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 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[19]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,amd.com,redhat.com,kernel.org,gmx.de,linux.intel.com,windriver.com,chromium.org]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLq3cifbxyhc6qbbynzfc6amns)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Remove the implementation of the CRTC helper mode_set_base_atomic from radeon. It pretends to provide mode setting for kdb debugging, but has been broken for some time. Kdb output has been supported only for non-atomic mode setting since commit 9c79e0b1d096 ("drm/fb-helper: Give up on kgdb for atomic drivers") from 2017. While radeon provides non-atomic mode setting, kdb assumes that the GEM buffer object is at a fixed location in video memory. This assumption currently blocks radeon from converting to generic fbdev emulation. Fbdev-ttm helpers use a shadow buffer with a movable GEM buffer object. Triggering kdb does therefore not update the display. Another problem is that the current implementation does not handle USB keyboard input. Therefore a serial terminal is required. Then when continuing from the debugger, radeon fails with an error: [7]kdb> go [ 40.345523][ C7] BUG: scheduling while atomic: bash/1580/0x00110003 [...] [ 40.345613][ C7] schedule+0x27/0xd0 [ 40.345615][ C7] schedule_timeout+0x7b/0x100 [ 40.345617][ C7] ? __pfx_process_timeout+0x10/0x10 [ 40.345619][ C7] msleep+0x31/0x50 [ 40.345621][ C7] radeon_crtc_load_lut+0x2e4/0xcb0 [radeon 31c1ee785d= e120fcfd0babcc09babb3770252b4e] [ 40.345698][ C7] radeon_crtc_gamma_set+0xe/0x20 [radeon 31c1ee785de1= 20fcfd0babcc09babb3770252b4e] [ 40.345760][ C7] drm_fb_helper_debug_leave+0xd8/0x130 [ 40.345763][ C7] kgdboc_post_exp_handler+0x54/0x70 [...] and the system hangs. Support for kdb feels pretty much broken. Hence remove the whole kdb support from radeon. Signed-off-by: Thomas Zimmermann Acked-by: Daniel Thompson (RISCstar) --- drivers/gpu/drm/radeon/atombios_crtc.c | 74 ++++++--------------- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 23 ++----- drivers/gpu/drm/radeon/radeon_mode.h | 10 +-- 3 files changed, 26 insertions(+), 81 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeo= n/atombios_crtc.c index 9b3a3a9d60e2..2fc0334e0d6c 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1133,7 +1133,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *cr= tc, struct drm_display_mode =20 static int dce4_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct radeon_crtc *radeon_crtc =3D to_radeon_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -1150,33 +1150,23 @@ static int dce4_crtc_do_set_base(struct drm_crtc *c= rtc, bool bypass_lut =3D false; =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 - /* If atomic, assume fb object is pinned & idle & fenced and - * just update base pointers - */ obj =3D target_fb->obj[0]; rbo =3D gem_to_radeon_bo(obj); r =3D radeon_bo_reserve(rbo, false); if (unlikely(r !=3D 0)) return r; =20 - if (atomic) - fb_location =3D radeon_bo_gpu_offset(rbo); - else { - r =3D radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_location); - if (unlikely(r !=3D 0)) { - radeon_bo_unreserve(rbo); - return -EINVAL; - } + r =3D radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_location); + if (unlikely(r !=3D 0)) { + radeon_bo_unreserve(rbo); + return -EINVAL; } =20 radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL); @@ -1437,7 +1427,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crt= c, /* set pageflip to happen anywhere in vblank interval */ WREG32(EVERGREEN_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 0); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { rbo =3D gem_to_radeon_bo(fb->obj[0]); r =3D radeon_bo_reserve(rbo, false); if (unlikely(r !=3D 0)) @@ -1454,7 +1444,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crt= c, =20 static int avivo_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct radeon_crtc *radeon_crtc =3D to_radeon_crtc(crtc); struct drm_device *dev =3D crtc->dev; @@ -1470,15 +1460,12 @@ static int avivo_crtc_do_set_base(struct drm_crtc *= crtc, bool bypass_lut =3D false; =20 /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 obj =3D target_fb->obj[0]; rbo =3D gem_to_radeon_bo(obj); @@ -1486,17 +1473,10 @@ static int avivo_crtc_do_set_base(struct drm_crtc *= crtc, if (unlikely(r !=3D 0)) return r; =20 - /* If atomic, assume fb object is pinned & idle & fenced and - * just update base pointers - */ - if (atomic) - fb_location =3D radeon_bo_gpu_offset(rbo); - else { - r =3D radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_location); - if (unlikely(r !=3D 0)) { - radeon_bo_unreserve(rbo); - return -EINVAL; - } + r =3D radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_location); + if (unlikely(r !=3D 0)) { + radeon_bo_unreserve(rbo); + return -EINVAL; } radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL); radeon_bo_unreserve(rbo); @@ -1645,7 +1625,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *cr= tc, /* set pageflip to happen only at start of vblank interval (front porch) = */ WREG32(AVIVO_D1MODE_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 3); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { rbo =3D gem_to_radeon_bo(fb->obj[0]); r =3D radeon_bo_reserve(rbo, false); if (unlikely(r !=3D 0)) @@ -1667,26 +1647,11 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, i= nt x, int y, struct radeon_device *rdev =3D dev->dev_private; =20 if (ASIC_IS_DCE4(rdev)) - return dce4_crtc_do_set_base(crtc, old_fb, x, y, 0); - else if (ASIC_IS_AVIVO(rdev)) - return avivo_crtc_do_set_base(crtc, old_fb, x, y, 0); - else - return radeon_crtc_do_set_base(crtc, old_fb, x, y, 0); -} - -int atombios_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - struct drm_device *dev =3D crtc->dev; - struct radeon_device *rdev =3D dev->dev_private; - - if (ASIC_IS_DCE4(rdev)) - return dce4_crtc_do_set_base(crtc, fb, x, y, 1); + return dce4_crtc_do_set_base(crtc, old_fb, x, y); else if (ASIC_IS_AVIVO(rdev)) - return avivo_crtc_do_set_base(crtc, fb, x, y, 1); + return avivo_crtc_do_set_base(crtc, old_fb, x, y); else - return radeon_crtc_do_set_base(crtc, fb, x, y, 1); + return radeon_crtc_do_set_base(crtc, old_fb, x, y); } =20 /* properly set additional regs when using atombios */ @@ -2215,7 +2180,6 @@ static const struct drm_crtc_helper_funcs atombios_he= lper_funcs =3D { .mode_fixup =3D atombios_crtc_mode_fixup, .mode_set =3D atombios_crtc_mode_set, .mode_set_base =3D atombios_crtc_set_base, - .mode_set_base_atomic =3D atombios_crtc_set_base_atomic, .prepare =3D atombios_crtc_prepare, .commit =3D atombios_crtc_commit, .disable =3D atombios_crtc_disable, diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/= radeon/radeon_legacy_crtc.c index 825b351ff53c..a1054c8094d4 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c @@ -360,19 +360,12 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, i= nt mode) int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - return radeon_crtc_do_set_base(crtc, old_fb, x, y, 0); -} - -int radeon_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, enum mode_set_atomic state) -{ - return radeon_crtc_do_set_base(crtc, fb, x, y, 1); + return radeon_crtc_do_set_base(crtc, old_fb, x, y); } =20 int radeon_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic) + int x, int y) { struct drm_device *dev =3D crtc->dev; struct radeon_device *rdev =3D dev->dev_private; @@ -390,15 +383,12 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc, =20 DRM_DEBUG_KMS("\n"); /* no fb bound */ - if (!atomic && !crtc->primary->fb) { + if (!crtc->primary->fb) { DRM_DEBUG_KMS("No FB bound\n"); return 0; } =20 - if (atomic) - target_fb =3D fb; - else - target_fb =3D crtc->primary->fb; + target_fb =3D crtc->primary->fb; =20 switch (target_fb->format->cpp[0] * 8) { case 8: @@ -445,7 +435,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc, * We don't shutdown the display controller because new buffer * will end up in same spot. */ - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { struct radeon_bo *old_rbo; unsigned long nsize, osize; =20 @@ -555,7 +545,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc, WREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset, crtc_offset); WREG32(RADEON_CRTC_PITCH + radeon_crtc->crtc_offset, crtc_pitch); =20 - if (!atomic && fb && fb !=3D crtc->primary->fb) { + if (fb && fb !=3D crtc->primary->fb) { rbo =3D gem_to_radeon_bo(fb->obj[0]); r =3D radeon_bo_reserve(rbo, false); if (unlikely(r !=3D 0)) @@ -1108,7 +1098,6 @@ static const struct drm_crtc_helper_funcs legacy_help= er_funcs =3D { .mode_fixup =3D radeon_crtc_mode_fixup, .mode_set =3D radeon_crtc_mode_set, .mode_set_base =3D radeon_crtc_set_base, - .mode_set_base_atomic =3D radeon_crtc_set_base_atomic, .prepare =3D radeon_crtc_prepare, .commit =3D radeon_crtc_commit, .disable =3D radeon_crtc_disable, diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/= radeon_mode.h index 9e34da2cacef..088af85902f7 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -804,10 +804,6 @@ extern bool radeon_encoder_is_digital(struct drm_encod= er *encoder); extern void radeon_crtc_load_lut(struct drm_crtc *crtc); extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb); -extern int atombios_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, - enum mode_set_atomic state); extern int atombios_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode, @@ -817,13 +813,9 @@ extern void atombios_crtc_dpms(struct drm_crtc *crtc, = int mode); =20 extern int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb); -extern int radeon_crtc_set_base_atomic(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int x, int y, - enum mode_set_atomic state); extern int radeon_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, - int x, int y, int atomic); + int x, int y); extern int radeon_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv, uint32_t handle, --=20 2.51.1 From nobody Tue Dec 2 00:03:22 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC55D324702 for ; Tue, 25 Nov 2025 13:06:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076016; cv=none; b=M7vrFb1fHAJQ9+xp42wz9ZYEddbpm/yr+tbZ6xTF/C5ePUEeCHXvSsm5dl/DU0vITvMaTdDGHaTRPkS1NXBgzu78p/PWVCrsG5xqwi6xR8N/o9Hf5H0FdMbz3t79t873K66Pcw/Yljh2Kn/nkI/cPXx/DddAxxyVITLTmWyHhn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076016; c=relaxed/simple; bh=fhYok5qx/1KgyHLgLGtD3IlpfKjf2Ny2Ac1nNxzrrq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fh3yjHV7rqKEumB7ACDbwudeXAuBNe77ybeuPbD9da7mQTJBDl37aLo+YkcbEuCNdhbzEmgQ5cGz2YIHsqMcrluOliuFwWWhDkLMk/9Qk5KsblypyjQ0A88A7xB2+BPdI6w9pdQ9YLLvENuIdfS5Z1XX1zbwT/PWZxsT5fw+hK4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=SO4GhwQa; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=lHrPBMIh; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=SO4GhwQa; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=lHrPBMIh; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="SO4GhwQa"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="lHrPBMIh"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="SO4GhwQa"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="lHrPBMIh" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 291A222805; Tue, 25 Nov 2025 13:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYYk9pHjgnzOJbsyaUeeXQ7iuT+IrWDkYOQgKfcyCoY=; b=SO4GhwQaYT+nw6VUdYmuRsnm0ZM1sBIlRZE/mfY3xfgMbHbqwHmqGUyOzKVQMC0PTbY4XK akmQQfGZSLStfvBOEg6mXq8k8LVp1etoUJQCVv26al0Z2HDYe6qgp+Z1epnl80thW/WRzD E8/2bVEXy5LvK0pnsNNcIulI81eXmhA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYYk9pHjgnzOJbsyaUeeXQ7iuT+IrWDkYOQgKfcyCoY=; b=lHrPBMIhF7XIHQkpRvn26+YK4oBByrFfckLdR3Jj8N7gQLKGuHVWDtED6ujEGmK8VIyj+C cgwig7dJi3uJ1aAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=SO4GhwQa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=lHrPBMIh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYYk9pHjgnzOJbsyaUeeXQ7iuT+IrWDkYOQgKfcyCoY=; b=SO4GhwQaYT+nw6VUdYmuRsnm0ZM1sBIlRZE/mfY3xfgMbHbqwHmqGUyOzKVQMC0PTbY4XK akmQQfGZSLStfvBOEg6mXq8k8LVp1etoUJQCVv26al0Z2HDYe6qgp+Z1epnl80thW/WRzD E8/2bVEXy5LvK0pnsNNcIulI81eXmhA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kYYk9pHjgnzOJbsyaUeeXQ7iuT+IrWDkYOQgKfcyCoY=; b=lHrPBMIhF7XIHQkpRvn26+YK4oBByrFfckLdR3Jj8N7gQLKGuHVWDtED6ujEGmK8VIyj+C cgwig7dJi3uJ1aAA== Received: from imap1.dmz-prg2.suse.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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9CC4E3EA63; Tue, 25 Nov 2025 13:06:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id YKDVJOKpJWkDFAAAD6G6ig (envelope-from ); Tue, 25 Nov 2025 13:06:42 +0000 From: Thomas Zimmermann To: simona@ffwll.ch, airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, lyude@redhat.com, dakr@kernel.org, deller@gmx.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, jason.wessel@windriver.com, danielt@kernel.org, dianders@chromium.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 4/5] drm/fbdev-helper: Remove drm_fb_helper_debug_enter/_leave() Date: Tue, 25 Nov 2025 13:52:16 +0100 Message-ID: <20251125130634.1080966-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125130634.1080966-1-tzimmermann@suse.de> References: <20251125130634.1080966-1-tzimmermann@suse.de> 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 X-Spam-Level: X-Spam-Flag: NO X-Rspamd-Queue-Id: 291A222805 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[19]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,amd.com,redhat.com,kernel.org,gmx.de,linux.intel.com,windriver.com,chromium.org]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_RATELIMIT(0.00)[to_ip_from(RLgosu6qu4h11rje89ht7rjgg5)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-Spam-Score: -3.01 Content-Type: text/plain; charset="utf-8" Remove the debug_enter/debug_leave helpers, as there are no DRM drivers supporting debugging with kgdb. Remove code to keep track of existing fbdev-emulation state. None of this required any longer. Also remove mode_set_base_atomic from struct drm_crtc_helper_funcs, which has no callers or implementations. Signed-off-by: Thomas Zimmermann Acked-by: Daniel Thompson (RISCstar) --- drivers/gpu/drm/drm_fb_helper.c | 108 ----------------------- include/drm/drm_fb_helper.h | 21 ----- include/drm/drm_modeset_helper_vtables.h | 23 ----- 3 files changed, 152 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helpe= r.c index 4a7f72044ab8..29c3c7bb7d67 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -75,9 +75,6 @@ MODULE_PARM_DESC(drm_leak_fbdev_smem, "Allow unsafe leaking fbdev physical smem address [default=3Dfalse]"); #endif =20 -static LIST_HEAD(kernel_fb_helper_list); -static DEFINE_MUTEX(kernel_fb_helper_lock); - /** * DOC: fbdev helpers * @@ -115,101 +112,6 @@ static DEFINE_MUTEX(kernel_fb_helper_lock); * mmap page writes. */ =20 -static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc) -{ - uint16_t *r_base, *g_base, *b_base; - - if (crtc->funcs->gamma_set =3D=3D NULL) - return; - - r_base =3D crtc->gamma_store; - g_base =3D r_base + crtc->gamma_size; - b_base =3D g_base + crtc->gamma_size; - - crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, - crtc->gamma_size, NULL); -} - -/** - * drm_fb_helper_debug_enter - implementation for &fb_ops.fb_debug_enter - * @info: fbdev registered by the helper - */ -int drm_fb_helper_debug_enter(struct fb_info *info) -{ - struct drm_fb_helper *helper =3D info->par; - const struct drm_crtc_helper_funcs *funcs; - struct drm_mode_set *mode_set; - - list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) { - mutex_lock(&helper->client.modeset_mutex); - drm_client_for_each_modeset(mode_set, &helper->client) { - if (!mode_set->crtc->enabled) - continue; - - funcs =3D mode_set->crtc->helper_private; - if (funcs->mode_set_base_atomic =3D=3D NULL) - continue; - - if (drm_drv_uses_atomic_modeset(mode_set->crtc->dev)) - continue; - - funcs->mode_set_base_atomic(mode_set->crtc, - mode_set->fb, - mode_set->x, - mode_set->y, - ENTER_ATOMIC_MODE_SET); - } - mutex_unlock(&helper->client.modeset_mutex); - } - - return 0; -} -EXPORT_SYMBOL(drm_fb_helper_debug_enter); - -/** - * drm_fb_helper_debug_leave - implementation for &fb_ops.fb_debug_leave - * @info: fbdev registered by the helper - */ -int drm_fb_helper_debug_leave(struct fb_info *info) -{ - struct drm_fb_helper *helper =3D info->par; - struct drm_client_dev *client =3D &helper->client; - struct drm_device *dev =3D helper->dev; - struct drm_crtc *crtc; - const struct drm_crtc_helper_funcs *funcs; - struct drm_mode_set *mode_set; - struct drm_framebuffer *fb; - - mutex_lock(&client->modeset_mutex); - drm_client_for_each_modeset(mode_set, client) { - crtc =3D mode_set->crtc; - if (drm_drv_uses_atomic_modeset(crtc->dev)) - continue; - - funcs =3D crtc->helper_private; - fb =3D crtc->primary->fb; - - if (!crtc->enabled) - continue; - - if (!fb) { - drm_err(dev, "no fb to restore?\n"); - continue; - } - - if (funcs->mode_set_base_atomic =3D=3D NULL) - continue; - - drm_fb_helper_restore_lut_atomic(mode_set->crtc); - funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x, - crtc->y, LEAVE_ATOMIC_MODE_SET); - } - mutex_unlock(&client->modeset_mutex); - - return 0; -} -EXPORT_SYMBOL(drm_fb_helper_debug_leave); - static int __drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helpe= r, bool force) @@ -397,7 +299,6 @@ void drm_fb_helper_prepare(struct drm_device *dev, stru= ct drm_fb_helper *helper, if (!preferred_bpp) preferred_bpp =3D 32; =20 - INIT_LIST_HEAD(&helper->kernel_fb_list); spin_lock_init(&helper->damage_lock); INIT_WORK(&helper->resume_work, drm_fb_helper_resume_worker); INIT_WORK(&helper->damage_work, drm_fb_helper_damage_work); @@ -534,11 +435,6 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helpe= r) =20 drm_fb_helper_release_info(fb_helper); =20 - mutex_lock(&kernel_fb_helper_lock); - if (!list_empty(&fb_helper->kernel_fb_list)) - list_del(&fb_helper->kernel_fb_list); - mutex_unlock(&kernel_fb_helper_lock); - if (!fb_helper->client.funcs) drm_client_release(&fb_helper->client); } @@ -1766,10 +1662,6 @@ __drm_fb_helper_initial_config_and_unlock(struct drm= _fb_helper *fb_helper) drm_info(dev, "fb%d: %s frame buffer device\n", info->node, info->fix.id); =20 - mutex_lock(&kernel_fb_helper_lock); - list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list); - mutex_unlock(&kernel_fb_helper_lock); - return 0; =20 err_drm_fb_helper_release_info: diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index dd9a18f8de5a..05cca77b7249 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -166,13 +166,6 @@ struct drm_fb_helper { */ struct mutex lock; =20 - /** - * @kernel_fb_list: - * - * Entry on the global kernel_fb_helper_list, used for kgdb entry/exit. - */ - struct list_head kernel_fb_list; - /** * @delayed_hotplug: * @@ -236,8 +229,6 @@ drm_fb_helper_from_client(struct drm_client_dev *client) .fb_setcmap =3D drm_fb_helper_setcmap, \ .fb_blank =3D drm_fb_helper_blank, \ .fb_pan_display =3D drm_fb_helper_pan_display, \ - .fb_debug_enter =3D drm_fb_helper_debug_enter, \ - .fb_debug_leave =3D drm_fb_helper_debug_leave, \ .fb_ioctl =3D drm_fb_helper_ioctl =20 #ifdef CONFIG_DRM_FBDEV_EMULATION @@ -280,8 +271,6 @@ int drm_fb_helper_ioctl(struct fb_info *info, unsigned = int cmd, =20 int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper); int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper); -int drm_fb_helper_debug_enter(struct fb_info *info); -int drm_fb_helper_debug_leave(struct fb_info *info); #else static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, @@ -387,16 +376,6 @@ static inline int drm_fb_helper_initial_config(struct = drm_fb_helper *fb_helper) { return 0; } - -static inline int drm_fb_helper_debug_enter(struct fb_info *info) -{ - return 0; -} - -static inline int drm_fb_helper_debug_leave(struct fb_info *info) -{ - return 0; -} #endif =20 #endif diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_mod= eset_helper_vtables.h index fe32854b7ffe..3e68213958dd 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -52,11 +52,6 @@ struct drm_scanout_buffer; struct drm_writeback_connector; struct drm_writeback_job; =20 -enum mode_set_atomic { - LEAVE_ATOMIC_MODE_SET, - ENTER_ATOMIC_MODE_SET, -}; - /** * struct drm_crtc_helper_funcs - helper operations for CRTCs * @@ -253,24 +248,6 @@ struct drm_crtc_helper_funcs { int (*mode_set_base)(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb); =20 - /** - * @mode_set_base_atomic: - * - * This callback is used by the fbdev helpers to set a new framebuffer - * and scanout without sleeping, i.e. from an atomic calling context. It - * is only used to implement kgdb support. - * - * This callback is optional and only needed for kgdb support in the fbdev - * helpers. - * - * RETURNS: - * - * 0 on success or a negative error code on failure. - */ - int (*mode_set_base_atomic)(struct drm_crtc *crtc, - struct drm_framebuffer *fb, int x, int y, - enum mode_set_atomic); - /** * @disable: * --=20 2.51.1 From nobody Tue Dec 2 00:03:22 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C47D4324709 for ; Tue, 25 Nov 2025 13:06:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076018; cv=none; b=kwt5SKwfQvvyLg17TyqwWSVVVgI67rmTZ7DAOjs1ll8zsYTgwSE446WtG6pC0oCVIrD9T1Fhc3LJs9a9MDEGpukG0OSz87VKrv/6wiHH4Jx4m3SuR/CEQ7tIIpbbov/L5ATFZj2OY/u+voo4qzJFcYlsf44Jl/eFiKtLlBh7tS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764076018; c=relaxed/simple; bh=4zSfbctcQ5ur6VKoGH92xMgDFjVBhISdb6kx0iH9rKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e0KLNOykkrZdqE2k9+F5rNtjcrcHzxqb+BM7aXV85psaWDaazPHY7CblDT9oEqGR/xtM1OFpWtn+/6Rz3VRwTvndgbIPOTNoijuBFNU2Rs7gdNtOjZpbLdSexxgrzPnXS9zU/lOi9VDlzr+T2QXEXXSNPzc+5wwP5JILllMuPtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=qNzN4Noz; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=B9H8Zq0m; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=qNzN4Noz; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=B9H8Zq0m; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="qNzN4Noz"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="B9H8Zq0m"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="qNzN4Noz"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="B9H8Zq0m" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BBBEB5BD82; Tue, 25 Nov 2025 13:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgLD8DsaagC7UeXGC8JVSdO0+73pCjrNj616EWect5k=; b=qNzN4NozQ48J/X/RGWafXBsH3FZCXYhtd9Wcqzt1u5FWKN52GDI1EoR3pxSuCW094TeXtY g99guH1xVpriDikcpR+TBOe2s9JXIhLAh6le/NpF8dRx2LYrogZ7eNNkZOWaxKUw/vguOY mNXcfN7S7In/Ucj5mu8A1xUMiwN6aNM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgLD8DsaagC7UeXGC8JVSdO0+73pCjrNj616EWect5k=; b=B9H8Zq0miuo0RFANZ6NN+/eePEWVWH7dy+haPXL3Aaic+KZMpzf9JXje/yjo52BuoMWXs/ S2jFzif/dstS69DA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=qNzN4Noz; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=B9H8Zq0m DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgLD8DsaagC7UeXGC8JVSdO0+73pCjrNj616EWect5k=; b=qNzN4NozQ48J/X/RGWafXBsH3FZCXYhtd9Wcqzt1u5FWKN52GDI1EoR3pxSuCW094TeXtY g99guH1xVpriDikcpR+TBOe2s9JXIhLAh6le/NpF8dRx2LYrogZ7eNNkZOWaxKUw/vguOY mNXcfN7S7In/Ucj5mu8A1xUMiwN6aNM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764076003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgLD8DsaagC7UeXGC8JVSdO0+73pCjrNj616EWect5k=; b=B9H8Zq0miuo0RFANZ6NN+/eePEWVWH7dy+haPXL3Aaic+KZMpzf9JXje/yjo52BuoMWXs/ S2jFzif/dstS69DA== Received: from imap1.dmz-prg2.suse.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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3044F3EA65; Tue, 25 Nov 2025 13:06:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id MOiWCuOpJWkDFAAAD6G6ig (envelope-from ); Tue, 25 Nov 2025 13:06:43 +0000 From: Thomas Zimmermann To: simona@ffwll.ch, airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, lyude@redhat.com, dakr@kernel.org, deller@gmx.de, mripard@kernel.org, maarten.lankhorst@linux.intel.com, jason.wessel@windriver.com, danielt@kernel.org, dianders@chromium.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 5/5] fbcon: Remove fb_debug_enter/_leave from struct fb_ops Date: Tue, 25 Nov 2025 13:52:17 +0100 Message-ID: <20251125130634.1080966-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125130634.1080966-1-tzimmermann@suse.de> References: <20251125130634.1080966-1-tzimmermann@suse.de> 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 X-Rspamd-Queue-Id: BBBEB5BD82 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[19]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,amd.com,redhat.com,kernel.org,gmx.de,linux.intel.com,windriver.com,chromium.org]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_RATELIMIT(0.00)[to_ip_from(RLgosu6qu4h11rje89ht7rjgg5)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" There are no implementations of fb_debug_enter and fb_debug_leave. Remove the callbacks from struct fb_ops and clean up the caller. The field save_graphics in fbcon_par is also no longer required. Remove it as well. Signed-off-by: Thomas Zimmermann Acked-by: Daniel Thompson (RISCstar) --- Documentation/process/debugging/kgdb.rst | 28 ------------------------ drivers/video/fbdev/core/fbcon.c | 24 -------------------- drivers/video/fbdev/core/fbcon.h | 1 - include/linux/fb.h | 4 ---- 4 files changed, 57 deletions(-) diff --git a/Documentation/process/debugging/kgdb.rst b/Documentation/proce= ss/debugging/kgdb.rst index b29b0aac2717..773b19aa1382 100644 --- a/Documentation/process/debugging/kgdb.rst +++ b/Documentation/process/debugging/kgdb.rst @@ -889,34 +889,6 @@ in the virtual console layer. On resuming kernel execu= tion, the kernel debugger calls kgdboc_post_exp_handler() which in turn calls con_debug_leave(). =20 -Any video driver that wants to be compatible with the kernel debugger -and the atomic kms callbacks must implement the ``mode_set_base_atomic``, -``fb_debug_enter`` and ``fb_debug_leave operations``. For the -``fb_debug_enter`` and ``fb_debug_leave`` the option exists to use the -generic drm fb helper functions or implement something custom for the -hardware. The following example shows the initialization of the -.mode_set_base_atomic operation in -drivers/gpu/drm/i915/intel_display.c:: - - - static const struct drm_crtc_helper_funcs intel_helper_funcs =3D { - [...] - .mode_set_base_atomic =3D intel_pipe_set_base_atomic, - [...] - }; - - -Here is an example of how the i915 driver initializes the -fb_debug_enter and fb_debug_leave functions to use the generic drm -helpers in ``drivers/gpu/drm/i915/intel_fb.c``:: - - - static struct fb_ops intelfb_ops =3D { - [...] - .fb_debug_enter =3D drm_fb_helper_debug_enter, - .fb_debug_leave =3D drm_fb_helper_debug_leave, - [...] - }; =20 =20 Credits diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 7be9e865325d..34ea14412ace 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2289,28 +2289,6 @@ static bool fbcon_blank(struct vc_data *vc, enum ves= a_blank_mode blank, return false; } =20 -static void fbcon_debug_enter(struct vc_data *vc) -{ - struct fb_info *info =3D fbcon_info_from_console(vc->vc_num); - struct fbcon_par *par =3D info->fbcon_par; - - par->save_graphics =3D par->graphics; - par->graphics =3D 0; - if (info->fbops->fb_debug_enter) - info->fbops->fb_debug_enter(info); - fbcon_set_palette(vc, color_table); -} - -static void fbcon_debug_leave(struct vc_data *vc) -{ - struct fb_info *info =3D fbcon_info_from_console(vc->vc_num); - struct fbcon_par *par =3D info->fbcon_par; - - par->graphics =3D par->save_graphics; - if (info->fbops->fb_debug_leave) - info->fbops->fb_debug_leave(info); -} - static int fbcon_get_font(struct vc_data *vc, struct console_font *font, u= nsigned int vpitch) { u8 *fontdata =3D vc->vc_font.data; @@ -3214,8 +3192,6 @@ static const struct consw fb_con =3D { .con_set_palette =3D fbcon_set_palette, .con_invert_region =3D fbcon_invert_region, .con_resize =3D fbcon_resize, - .con_debug_enter =3D fbcon_debug_enter, - .con_debug_leave =3D fbcon_debug_leave, }; =20 static ssize_t rotate_store(struct device *device, diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fb= con.h index 44ea4ae4bba0..1cd10a7faab0 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -79,7 +79,6 @@ struct fbcon_par { int cursor_reset; int blank_state; int graphics; - int save_graphics; /* for debug enter/leave */ bool initialized; int rotate; int cur_rotate; diff --git a/include/linux/fb.h b/include/linux/fb.h index 05cc251035da..65fb70382675 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -304,10 +304,6 @@ struct fb_ops { =20 /* teardown any resources to do with this framebuffer */ void (*fb_destroy)(struct fb_info *info); - - /* called at KDB enter and leave time to prepare the console */ - int (*fb_debug_enter)(struct fb_info *info); - int (*fb_debug_leave)(struct fb_info *info); }; =20 #ifdef CONFIG_FB_TILEBLITTING --=20 2.51.1