[PATCH 1/2] drm/i915: remove left over dead code

[PATCH 1/2] drm/i915: remove left over dead code

[Eric Engestrom]

ae80152ddad252f33893b92dd69f00cc53c5949f ("drm/i915: Rewrite VLV/CHV
watermark code") removed everything that would have used those vars.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index b28c29f..73c290a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -485,20 +485,6 @@ static const struct intel_watermark_params g4x_cursor_wm_info = {
 	.guard_size = 2,
 	.cacheline_size = G4X_FIFO_LINE_SIZE,
 };
-static const struct intel_watermark_params valleyview_wm_info = {
-	.fifo_size = VALLEYVIEW_FIFO_SIZE,
-	.max_wm = VALLEYVIEW_MAX_WM,
-	.default_wm = VALLEYVIEW_MAX_WM,
-	.guard_size = 2,
-	.cacheline_size = G4X_FIFO_LINE_SIZE,
-};
-static const struct intel_watermark_params valleyview_cursor_wm_info = {
-	.fifo_size = I965_CURSOR_FIFO,
-	.max_wm = VALLEYVIEW_CURSOR_MAX_WM,
-	.default_wm = I965_CURSOR_DFT_WM,
-	.guard_size = 2,
-	.cacheline_size = G4X_FIFO_LINE_SIZE,
-};
 static const struct intel_watermark_params i965_cursor_wm_info = {
 	.fifo_size = I965_CURSOR_FIFO,
 	.max_wm = I965_CURSOR_MAX_WM,
-- 
2.7.1

[PATCH 2/2] drm/i915: remove dead code

[Eric Engestrom]

79e539453b34e35f39299a899d263b0a1f1670bd ("DRM: i915: add mode setting
support") added those variables but never used them.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
---
 drivers/gpu/drm/i915/intel_tv.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 948cbff..14f0b41 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -326,24 +326,12 @@ static const struct color_conversion sdtv_csc_yprpb = {
 	.rv = 0x0100, .gv = 0x03ad, .bv = 0x074d, .av = 0x0200,
 };
 
-static const struct color_conversion sdtv_csc_rgb = {
-	.ry = 0x0000, .gy = 0x0f00, .by = 0x0000, .ay = 0x0166,
-	.ru = 0x0000, .gu = 0x0000, .bu = 0x0f00, .au = 0x0166,
-	.rv = 0x0f00, .gv = 0x0000, .bv = 0x0000, .av = 0x0166,
-};
-
 static const struct color_conversion hdtv_csc_yprpb = {
 	.ry = 0x05b3, .gy = 0x016e, .by = 0x0728, .ay = 0x0145,
 	.ru = 0x07d5, .gu = 0x038b, .bu = 0x0100, .au = 0x0200,
 	.rv = 0x0100, .gv = 0x03d1, .bv = 0x06bc, .av = 0x0200,
 };
 
-static const struct color_conversion hdtv_csc_rgb = {
-	.ry = 0x0000, .gy = 0x0f00, .by = 0x0000, .ay = 0x0166,
-	.ru = 0x0000, .gu = 0x0000, .bu = 0x0f00, .au = 0x0166,
-	.rv = 0x0f00, .gv = 0x0000, .bv = 0x0000, .av = 0x0166,
-};
-
 static const struct video_levels component_levels = {
 	.blank = 279, .black = 279, .burst = 0,
 };
-- 
2.7.1

Re: [PATCH 2/2] drm/i915: remove dead code

[Daniel Vetter]

On Mon, Feb 29, 2016 at 04:24:07PM +0000, Eric Engestrom wrote:
> 79e539453b34e35f39299a899d263b0a1f1670bd ("DRM: i915: add mode setting
> support") added those variables but never used them.
> 
> Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>

Both applied for 4.7, thanks.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_tv.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 948cbff..14f0b41 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -326,24 +326,12 @@ static const struct color_conversion sdtv_csc_yprpb = {
>  	.rv = 0x0100, .gv = 0x03ad, .bv = 0x074d, .av = 0x0200,
>  };
>  
> -static const struct color_conversion sdtv_csc_rgb = {
> -	.ry = 0x0000, .gy = 0x0f00, .by = 0x0000, .ay = 0x0166,
> -	.ru = 0x0000, .gu = 0x0000, .bu = 0x0f00, .au = 0x0166,
> -	.rv = 0x0f00, .gv = 0x0000, .bv = 0x0000, .av = 0x0166,
> -};
> -
>  static const struct color_conversion hdtv_csc_yprpb = {
>  	.ry = 0x05b3, .gy = 0x016e, .by = 0x0728, .ay = 0x0145,
>  	.ru = 0x07d5, .gu = 0x038b, .bu = 0x0100, .au = 0x0200,
>  	.rv = 0x0100, .gv = 0x03d1, .bv = 0x06bc, .av = 0x0200,
>  };
>  
> -static const struct color_conversion hdtv_csc_rgb = {
> -	.ry = 0x0000, .gy = 0x0f00, .by = 0x0000, .ay = 0x0166,
> -	.ru = 0x0000, .gu = 0x0000, .bu = 0x0f00, .au = 0x0166,
> -	.rv = 0x0f00, .gv = 0x0000, .bv = 0x0000, .av = 0x0166,
> -};
> -
>  static const struct video_levels component_levels = {
>  	.blank = 279, .black = 279, .burst = 0,
>  };
> -- 
> 2.7.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch