From: Gustavo Sousa <gustavo.sousa@intel.com>
To: Jani Nikula <jani.nikula@intel.com>,
<intel-gfx@lists.freedesktop.org>,
<intel-xe@lists.freedesktop.org>
Cc: <jani.nikula@intel.com>, <lucas.demarchi@intel.com>,
<rodrigo.vivi@intel.com>
Subject: Re: [PATCH 3/5] drm/i915/dmc: split out per-platform firmware path selection
Date: Thu, 18 Apr 2024 16:00:20 -0300 [thread overview]
Message-ID: <171346682004.2007.13295480744360247198@gjsousa-mobl2> (raw)
In-Reply-To: <5e25c5fb8fcb88214b7b21bd42d52ffddf0afa48.1713450693.git.jani.nikula@intel.com>
Quoting Jani Nikula (2024-04-18 11:39:52-03:00)
>The big if ladder clutters intel_dmc_init(). Split it out to a separate
>function.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
>---
> drivers/gpu/drm/i915/display/intel_dmc.c | 96 +++++++++++++-----------
> 1 file changed, 54 insertions(+), 42 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
>index ee5db1aafd50..740c05ce83cc 100644
>--- a/drivers/gpu/drm/i915/display/intel_dmc.c
>+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
>@@ -142,6 +142,59 @@ MODULE_FIRMWARE(SKL_DMC_PATH);
> #define BXT_DMC_MAX_FW_SIZE 0x3000
> MODULE_FIRMWARE(BXT_DMC_PATH);
>
>+static const char *dmc_firmware_default(struct drm_i915_private *i915, u32 *size)
>+{
>+ const char *fw_path = NULL;
>+ u32 max_fw_size = 0;
>+
>+ if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) {
>+ fw_path = XE2LPD_DMC_PATH;
>+ max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
>+ } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) {
>+ fw_path = MTL_DMC_PATH;
>+ max_fw_size = XELPDP_DMC_MAX_FW_SIZE;
>+ } else if (IS_DG2(i915)) {
>+ fw_path = DG2_DMC_PATH;
>+ max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
>+ } else if (IS_ALDERLAKE_P(i915)) {
>+ fw_path = ADLP_DMC_PATH;
>+ max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
>+ } else if (IS_ALDERLAKE_S(i915)) {
>+ fw_path = ADLS_DMC_PATH;
>+ max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>+ } else if (IS_DG1(i915)) {
>+ fw_path = DG1_DMC_PATH;
>+ max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>+ } else if (IS_ROCKETLAKE(i915)) {
>+ fw_path = RKL_DMC_PATH;
>+ max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>+ } else if (IS_TIGERLAKE(i915)) {
>+ fw_path = TGL_DMC_PATH;
>+ max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>+ } else if (DISPLAY_VER(i915) == 11) {
>+ fw_path = ICL_DMC_PATH;
>+ max_fw_size = ICL_DMC_MAX_FW_SIZE;
>+ } else if (IS_GEMINILAKE(i915)) {
>+ fw_path = GLK_DMC_PATH;
>+ max_fw_size = GLK_DMC_MAX_FW_SIZE;
>+ } else if (IS_KABYLAKE(i915) ||
>+ IS_COFFEELAKE(i915) ||
>+ IS_COMETLAKE(i915)) {
>+ fw_path = KBL_DMC_PATH;
>+ max_fw_size = KBL_DMC_MAX_FW_SIZE;
>+ } else if (IS_SKYLAKE(i915)) {
>+ fw_path = SKL_DMC_PATH;
>+ max_fw_size = SKL_DMC_MAX_FW_SIZE;
>+ } else if (IS_BROXTON(i915)) {
>+ fw_path = BXT_DMC_PATH;
>+ max_fw_size = BXT_DMC_MAX_FW_SIZE;
>+ }
>+
>+ *size = max_fw_size;
>+
>+ return fw_path;
>+}
>+
> #define DMC_DEFAULT_FW_OFFSET 0xFFFFFFFF
> #define PACKAGE_MAX_FW_INFO_ENTRIES 20
> #define PACKAGE_V2_MAX_FW_INFO_ENTRIES 32
>@@ -1007,48 +1060,7 @@ void intel_dmc_init(struct drm_i915_private *i915)
>
> INIT_WORK(&dmc->work, dmc_load_work_fn);
>
>- if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) {
>- dmc->fw_path = XE2LPD_DMC_PATH;
>- dmc->max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
>- } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) {
>- dmc->fw_path = MTL_DMC_PATH;
>- dmc->max_fw_size = XELPDP_DMC_MAX_FW_SIZE;
>- } else if (IS_DG2(i915)) {
>- dmc->fw_path = DG2_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
>- } else if (IS_ALDERLAKE_P(i915)) {
>- dmc->fw_path = ADLP_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
>- } else if (IS_ALDERLAKE_S(i915)) {
>- dmc->fw_path = ADLS_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>- } else if (IS_DG1(i915)) {
>- dmc->fw_path = DG1_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>- } else if (IS_ROCKETLAKE(i915)) {
>- dmc->fw_path = RKL_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>- } else if (IS_TIGERLAKE(i915)) {
>- dmc->fw_path = TGL_DMC_PATH;
>- dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;
>- } else if (DISPLAY_VER(i915) == 11) {
>- dmc->fw_path = ICL_DMC_PATH;
>- dmc->max_fw_size = ICL_DMC_MAX_FW_SIZE;
>- } else if (IS_GEMINILAKE(i915)) {
>- dmc->fw_path = GLK_DMC_PATH;
>- dmc->max_fw_size = GLK_DMC_MAX_FW_SIZE;
>- } else if (IS_KABYLAKE(i915) ||
>- IS_COFFEELAKE(i915) ||
>- IS_COMETLAKE(i915)) {
>- dmc->fw_path = KBL_DMC_PATH;
>- dmc->max_fw_size = KBL_DMC_MAX_FW_SIZE;
>- } else if (IS_SKYLAKE(i915)) {
>- dmc->fw_path = SKL_DMC_PATH;
>- dmc->max_fw_size = SKL_DMC_MAX_FW_SIZE;
>- } else if (IS_BROXTON(i915)) {
>- dmc->fw_path = BXT_DMC_PATH;
>- dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
>- }
>+ dmc->fw_path = dmc_firmware_default(i915, &dmc->max_fw_size);
>
> if (i915->params.dmc_firmware_path) {
> if (strlen(i915->params.dmc_firmware_path) == 0) {
>--
>2.39.2
>
next prev parent reply other threads:[~2024-04-18 19:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 14:39 [PATCH 0/5] drm/i915/dmc: firmware path handling changes Jani Nikula
2024-04-18 14:39 ` [PATCH 1/5] drm/i915/dmc: handle request_firmware() errors separately Jani Nikula
2024-04-18 18:30 ` Gustavo Sousa
2024-04-18 19:56 ` Jani Nikula
2024-04-18 19:59 ` Gustavo Sousa
2024-04-18 14:39 ` [PATCH 2/5] drm/i915/dmc: improve firmware parse failure propagation Jani Nikula
2024-04-18 18:53 ` Gustavo Sousa
2024-04-18 20:03 ` Jani Nikula
2024-04-18 20:40 ` Gustavo Sousa
2024-04-18 14:39 ` [PATCH 3/5] drm/i915/dmc: split out per-platform firmware path selection Jani Nikula
2024-04-18 19:00 ` Gustavo Sousa [this message]
2024-04-18 14:39 ` [PATCH 4/5] drm/i915/dmc: change meaning of dmc_firmware_path="" module param Jani Nikula
2024-04-18 19:19 ` Gustavo Sousa
2024-04-18 20:09 ` Jani Nikula
2024-04-18 20:44 ` Gustavo Sousa
2024-04-18 20:49 ` Lucas De Marchi
2024-04-18 14:39 ` [PATCH 5/5] drm/i915/display: move dmc_firmware_path to display params Jani Nikula
2024-04-18 19:43 ` Gustavo Sousa
2024-04-18 16:54 ` ✓ CI.Patch_applied: success for drm/i915/dmc: firmware path handling changes Patchwork
2024-04-18 16:54 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-18 16:55 ` ✓ CI.KUnit: success " Patchwork
2024-04-18 17:15 ` ✓ CI.Build: " Patchwork
2024-04-18 17:17 ` ✓ CI.Hooks: " Patchwork
2024-04-18 17:25 ` ✗ CI.checksparse: warning " Patchwork
2024-04-18 18:01 ` ✓ CI.BAT: success " Patchwork
2024-04-20 8:00 ` ✗ CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=171346682004.2007.13295480744360247198@gjsousa-mobl2 \
--to=gustavo.sousa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox