Re: [Intel-gfx] [PATCH 1/2] drm/i915/dg2: Load DMC

2022-03-23 Thread Tolakanahalli Pradeep, Madhumitha
On Wed, 2022-03-23 at 12:01 -0700, Anusha Srivatsa wrote:
> Add Support to load dmc v2.06
> 
> Cc: Madhumitha Tolakanahalli Pradeep
> 
> Signed-off-by: Anusha Srivatsa 
> ---
>  drivers/gpu/drm/i915/display/intel_dmc.c | 10 +-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> b/drivers/gpu/drm/i915/display/intel_dmc.c
> index a719c0f379ba..462111a15304 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -47,6 +47,10 @@
>  
>  #define DISPLAY_VER12_DMC_MAX_FW_SIZE  ICL_DMC_MAX_FW_SIZE
>  
> +#define DG2_DMC_PATH   DMC_PATH(dg1, 2, 06)
  
   ^^ dg2

> +#define DG2_DMC_VERSION_REQUIRED   DMC_VERSION(2, 6)
> +MODULE_FIRMWARE(DG2_DMC_PATH);
> +
>  #define ADLP_DMC_PATH  DMC_PATH(adlp, 2, 16)
>  #define ADLP_DMC_VERSION_REQUIRED  DMC_VERSION(2, 16)
>  MODULE_FIRMWARE(ADLP_DMC_PATH);
> @@ -681,7 +685,11 @@ void intel_dmc_ucode_init(struct drm_i915_private
> *dev_priv)
>  */
> intel_dmc_runtime_pm_get(dev_priv);
>  
> -   if (IS_ALDERLAKE_P(dev_priv)) {
> +   if (IS_DG2(dev_priv)) {
> +   dmc->fw_path = DG2_DMC_PATH;
> +   dmc->required_version = DG2_DMC_VERSION_REQUIRED;
> +   dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
> +   } else if (IS_ALDERLAKE_P(dev_priv)) {
> dmc->fw_path = ADLP_DMC_PATH;
> dmc->required_version = ADLP_DMC_VERSION_REQUIRED;
> dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;

Teeny error in DMC_PATH, the rest of the patch looks good.

- Madhumitha


[Intel-gfx] [PATCH 1/2] drm/i915/dg2: Load DMC

2022-03-23 Thread Anusha Srivatsa
Add Support to load dmc v2.06

Cc: Madhumitha Tolakanahalli Pradeep 

Signed-off-by: Anusha Srivatsa 
---
 drivers/gpu/drm/i915/display/intel_dmc.c | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c 
b/drivers/gpu/drm/i915/display/intel_dmc.c
index a719c0f379ba..462111a15304 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -47,6 +47,10 @@
 
 #define DISPLAY_VER12_DMC_MAX_FW_SIZE  ICL_DMC_MAX_FW_SIZE
 
+#define DG2_DMC_PATH   DMC_PATH(dg1, 2, 06)
+#define DG2_DMC_VERSION_REQUIRED   DMC_VERSION(2, 6)
+MODULE_FIRMWARE(DG2_DMC_PATH);
+
 #define ADLP_DMC_PATH  DMC_PATH(adlp, 2, 16)
 #define ADLP_DMC_VERSION_REQUIRED  DMC_VERSION(2, 16)
 MODULE_FIRMWARE(ADLP_DMC_PATH);
@@ -681,7 +685,11 @@ void intel_dmc_ucode_init(struct drm_i915_private 
*dev_priv)
 */
intel_dmc_runtime_pm_get(dev_priv);
 
-   if (IS_ALDERLAKE_P(dev_priv)) {
+   if (IS_DG2(dev_priv)) {
+   dmc->fw_path = DG2_DMC_PATH;
+   dmc->required_version = DG2_DMC_VERSION_REQUIRED;
+   dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
+   } else if (IS_ALDERLAKE_P(dev_priv)) {
dmc->fw_path = ADLP_DMC_PATH;
dmc->required_version = ADLP_DMC_VERSION_REQUIRED;
dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;
-- 
2.25.1