| Message ID | 20221121211815.30950-1-gustavo.sousa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dmc: Update DG2 DMC version to v2.08 | expand |
On Mon, 2022-11-21 at 18:18 -0300, Gustavo Sousa wrote: > Release notes: > > 1. Fixes for Register noclaims and few restore. > > Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> Reviewed-by: Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dmc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c > b/drivers/gpu/drm/i915/display/intel_dmc.c > index 081a4d0083b1..697196368fbb 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -52,8 +52,8 @@ > > #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE > > -#define DG2_DMC_PATH DMC_PATH(dg2, 2, 07) > -#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 07) > +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 08) > +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08) > MODULE_FIRMWARE(DG2_DMC_PATH); > > #define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16)
Hi Gustavo,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Gustavo-Sousa/drm-i915-dmc-Update-DG2-DMC-version-to-v2-08/20221122-052003
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link: https://lore.kernel.org/r/20221121211815.30950-1-gustavo.sousa%40intel.com
patch subject: [Intel-gfx] [PATCH] drm/i915/dmc: Update DG2 DMC version to v2.08
config: x86_64-rhel-8.3-func
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/7c107ead57e4e8679624620064b83a87d88a7073
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Gustavo-Sousa/drm-i915-dmc-Update-DG2-DMC-version-to-v2-08/20221122-052003
git checkout 7c107ead57e4e8679624620064b83a87d88a7073
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/display/intel_dmc.c: In function 'intel_dmc_ucode_init':
>> drivers/gpu/drm/i915/display/intel_dmc.c:56:56: error: invalid digit "8" in octal constant
56 | #define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08)
| ^~
drivers/gpu/drm/i915/display/intel_dmc.c:41:59: note: in definition of macro 'DMC_VERSION'
41 | #define DMC_VERSION(major, minor) ((major) << 16 | (minor))
| ^~~~~
drivers/gpu/drm/i915/display/intel_dmc.c:906:41: note: in expansion of macro 'DG2_DMC_VERSION_REQUIRED'
906 | dmc->required_version = DG2_DMC_VERSION_REQUIRED;
| ^~~~~~~~~~~~~~~~~~~~~~~~
vim +/8 +56 drivers/gpu/drm/i915/display/intel_dmc.c
54
55 #define DG2_DMC_PATH DMC_PATH(dg2, 2, 08)
> 56 #define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08)
57 MODULE_FIRMWARE(DG2_DMC_PATH);
58
Hi Gustavo,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Gustavo-Sousa/drm-i915-dmc-Update-DG2-DMC-version-to-v2-08/20221122-052003
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link: https://lore.kernel.org/r/20221121211815.30950-1-gustavo.sousa%40intel.com
patch subject: [Intel-gfx] [PATCH] drm/i915/dmc: Update DG2 DMC version to v2.08
config: x86_64-randconfig-a001-20221121
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/7c107ead57e4e8679624620064b83a87d88a7073
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Gustavo-Sousa/drm-i915-dmc-Update-DG2-DMC-version-to-v2-08/20221122-052003
git checkout 7c107ead57e4e8679624620064b83a87d88a7073
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_dmc.c:906:27: error: invalid digit '8' in octal constant
dmc->required_version = DG2_DMC_VERSION_REQUIRED;
^
drivers/gpu/drm/i915/display/intel_dmc.c:56:50: note: expanded from macro 'DG2_DMC_VERSION_REQUIRED'
#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08)
^
1 error generated.
vim +/8 +906 drivers/gpu/drm/i915/display/intel_dmc.c
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 877
aa9145c4fa283d drivers/gpu/drm/i915/intel_csr.c Animesh Manna 2015-05-13 878 /**
74ff150d9871e8 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 879 * intel_dmc_ucode_init() - initialize the firmware loading.
f4448375467d94 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-10-28 880 * @dev_priv: i915 drm device.
aa9145c4fa283d drivers/gpu/drm/i915/intel_csr.c Animesh Manna 2015-05-13 881 *
aa9145c4fa283d drivers/gpu/drm/i915/intel_csr.c Animesh Manna 2015-05-13 882 * This function is called at the time of loading the display driver to read
aa9145c4fa283d drivers/gpu/drm/i915/intel_csr.c Animesh Manna 2015-05-13 883 * firmware from a .bin file and copied into a internal memory.
aa9145c4fa283d drivers/gpu/drm/i915/intel_csr.c Animesh Manna 2015-05-13 884 */
74ff150d9871e8 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 885 void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 886 {
6c77055aa674b6 drivers/gpu/drm/i915/display/intel_dmc.c Jani Nikula 2022-08-24 887 struct intel_dmc *dmc = &dev_priv->display.dmc;
8144ac59bdc920 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-10-28 888
6c77055aa674b6 drivers/gpu/drm/i915/display/intel_dmc.c Jani Nikula 2022-08-24 889 INIT_WORK(&dev_priv->display.dmc.work, dmc_load_work_fn);
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 890
ec2b1485a06519 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 891 if (!HAS_DMC(dev_priv))
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 892 return;
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 893
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 894 /*
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 895 * Obtain a runtime pm reference, until DMC is loaded, to avoid entering
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 896 * runtime-suspend.
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 897 *
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 898 * On error, we return with the rpm wakeref held to prevent runtime
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 899 * suspend as runtime suspend *requires* a working DMC for whatever
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 900 * reason.
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 901 */
74ff150d9871e8 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 902 intel_dmc_runtime_pm_get(dev_priv);
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 903
ef83e1198f9f7d drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2022-05-04 904 if (IS_DG2(dev_priv)) {
ef83e1198f9f7d drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2022-05-04 905 dmc->fw_path = DG2_DMC_PATH;
ef83e1198f9f7d drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2022-05-04 @906 dmc->required_version = DG2_DMC_VERSION_REQUIRED;
ef83e1198f9f7d drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2022-05-04 907 dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
ef83e1198f9f7d drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2022-05-04 908 } else if (IS_ALDERLAKE_P(dev_priv)) {
dac0f8ad653a2e drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-06-21 909 dmc->fw_path = ADLP_DMC_PATH;
dac0f8ad653a2e drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-06-21 910 dmc->required_version = ADLP_DMC_VERSION_REQUIRED;
5de6a3de999d0c drivers/gpu/drm/i915/display/intel_dmc.c Madhumitha Tolakanahalli Pradeep 2021-12-16 911 dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
dac0f8ad653a2e drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-06-21 912 } else if (IS_ALDERLAKE_S(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 913 dmc->fw_path = ADLS_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 914 dmc->required_version = ADLS_DMC_VERSION_REQUIRED;
5de6a3de999d0c drivers/gpu/drm/i915/display/intel_dmc.c Madhumitha Tolakanahalli Pradeep 2021-12-16 915 dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
75b81fbbcad264 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-01-29 916 } else if (IS_DG1(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 917 dmc->fw_path = DG1_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 918 dmc->required_version = DG1_DMC_VERSION_REQUIRED;
5de6a3de999d0c drivers/gpu/drm/i915/display/intel_dmc.c Madhumitha Tolakanahalli Pradeep 2021-12-16 919 dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
bb4c3cf81ce821 drivers/gpu/drm/i915/display/intel_csr.c Matt Atwood 2020-10-14 920 } else if (IS_ROCKETLAKE(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 921 dmc->fw_path = RKL_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 922 dmc->required_version = RKL_DMC_VERSION_REQUIRED;
5de6a3de999d0c drivers/gpu/drm/i915/display/intel_dmc.c Madhumitha Tolakanahalli Pradeep 2021-12-16 923 dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
2ff5560e23c863 drivers/gpu/drm/i915/display/intel_dmc.c Lucas De Marchi 2022-02-23 924 } else if (IS_TIGERLAKE(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 925 dmc->fw_path = TGL_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 926 dmc->required_version = TGL_DMC_VERSION_REQUIRED;
5de6a3de999d0c drivers/gpu/drm/i915/display/intel_dmc.c Madhumitha Tolakanahalli Pradeep 2021-12-16 927 dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
93e7e61eb44831 drivers/gpu/drm/i915/display/intel_csr.c Lucas De Marchi 2021-04-12 928 } else if (DISPLAY_VER(dev_priv) == 11) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 929 dmc->fw_path = ICL_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 930 dmc->required_version = ICL_DMC_VERSION_REQUIRED;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 931 dmc->max_fw_size = ICL_DMC_MAX_FW_SIZE;
180e9d230efe7a drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 932 } else if (IS_GEMINILAKE(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 933 dmc->fw_path = GLK_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 934 dmc->required_version = GLK_DMC_VERSION_REQUIRED;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 935 dmc->max_fw_size = GLK_DMC_MAX_FW_SIZE;
5f4ae2704d59ee drivers/gpu/drm/i915/display/intel_csr.c Chris Wilson 2020-06-02 936 } else if (IS_KABYLAKE(dev_priv) ||
5f4ae2704d59ee drivers/gpu/drm/i915/display/intel_csr.c Chris Wilson 2020-06-02 937 IS_COFFEELAKE(dev_priv) ||
5f4ae2704d59ee drivers/gpu/drm/i915/display/intel_csr.c Chris Wilson 2020-06-02 938 IS_COMETLAKE(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 939 dmc->fw_path = KBL_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 940 dmc->required_version = KBL_DMC_VERSION_REQUIRED;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 941 dmc->max_fw_size = KBL_DMC_MAX_FW_SIZE;
180e9d230efe7a drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 942 } else if (IS_SKYLAKE(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 943 dmc->fw_path = SKL_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 944 dmc->required_version = SKL_DMC_VERSION_REQUIRED;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 945 dmc->max_fw_size = SKL_DMC_MAX_FW_SIZE;
180e9d230efe7a drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 946 } else if (IS_BROXTON(dev_priv)) {
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 947 dmc->fw_path = BXT_DMC_PATH;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 948 dmc->required_version = BXT_DMC_VERSION_REQUIRED;
0633cdcbaa77f7 drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 949 dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
180e9d230efe7a drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 950 }
abd41dc93c37ab drivers/gpu/drm/i915/intel_csr.c Damien Lespiau 2015-06-04 951
8a25c4be583d8a drivers/gpu/drm/i915/display/intel_csr.c Jani Nikula 2020-06-18 952 if (dev_priv->params.dmc_firmware_path) {
8a25c4be583d8a drivers/gpu/drm/i915/display/intel_csr.c Jani Nikula 2020-06-18 953 if (strlen(dev_priv->params.dmc_firmware_path) == 0) {
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 954 dmc->fw_path = NULL;
5e04eb0147223c drivers/gpu/drm/i915/intel_csr.c Wambui Karuga 2020-01-09 955 drm_info(&dev_priv->drm,
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 956 "Disabling DMC firmware and runtime PM\n");
e7351a8474d2df drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 957 return;
e7351a8474d2df drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 958 }
e7351a8474d2df drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 959
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 960 dmc->fw_path = dev_priv->params.dmc_firmware_path;
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 961 /* Bypass version check for firmware override. */
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 962 dmc->required_version = 0;
d8a5b7d79fb7de drivers/gpu/drm/i915/intel_csr.c Jani Nikula 2018-09-26 963 }
dc174300540560 drivers/gpu/drm/i915/intel_csr.c Suketu Shah 2015-04-17 964
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 965 if (!dmc->fw_path) {
5e04eb0147223c drivers/gpu/drm/i915/intel_csr.c Wambui Karuga 2020-01-09 966 drm_dbg_kms(&dev_priv->drm,
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 967 "No known DMC firmware for platform, disabling runtime PM\n");
ad3c776b171078 drivers/gpu/drm/i915/intel_csr.c Imre Deak 2018-08-15 968 return;
ad3c776b171078 drivers/gpu/drm/i915/intel_csr.c Imre Deak 2018-08-15 969 }
ad3c776b171078 drivers/gpu/drm/i915/intel_csr.c Imre Deak 2018-08-15 970
c24760cf42c3cc drivers/gpu/drm/i915/display/intel_csr.c Anusha Srivatsa 2021-05-18 971 drm_dbg_kms(&dev_priv->drm, "Loading %s\n", dmc->fw_path);
6c77055aa674b6 drivers/gpu/drm/i915/display/intel_dmc.c Jani Nikula 2022-08-24 972 schedule_work(&dev_priv->display.dmc.work);
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 973 }
eb805623d8b161 drivers/gpu/drm/i915/intel_csr.c Daniel Vetter 2015-05-04 974
On Mon, Nov 21, 2022 at 06:18:15PM -0300, Gustavo Sousa wrote: > Release notes: > > 1. Fixes for Register noclaims and few restore. > > Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> Now that we've removed force_probe from DG2, in general we're past the point where we can just directly update firmware versions like this; if someone has a working system with the current kernel + DMC 2.07 and then they update to a new kernel containing this patch (but without installing DMC 2.08), they'd see a regression. In this case, maybe there's still time to sneak this specific update into -fixes so that it lands in the same kernel release that removes the force_probe protection on DG2? But in general we need to start providing backwards-compatible support for all firmware updates going forward. The GuC/HuC guys just went through an overhaul of their firmware handling to deal with this; we probably need something similar on the DMC side now too, although I suspect DMC should be simpler to deal with since most (all?) DMC firmwares are just drop-in replacements and there's no constantly changing firmware<->driver interface like there is with the GuC. See Documentation/driver-api/firmware/firmware-usage-guidelines.rst for the official rules about firmware usage. Matt > --- > drivers/gpu/drm/i915/display/intel_dmc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > index 081a4d0083b1..697196368fbb 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -52,8 +52,8 @@ > > #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE > > -#define DG2_DMC_PATH DMC_PATH(dg2, 2, 07) > -#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 07) > +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 08) > +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08) > MODULE_FIRMWARE(DG2_DMC_PATH); > > #define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16) > -- > 2.38.1 >
On Tue, Nov 22, 2022 at 12:59:36PM -0800, Matt Roper wrote: > On Mon, Nov 21, 2022 at 06:18:15PM -0300, Gustavo Sousa wrote: > > Release notes: > > > > 1. Fixes for Register noclaims and few restore. > > > > Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> > > Now that we've removed force_probe from DG2, in general we're past the > point where we can just directly update firmware versions like this; if > someone has a working system with the current kernel + DMC 2.07 and then > they update to a new kernel containing this patch (but without > installing DMC 2.08), they'd see a regression. > > In this case, maybe there's still time to sneak this specific update > into -fixes so that it lands in the same kernel release that removes the > force_probe protection on DG2? But in general we need to start > providing backwards-compatible support for all firmware updates going > forward. The GuC/HuC guys just went through an overhaul of their > firmware handling to deal with this; we probably need something similar > on the DMC side now too, although I suspect DMC should be simpler to > deal with since most (all?) DMC firmwares are just drop-in replacements > and there's no constantly changing firmware<->driver interface like > there is with the GuC. > > See Documentation/driver-api/firmware/firmware-usage-guidelines.rst for > the official rules about firmware usage. Matt is right here. But this update is an important fix and I will propagate through the -fixes flow, so we don't need for now to support the 2.07 as fallback. The 6.2 will be released only with the 2.08. But please make sure you add a "Fixes:" tag to this patch. Then please let us know when the fw file got accepted in the linux-firmware.git so we can merge and propagate. Moving forward we will need to support the fallback version like GuC, or even better, remove the versioning from the filename entirely like HuC. > > > Matt > > > --- > > drivers/gpu/drm/i915/display/intel_dmc.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > > index 081a4d0083b1..697196368fbb 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > > @@ -52,8 +52,8 @@ > > > > #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE > > > > -#define DG2_DMC_PATH DMC_PATH(dg2, 2, 07) > > -#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 07) > > +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 08) > > +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08) > > MODULE_FIRMWARE(DG2_DMC_PATH); > > > > #define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16) > > -- > > 2.38.1 > > > > -- > Matt Roper > Graphics Software Engineer > VTT-OSGC Platform Enablement > Intel Corporation
Thank you both for the instructive feedback! :-) -- Gustavo Sousa
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 081a4d0083b1..697196368fbb 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -52,8 +52,8 @@ #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE -#define DG2_DMC_PATH DMC_PATH(dg2, 2, 07) -#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 07) +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 08) +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08) MODULE_FIRMWARE(DG2_DMC_PATH); #define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16)
Release notes: 1. Fixes for Register noclaims and few restore. Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> --- drivers/gpu/drm/i915/display/intel_dmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)