[PATCH RESEND] drm/nouveau/disp: Fix missing backlight control on Macbook 5,1

[PATCH RESEND] drm/nouveau/disp: Fix missing backlight control on Macbook 5,1

[Takashi Iwai]

Macbook 5,1 with MCP79 lost its backlight control since the recent
change for supporting GFP-RM; it rewrote the whole nv50 backlight
control code and each display engine is supposed to have an entry for
IOR bl callback, but it didn't cover mcp77.

This patch adds the missing bl entry initialization for mcp77 display
engine to recover the backlight control.

Fixes: 2274ce7e3681 ("drm/nouveau/disp: add output backlight control methods")
Cc: <stable@vger.kernel.org>
Link: https://bugzilla.suse.com/show_bug.cgi?id=1223838
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

The previous submission seemed fallin in a crack:
  https://lore.kernel.org/all/20240517110853.8481-1-tiwai@suse.de/
so just resending it.

 drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
index 841e3b69fcaf..5a0c9b8a79f3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
@@ -31,6 +31,7 @@ mcp77_sor = {
 	.state = g94_sor_state,
 	.power = nv50_sor_power,
 	.clock = nv50_sor_clock,
+	.bl = &nv50_sor_bl,
 	.hdmi = &g84_sor_hdmi,
 	.dp = &g94_sor_dp,
 };
-- 
2.43.0

Re: [PATCH RESEND] drm/nouveau/disp: Fix missing backlight control on Macbook 5,1

[Danilo Krummrich]

On Thu, Jan 02, 2025 at 12:49:36PM +0100, Takashi Iwai wrote:
> Macbook 5,1 with MCP79 lost its backlight control since the recent
> change for supporting GFP-RM; it rewrote the whole nv50 backlight
> control code and each display engine is supposed to have an entry for
> IOR bl callback, but it didn't cover mcp77.
> 
> This patch adds the missing bl entry initialization for mcp77 display
> engine to recover the backlight control.
> 
> Fixes: 2274ce7e3681 ("drm/nouveau/disp: add output backlight control methods")
> Cc: <stable@vger.kernel.org>
> Link: https://bugzilla.suse.com/show_bug.cgi?id=1223838
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Applied to drm-misc-fixes, thanks!

> ---
> 
> The previous submission seemed fallin in a crack:
>   https://lore.kernel.org/all/20240517110853.8481-1-tiwai@suse.de/
> so just resending it.
> 
>  drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
> index 841e3b69fcaf..5a0c9b8a79f3 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
> @@ -31,6 +31,7 @@ mcp77_sor = {
>  	.state = g94_sor_state,
>  	.power = nv50_sor_power,
>  	.clock = nv50_sor_clock,
> +	.bl = &nv50_sor_bl,
>  	.hdmi = &g84_sor_hdmi,
>  	.dp = &g94_sor_dp,
>  };
> -- 
> 2.43.0
>