diff mbox series

drm/i915/dmc: Change DMC FW size on ADL-P

Message ID 20211207023718.322349-1-madhumitha.tolakanahalli.pradeep@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/dmc: Change DMC FW size on ADL-P | expand

Commit Message

Tolakanahalli Pradeep, Madhumitha Dec. 7, 2021, 2:37 a.m. UTC
Increase the size of DMC on ADL-P to account for support of
new features in the current/upcoming DMC versions.

Signed-off-by: Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dmc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Lucas De Marchi Dec. 7, 2021, 6:44 a.m. UTC | #1
On Mon, Dec 06, 2021 at 06:37:18PM -0800, Madhumitha Tolakanahalli Pradeep wrote:
>Increase the size of DMC on ADL-P to account for support of
>new features in the current/upcoming DMC versions.

I was trying to find anything related on Bspec 49193 and 49194, but
didn't find anything related to size.

However I see adl-p 2.12 firmware is already above the previous 24kB.
How did we ever loaded DMC? Yes, this is not the file size, but rather
the payload size, but AFAICS the rest should account for less than 1k,
so it doesn't make a real difference.

For this specific change:


Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

thanks
Lucas De Marchi
Tolakanahalli Pradeep, Madhumitha Dec. 8, 2021, 2:54 a.m. UTC | #2
@Lucas Thanks for the R-b.

The BSpec is currently missing size related info, we're working on
getting it added.

Strange indeed that v2.12 was above 24kB.

@Anusha, do you recall any size related issues for v2.12?

- Madhumitha

On Mon, 2021-12-06 at 22:44 -0800, Lucas De Marchi wrote:
> On Mon, Dec 06, 2021 at 06:37:18PM -0800, Madhumitha Tolakanahalli
> Pradeep wrote:
> > Increase the size of DMC on ADL-P to account for support of
> > new features in the current/upcoming DMC versions.
> 
> I was trying to find anything related on Bspec 49193 and 49194, but
> didn't find anything related to size.
> 
> However I see adl-p 2.12 firmware is already above the previous 24kB.
> How did we ever loaded DMC? Yes, this is not the file size, but
> rather
> the payload size, but AFAICS the rest should account for less than
> 1k,
> so it doesn't make a real difference.
> 
> For this specific change:
> 
> 
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
> 
> thanks
> Lucas De Marchi
Srivatsa, Anusha Dec. 8, 2021, 6:28 a.m. UTC | #3
> -----Original Message-----
> From: Tolakanahalli Pradeep, Madhumitha
> <madhumitha.tolakanahalli.pradeep@intel.com>
> Sent: Wednesday, December 8, 2021 8:25 AM
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; De Marchi, Lucas
> <lucas.demarchi@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH] drm/i915/dmc: Change DMC FW size on ADL-
> P
> 
> @Lucas Thanks for the R-b.
> 
> The BSpec is currently missing size related info, we're working on getting it
> added.
> 
> Strange indeed that v2.12 was above 24kB.
> 
> @Anusha, do you recall any size related issues for v2.12?

No. I don’t recall any size related issue for any dmc version till 2.14

Anusha
> - Madhumitha
> 
> On Mon, 2021-12-06 at 22:44 -0800, Lucas De Marchi wrote:
> > On Mon, Dec 06, 2021 at 06:37:18PM -0800, Madhumitha Tolakanahalli
> > Pradeep wrote:
> > > Increase the size of DMC on ADL-P to account for support of new
> > > features in the current/upcoming DMC versions.
> >
> > I was trying to find anything related on Bspec 49193 and 49194, but
> > didn't find anything related to size.
> >
> > However I see adl-p 2.12 firmware is already above the previous 24kB.
> > How did we ever loaded DMC? Yes, this is not the file size, but rather
> > the payload size, but AFAICS the rest should account for less than 1k,
> > so it doesn't make a real difference.
> >
> > For this specific change:
> >
> >
> > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
> >
> > thanks
> > Lucas De Marchi
>
Jani Nikula Dec. 8, 2021, 4:07 p.m. UTC | #4
On Mon, 06 Dec 2021, Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep@intel.com> wrote:
> Increase the size of DMC on ADL-P to account for support of
> new features in the current/upcoming DMC versions.
>
> Signed-off-by: Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dmc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 2dc9d632969d..0cab18f972d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -45,6 +45,8 @@
>  
>  #define GEN12_DMC_MAX_FW_SIZE		ICL_DMC_MAX_FW_SIZE
>  
> +#define GEN13_DMC_MAX_FW_SIZE		0x20000
> +

Side note, we should get rid of these GEN<N> references here.


>  #define ADLP_DMC_PATH			DMC_PATH(adlp, 2, 12)
>  #define ADLP_DMC_VERSION_REQUIRED	DMC_VERSION(2, 12)
>  MODULE_FIRMWARE(ADLP_DMC_PATH);
> @@ -682,7 +684,7 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
>  	if (IS_ALDERLAKE_P(dev_priv)) {
>  		dmc->fw_path = ADLP_DMC_PATH;
>  		dmc->required_version = ADLP_DMC_VERSION_REQUIRED;
> -		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;
> +		dmc->max_fw_size = GEN13_DMC_MAX_FW_SIZE;
>  	} else if (IS_ALDERLAKE_S(dev_priv)) {
>  		dmc->fw_path = ADLS_DMC_PATH;
>  		dmc->required_version = ADLS_DMC_VERSION_REQUIRED;
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 2dc9d632969d..0cab18f972d1 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -45,6 +45,8 @@ 
 
 #define GEN12_DMC_MAX_FW_SIZE		ICL_DMC_MAX_FW_SIZE
 
+#define GEN13_DMC_MAX_FW_SIZE		0x20000
+
 #define ADLP_DMC_PATH			DMC_PATH(adlp, 2, 12)
 #define ADLP_DMC_VERSION_REQUIRED	DMC_VERSION(2, 12)
 MODULE_FIRMWARE(ADLP_DMC_PATH);
@@ -682,7 +684,7 @@  void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
 	if (IS_ALDERLAKE_P(dev_priv)) {
 		dmc->fw_path = ADLP_DMC_PATH;
 		dmc->required_version = ADLP_DMC_VERSION_REQUIRED;
-		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;
+		dmc->max_fw_size = GEN13_DMC_MAX_FW_SIZE;
 	} else if (IS_ALDERLAKE_S(dev_priv)) {
 		dmc->fw_path = ADLS_DMC_PATH;
 		dmc->required_version = ADLS_DMC_VERSION_REQUIRED;