radeondrm

commit 732c996dd5f094b93975f516f335910b33ba3dfb
parent b044c60ef7a619afecd61069f5b375d994247144
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Mon, 23 Jan 2023 00:55:20 +0000

rebase off 7.2

- also start adding debug code for backlight management

Diffstat:
M
imac_11_1_radeondrm.diff
 | 
18
++++++++++++++----

1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/imac_11_1_radeondrm.diff b/imac_11_1_radeondrm.diff
@@ -4,8 +4,18 @@ RCS file: /cvs/src/sys/dev/pci/drm/radeon/atombios_encoders.c,v
 retrieving revision 1.17
 diff -u -p -r1.17 atombios_encoders.c
 --- radeon/atombios_encoders.c	24 Feb 2022 12:49:47 -0000	1.17
-+++ radeon/atombios_encoders.c	23 Apr 2022 18:13:00 -0000
-@@ -2187,12 +2187,13 @@ int radeon_atom_pick_dig_encoder(struct 
++++ radeon/atombios_encoders.c	23 Jan 2023 00:24:52 -0000
+@@ -202,6 +202,9 @@ void radeon_atom_backlight_init(struct r
+ 	    !dmi_match(DMI_PRODUCT_NAME, "iMac12,1"))
+ 		return;
+ 
++	if (dmi_match(DMI_PRODUCT_NAME, "iMac11,1"))
++		return;
++
+ 	if (!radeon_encoder->enc_priv)
+ 		return;
+ 
+@@ -2187,12 +2190,13 @@ int radeon_atom_pick_dig_encoder(struct 
  	}
  
  	/*
@@ -30,7 +40,7 @@ RCS file: /cvs/src/sys/dev/pci/drm/radeon/radeon.h,v
 retrieving revision 1.27
 diff -u -p -r1.27 radeon.h
 --- radeon/radeon.h	14 Jan 2022 06:53:15 -0000	1.27
-+++ radeon/radeon.h	23 Apr 2022 18:13:00 -0000
++++ radeon/radeon.h	23 Jan 2023 00:24:52 -0000
 @@ -2711,6 +2711,7 @@ void r100_pll_errata_after_index(struct 
  			    (rdev->family == CHIP_RS740)  ||	\
  			    (rdev->family >= CHIP_R600))
@@ -45,7 +55,7 @@ RCS file: /cvs/src/sys/dev/pci/drm/radeon/radeon_display.c,v
 retrieving revision 1.24
 diff -u -p -r1.24 radeon_display.c
 --- radeon/radeon_display.c	14 Jan 2022 06:53:15 -0000	1.24
-+++ radeon/radeon_display.c	23 Apr 2022 18:10:55 -0000
++++ radeon/radeon_display.c	23 Jan 2023 00:24:52 -0000
 @@ -864,76 +864,66 @@ static bool radeon_setup_enc_conn(struct
  }