| Message ID | 20210724001114.249295-11-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove CNL support | expand |
On Fri, Jul 23, 2021 at 05:10:54PM -0700, Lucas De Marchi wrote: > Remove DMC firmware for CNL. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> We need to remove the binary from linux-firmware.git as well > --- > drivers/gpu/drm/i915/display/intel_dmc.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > index 9895fd957df9..3c3c6cb5c0df 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -70,11 +70,6 @@ MODULE_FIRMWARE(TGL_DMC_PATH); > #define ICL_DMC_MAX_FW_SIZE 0x6000 > MODULE_FIRMWARE(ICL_DMC_PATH); > > -#define CNL_DMC_PATH DMC_PATH(cnl, 1, 07) > -#define CNL_DMC_VERSION_REQUIRED DMC_VERSION(1, 7) > -#define CNL_DMC_MAX_FW_SIZE GLK_DMC_MAX_FW_SIZE > -MODULE_FIRMWARE(CNL_DMC_PATH); > - > #define GLK_DMC_PATH DMC_PATH(glk, 1, 04) > #define GLK_DMC_VERSION_REQUIRED DMC_VERSION(1, 4) > #define GLK_DMC_MAX_FW_SIZE 0x4000 > @@ -718,10 +713,6 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv) > dmc->fw_path = ICL_DMC_PATH; > dmc->required_version = ICL_DMC_VERSION_REQUIRED; > dmc->max_fw_size = ICL_DMC_MAX_FW_SIZE; > - } else if (IS_CANNONLAKE(dev_priv)) { > - dmc->fw_path = CNL_DMC_PATH; > - dmc->required_version = CNL_DMC_VERSION_REQUIRED; > - dmc->max_fw_size = CNL_DMC_MAX_FW_SIZE; > } else if (IS_GEMINILAKE(dev_priv)) { > dmc->fw_path = GLK_DMC_PATH; > dmc->required_version = GLK_DMC_VERSION_REQUIRED; > -- > 2.31.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Jul 23, 2021 at 05:10:54PM -0700, Lucas De Marchi wrote: > Remove DMC firmware for CNL. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dmc.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > index 9895fd957df9..3c3c6cb5c0df 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -70,11 +70,6 @@ MODULE_FIRMWARE(TGL_DMC_PATH); > #define ICL_DMC_MAX_FW_SIZE 0x6000 > MODULE_FIRMWARE(ICL_DMC_PATH); > > -#define CNL_DMC_PATH DMC_PATH(cnl, 1, 07) > -#define CNL_DMC_VERSION_REQUIRED DMC_VERSION(1, 7) > -#define CNL_DMC_MAX_FW_SIZE GLK_DMC_MAX_FW_SIZE > -MODULE_FIRMWARE(CNL_DMC_PATH); > - > #define GLK_DMC_PATH DMC_PATH(glk, 1, 04) > #define GLK_DMC_VERSION_REQUIRED DMC_VERSION(1, 4) > #define GLK_DMC_MAX_FW_SIZE 0x4000 > @@ -718,10 +713,6 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv) > dmc->fw_path = ICL_DMC_PATH; > dmc->required_version = ICL_DMC_VERSION_REQUIRED; > dmc->max_fw_size = ICL_DMC_MAX_FW_SIZE; > - } else if (IS_CANNONLAKE(dev_priv)) { > - dmc->fw_path = CNL_DMC_PATH; > - dmc->required_version = CNL_DMC_VERSION_REQUIRED; > - dmc->max_fw_size = CNL_DMC_MAX_FW_SIZE; > } else if (IS_GEMINILAKE(dev_priv)) { > dmc->fw_path = GLK_DMC_PATH; > dmc->required_version = GLK_DMC_VERSION_REQUIRED; > -- > 2.31.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 9895fd957df9..3c3c6cb5c0df 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -70,11 +70,6 @@ MODULE_FIRMWARE(TGL_DMC_PATH); #define ICL_DMC_MAX_FW_SIZE 0x6000 MODULE_FIRMWARE(ICL_DMC_PATH); -#define CNL_DMC_PATH DMC_PATH(cnl, 1, 07) -#define CNL_DMC_VERSION_REQUIRED DMC_VERSION(1, 7) -#define CNL_DMC_MAX_FW_SIZE GLK_DMC_MAX_FW_SIZE -MODULE_FIRMWARE(CNL_DMC_PATH); - #define GLK_DMC_PATH DMC_PATH(glk, 1, 04) #define GLK_DMC_VERSION_REQUIRED DMC_VERSION(1, 4) #define GLK_DMC_MAX_FW_SIZE 0x4000 @@ -718,10 +713,6 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv) dmc->fw_path = ICL_DMC_PATH; dmc->required_version = ICL_DMC_VERSION_REQUIRED; dmc->max_fw_size = ICL_DMC_MAX_FW_SIZE; - } else if (IS_CANNONLAKE(dev_priv)) { - dmc->fw_path = CNL_DMC_PATH; - dmc->required_version = CNL_DMC_VERSION_REQUIRED; - dmc->max_fw_size = CNL_DMC_MAX_FW_SIZE; } else if (IS_GEMINILAKE(dev_priv)) { dmc->fw_path = GLK_DMC_PATH; dmc->required_version = GLK_DMC_VERSION_REQUIRED;
Remove DMC firmware for CNL. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_dmc.c | 9 --------- 1 file changed, 9 deletions(-)