search

intel-gpu / intel-gpu-i915-backports

Other
94 stars 63 forks source link

Makefile: Add support to update Kconfig.versions with CONFIG_KERNEL_6.* #146

Closed knayana-gse closed 1 year ago

knayana-gse commented 1 year ago

When we do olddefconfig Kconfig.versions will update with kernel version configs, this will be used if we have to support any kernel version related code we need to use this check to control.

Limit KV5.0 kernel version configs to till 20 i.e till KV5.20.

Reported-by: Ashbaugh Ben ben.ashbaugh@intel.com Signed-off-by: Kanaka Raju Nayana kanaka.raju.nayana@intel.com

bashbaug commented 1 year ago

I got a lot farther with this change but it's still not working for me. Now when I go to install the .deb package I built I get:

$ sudo dpkg -i intel-i915-dkms_1.23.8.20.230810.22.6.2.0.34+i1-1_all.deb 
Selecting previously unselected package intel-i915-dkms.
(Reading database ... 498011 files and directories currently installed.)
Preparing to unpack intel-i915-dkms_1.23.8.20.230810.22.6.2.0.34+i1-1_all.deb ...
Unpacking intel-i915-dkms (1.23.8.20.230810.22.6.2.0.34+i1-1) ...
Setting up intel-i915-dkms (1.23.8.20.230810.22.6.2.0.34+i1-1) ...
Loading new intel-i915-dkms-1.23.8.20.230810.22.6.2.0.34 DKMS files...
Building for 6.2.0-37-generic
Building initial module for 6.2.0-37-generic
ERROR: Cannot create report: [Errno 17] File exists: '/var/crash/intel-i915-dkms.0.crash'
Error! Bad return status for module build on kernel: 6.2.0-37-generic (x86_64)
Consult /var/lib/dkms/intel-i915-dkms/1.23.8.20.230810.22.6.2.0.34/build/make.log for more information.
dpkg: error processing package intel-i915-dkms (--install):
 installed intel-i915-dkms package post-installation script subprocess returned error exit status 10
Errors were encountered while processing:
 intel-i915-dkms

If it's helpful, the log file contains:

$ cat /var/lib/dkms/intel-i915-dkms/1.23.8.20.230810.22.6.2.0.34/build/make.log
DKMS make.log for intel-i915-dkms-1.23.8.20.230810.22.6.2.0.34 for kernel 6.2.0-37-generic (x86_64)
Wed Nov 29 11:07:06 AM PST 2023
x86_64-linux-gnu-gcc-11 -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer   -c -o conf.o conf.c
lex -ozconf.lex.c -L zconf.l
yacc -ozconf.tab.c -t -l zconf.y
zconf.y:34.1-7: warning: POSIX Yacc does not support %expect [-Wyacc]
   34 | %expect 32
      | ^~~~~~~
zconf.y:97.1-11: warning: POSIX Yacc does not support %destructor [-Wyacc]
   97 | %destructor {
      | ^~~~~~~~~~~
x86_64-linux-gnu-gcc-11 -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer   -c -o zconf.tab.o zconf.tab.c
x86_64-linux-gnu-gcc-11   conf.o zconf.tab.o   -o conf
#
# configuration written to .config
#
make[5]: 'conf' is up to date.
#
# configuration written to .config
#
Building backport-include/backport/autoconf.h ... done.
Building backport-include/backport/backport_path.h ... done.
warning: the compiler differs from the one used to build the kernel
  The kernel was built by: x86_64-linux-gnu-gcc-11 (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
  You are using:           gcc-11 (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
cat: versions: No such file or directory
cat: versions: No such file or directory
  CC [M]  /var/lib/dkms/intel-i915-dkms/1.23.8.20.230810.22.6.2.0.34/build/compat/main.o
...
/var/lib/dkms/intel-i915-dkms/1.23.8.20.230810.22.6.2.0.34/build/drivers/gpu/drm/i915/display/intel_dp.c: In function ‘intel_dp_mst_hpd_irq’:
/var/lib/dkms/intel-i915-dkms/1.23.8.20.230810.22.6.2.0.34/build/drivers/gpu/drm/i915/display/intel_dp.c:4008:9: error: implicit declaration of function ‘drm_dp_mst_hpd_irq’; did you mean ‘intel_dp_mst_hpd_irq’? [-Werror=implicit-function-declaration]
 4008 |         drm_dp_mst_hpd_irq(&intel_dp->mst_mgr, esi, &handled);
      |         ^~~~~~~~~~~~~~~~~~
      |         intel_dp_mst_hpd_irq
...

Is this because I'm building with a slightly newer kernel - 6.2.0-37?

$ uname -a
Linux bashbaug-newpc 6.2.0-37-generic #38~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Thu Nov  2 18:01:13 UTC 2 x86_64 x86_64 x86_64 GNU/Linux
ayazahma commented 1 year ago

This release was tested on "6.2.0-34", AFIR with 6.2.0-37 there were few api mismatch which requires fix DKMS that will be supported of future release. Please lets on 6.2.0-34.

bashbaug commented 1 year ago

This release was tested on "6.2.0-34", AFIR with 6.2.0-37 there were few api mismatch which requires fix DKMS that will be supported of future release.

Thanks, to close the loop I can confirm that everything builds and works correctly with the 6.2.0-34 kernel. This isn't perfect but it's still much better. Thanks again!