diff mbox

[BXT,DMC,PATCHES,1/3] drm/i915/bxt: Path added of dmc firmware ver1 for BXT.

Message ID 1438705963-7514-2-git-send-email-animesh.manna@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Animesh Manna Aug. 4, 2015, 4:32 p.m. UTC
Broxton also has dmc to manage low-power display engine state.
Path of the firmware added in intel_csr.c.

Naming convention followed as <platform>_dmc_<api-version>.bin

v1: Initial version.

v2: Commit description added based on review comment from Sunil.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sunil Kamath <sunil.kamath@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Rodrigo Vivi Aug. 4, 2015, 5:44 p.m. UTC | #1
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>



On Tue, 2015-08-04 at 22:02 +0530, Animesh Manna wrote:
> Broxton also has dmc to manage low-power display engine state.

> Path of the firmware added in intel_csr.c.

> 

> Naming convention followed as <platform>_dmc_<api-version>.bin

> 

> v1: Initial version.

> 

> v2: Commit description added based on review comment from Sunil.

> 

> Cc: Damien Lespiau <damien.lespiau@intel.com>

> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

> Cc: Sunil Kamath <sunil.kamath@intel.com>

> Signed-off-by: Animesh Manna <animesh.manna@intel.com>

> ---

>  drivers/gpu/drm/i915/intel_csr.c | 4 ++++

>  1 file changed, 4 insertions(+)

> 

> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c

> index 18a0670..c89b9ce 100644

> --- a/drivers/gpu/drm/i915/intel_csr.c

> +++ b/drivers/gpu/drm/i915/intel_csr.c

> @@ -42,8 +42,10 @@

>   */

>  

>  #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"

> +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"

>  

>  MODULE_FIRMWARE(I915_CSR_SKL);

> +MODULE_FIRMWARE(I915_CSR_BXT);

>  

>  struct intel_css_header {

>  	/* 0x09 for DMC */

> @@ -372,6 +374,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)

>  

>  	if (IS_SKYLAKE(dev_priv))

>  		csr->fw_path = I915_CSR_SKL;

> +	else if (IS_BROXTON(dev_priv))

> +		csr->fw_path = I915_CSR_BXT;

>  	else {

>  		DRM_ERROR("Unexpected: no known CSR firmware for platform\n");

>  		return;
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 18a0670..c89b9ce 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -42,8 +42,10 @@ 
  */
 
 #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
+#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"
 
 MODULE_FIRMWARE(I915_CSR_SKL);
+MODULE_FIRMWARE(I915_CSR_BXT);
 
 struct intel_css_header {
 	/* 0x09 for DMC */
@@ -372,6 +374,8 @@  void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 
 	if (IS_SKYLAKE(dev_priv))
 		csr->fw_path = I915_CSR_SKL;
+	else if (IS_BROXTON(dev_priv))
+		csr->fw_path = I915_CSR_BXT;
 	else {
 		DRM_ERROR("Unexpected: no known CSR firmware for platform\n");
 		return;