[2/2] drm/i915/DMC/KBL: Load DMC on KBL using he no_stepping_info array
diff mbox

Message ID 1476489364-6484-2-git-send-email-anusha.srivatsa@intel.com
State New
Headers show

Commit Message

Srivatsa, Anusha Oct. 14, 2016, 11:56 p.m. UTC
Currently, for display there is only one DMC image for KBL.
Remove the stepping_info table for KBL and use the no_stepping_info
for loading the firmware image.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Rodrigo Vivi Oct. 17, 2016, 5:18 p.m. UTC | #1
On Fri, 2016-10-14 at 16:56 -0700, Anusha Srivatsa wrote:
> Currently, for display there is only one DMC image for KBL.

> Remove the stepping_info table for KBL and use the no_stepping_info

> for loading the firmware image.

> 

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

> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

> ---

>  drivers/gpu/drm/i915/intel_csr.c | 10 ++--------

>  1 file changed, 2 insertions(+), 8 deletions(-)

> 

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

> index cf57167..e0e348b 100644

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

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

> @@ -168,12 +168,6 @@ struct stepping_info {

>  	char substepping;

>  };

>  

> -static const struct stepping_info kbl_stepping_info[] = {

> -	{'A', '0'}, {'B', '0'}, {'C', '0'},

> -	{'D', '0'}, {'E', '0'}, {'F', '0'},

> -	{'G', '0'}, {'H', '0'}, {'I', '0'},

> -};

> -

>  static const struct stepping_info skl_stepping_info[] = {

>  	{'A', '0'}, {'B', '0'}, {'C', '0'},

>  	{'D', '0'}, {'E', '0'}, {'F', '0'},

> @@ -197,8 +191,8 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)

>  	unsigned int size;

>  

>  	if (IS_KABYLAKE(dev_priv)) {

> -		size = ARRAY_SIZE(kbl_stepping_info);

> -		si = kbl_stepping_info;

> +		size = ARRAY_SIZE(no_stepping_info);

> +		si = no_stepping_info;


I believe we could just remove this entire block so it would just return
the no_stepping_info...


>  	} else if (IS_SKYLAKE(dev_priv)) {

>  		size = ARRAY_SIZE(skl_stepping_info);

>  		si = skl_stepping_info;

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index cf57167..e0e348b 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -168,12 +168,6 @@  struct stepping_info {
 	char substepping;
 };
 
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-
 static const struct stepping_info skl_stepping_info[] = {
 	{'A', '0'}, {'B', '0'}, {'C', '0'},
 	{'D', '0'}, {'E', '0'}, {'F', '0'},
@@ -197,8 +191,8 @@  intel_get_stepping_info(struct drm_i915_private *dev_priv)
 	unsigned int size;
 
 	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
+		size = ARRAY_SIZE(no_stepping_info);
+		si = no_stepping_info;
 	} else if (IS_SKYLAKE(dev_priv)) {
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;