[PATCH i-g-t 0/4] Removal of unused code

[PATCH i-g-t 0/4] Removal of unused code

[Petri Latvala]

These four removals are ones the compiler was yelling at me for the
loudest.

Petri Latvala (4):
  lib/intel_device_info: Remove unused whitney definition
  tools/intel_vbt_decode: Remove unused code
  tests/testdisplay: Remove unused SPRITE_COLOR_KEY
  assembler/gen8_disasm.c: Remove unused m_mask_ctrl

 assembler/gen8_disasm.c  |  5 -----
 lib/intel_device_info.c  |  6 ------
 tests/testdisplay.c      |  1 -
 tools/intel_vbt_decode.c | 22 ----------------------
 4 files changed, 34 deletions(-)

-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 1/4] lib/intel_device_info: Remove unused whitney definition

[Petri Latvala]

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 lib/intel_device_info.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index db4f383..41d94b5 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -9,12 +9,6 @@ static const struct intel_device_info intel_generic_info = {
 	.gen = 0,
 };
 
-static const struct intel_device_info intel_i81x_info = {
-	.gen = BIT(0),
-	.is_whitney = true,
-	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
-};
-
 static const struct intel_device_info intel_i830_info = {
 	.gen = BIT(1),
 	.is_almador = true,
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 2/4] tools/intel_vbt_decode: Remove unused code

[Petri Latvala]

efp_conn() and related have been unused since 86a546f6f798
("tools/intel_bios_reader: Dump out more information from the child
device structure")

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 tools/intel_vbt_decode.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index 301cd1c..2984a11 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -372,28 +372,6 @@ static const char *efp_port(uint8_t type)
 	return "unknown";
 }
 
-static const struct {
-	unsigned short type;
-	const char *name;
-} efp_conn_info[] = {
-	{ DEVICE_INFO_NONE, "N/A" },
-	{ DEVICE_INFO_HDMI_CERT, "HDMI certified" },
-	{ DEVICE_INFO_DP, "DisplayPort" },
-	{ DEVICE_INFO_DVI, "DVI" },
-};
-static const int num_efp_conn_info = sizeof(efp_conn_info) / sizeof(efp_conn_info[0]);
-
-static const char *efp_conn(uint8_t type)
-{
-	int i;
-
-	for (i = 0; i < num_efp_conn_info; i++)
-		if (efp_conn_info[i].type == type)
-			return efp_conn_info[i].name;
-
-	return "unknown";
-}
-
 static void dump_child_device(struct context *context,
 			      const struct child_device_config *child)
 {
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 3/4] tests/testdisplay: Remove unused SPRITE_COLOR_KEY

[Petri Latvala]

Unused since 99bdf4f0ff3e ("tests/testdisplay: Use cairo helpers to draw to plane")

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 tests/testdisplay.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index a974f42..f2a41fa 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -96,7 +96,6 @@ unsigned int plane_fb_id;
 unsigned int plane_crtc_id;
 unsigned int plane_id;
 int plane_width, plane_height;
-static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa;
 
 /*
  * Mode setting with the kernel interfaces is a bit of a chore.
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 4/4] assembler/gen8_disasm.c: Remove unused m_mask_ctrl

[Petri Latvala]

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 assembler/gen8_disasm.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/assembler/gen8_disasm.c b/assembler/gen8_disasm.c
index 7fc7a65..68bc033 100644
--- a/assembler/gen8_disasm.c
+++ b/assembler/gen8_disasm.c
@@ -138,11 +138,6 @@ static const char *const m_dep_ctrl[4] = {
    "NoDDClr,NoDDChk",
 };
 
-static const char *const m_mask_ctrl[4] = {
-   "",
-   "nomask",
-};
-
 static const char *const m_access_mode[2] = { "align1", "align16" };
 
 static const char *const m_reg_type[8] = {
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 1/4] lib/intel_device_info: Remove unused whitney definition

[Chris Wilson]

On Wed, Mar 08, 2017 at 04:44:32PM +0200, Petri Latvala wrote:
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> ---
>  lib/intel_device_info.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index db4f383..41d94b5 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -9,12 +9,6 @@ static const struct intel_device_info intel_generic_info = {
>  	.gen = 0,
>  };
>  
> -static const struct intel_device_info intel_i81x_info = {
> -	.gen = BIT(0),
> -	.is_whitney = true,
> -	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
> -};

No!!! Send the patches to enable gen1 in the kernel... :)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/4] tools/intel_vbt_decode: Remove unused code

[Jani Nikula]

On Wed, 08 Mar 2017, Petri Latvala <petri.latvala@intel.com> wrote:
> efp_conn() and related have been unused since 86a546f6f798
> ("tools/intel_bios_reader: Dump out more information from the child
> device structure")
>
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  tools/intel_vbt_decode.c | 22 ----------------------
>  1 file changed, 22 deletions(-)
>
> diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
> index 301cd1c..2984a11 100644
> --- a/tools/intel_vbt_decode.c
> +++ b/tools/intel_vbt_decode.c
> @@ -372,28 +372,6 @@ static const char *efp_port(uint8_t type)
>  	return "unknown";
>  }
>  
> -static const struct {
> -	unsigned short type;
> -	const char *name;
> -} efp_conn_info[] = {
> -	{ DEVICE_INFO_NONE, "N/A" },
> -	{ DEVICE_INFO_HDMI_CERT, "HDMI certified" },
> -	{ DEVICE_INFO_DP, "DisplayPort" },
> -	{ DEVICE_INFO_DVI, "DVI" },
> -};
> -static const int num_efp_conn_info = sizeof(efp_conn_info) / sizeof(efp_conn_info[0]);
> -
> -static const char *efp_conn(uint8_t type)
> -{
> -	int i;
> -
> -	for (i = 0; i < num_efp_conn_info; i++)
> -		if (efp_conn_info[i].type == type)
> -			return efp_conn_info[i].name;
> -
> -	return "unknown";
> -}
> -
>  static void dump_child_device(struct context *context,
>  			      const struct child_device_config *child)
>  {

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 1/4] lib/intel_device_info: Remove unused whitney definition

[Chris Wilson]

On Wed, Mar 08, 2017 at 02:53:48PM +0000, Chris Wilson wrote:
> On Wed, Mar 08, 2017 at 04:44:32PM +0200, Petri Latvala wrote:
> > Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> > ---
> >  lib/intel_device_info.c | 6 ------
> >  1 file changed, 6 deletions(-)
> > 
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index db4f383..41d94b5 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -9,12 +9,6 @@ static const struct intel_device_info intel_generic_info = {
> >  	.gen = 0,
> >  };
> >  
> > -static const struct intel_device_info intel_i81x_info = {
> > -	.gen = BIT(0),
> > -	.is_whitney = true,
> > -	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
> > -};
> 
> No!!! Send the patches to enable gen1 in the kernel... :)

To be more specific, we could just add the pci-ids to i915_pciids.h and
start preparing for the support.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 3/4] tests/testdisplay: Remove unused SPRITE_COLOR_KEY

[Mika Kahola]

On Wed, 2017-03-08 at 16:44 +0200, Petri Latvala wrote:
> Unused since 99bdf4f0ff3e ("tests/testdisplay: Use cairo helpers to
> draw to plane")
> 
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> ---
>  tests/testdisplay.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/testdisplay.c b/tests/testdisplay.c
> index a974f42..f2a41fa 100644
> --- a/tests/testdisplay.c
> +++ b/tests/testdisplay.c
> @@ -96,7 +96,6 @@ unsigned int plane_fb_id;
>  unsigned int plane_crtc_id;
>  unsigned int plane_id;
>  int plane_width, plane_height;
> -static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa;
>  
>  /*
>   * Mode setting with the kernel interfaces is a bit of a chore.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 4/4] assembler/gen8_disasm.c: Remove unused m_mask_ctrl

[Mika Kahola]

On Wed, 2017-03-08 at 16:44 +0200, Petri Latvala wrote:
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> ---
>  assembler/gen8_disasm.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/assembler/gen8_disasm.c b/assembler/gen8_disasm.c
> index 7fc7a65..68bc033 100644
> --- a/assembler/gen8_disasm.c
> +++ b/assembler/gen8_disasm.c
> @@ -138,11 +138,6 @@ static const char *const m_dep_ctrl[4] = {
>     "NoDDClr,NoDDChk",
>  };
>  
> -static const char *const m_mask_ctrl[4] = {
> -   "",
> -   "nomask",
> -};
> -
>  static const char *const m_access_mode[2] = { "align1", "align16" };
>  
>  static const char *const m_reg_type[8] = {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx