From 331aaf46b7534e635428b17e1e458236e72dfa8e Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Tue, 5 Apr 2016 15:19:36 -0400 Subject: [PATCH 1033/1110] drm/amd/dal: Pass viewport into scaler_bypass programming code Signed-off-by: Harry Wentland Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h | 2 +- drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 2 +- drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h | 2 +- drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h index fdde463..6fa273c 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h @@ -58,7 +58,7 @@ bool dce110_transform_set_scaler( void dce110_transform_set_scaler_bypass( struct transform *xfm, - struct rect *size); + const struct rect *size); void dce110_transform_set_scaler_filter( struct transform *xfm, diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c index 67dd983..3bc450c 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c @@ -90,7 +90,7 @@ static bool setup_scaling_configuration( dm_write_reg(ctx, addr, value); if (data->taps.h_taps + data->taps.v_taps <= 2) { - dce110_transform_set_scaler_bypass(&xfm110->base, NULL); + dce110_transform_set_scaler_bypass(&xfm110->base, &data->viewport); return false; } @@ -686,7 +686,7 @@ bool dce110_transform_set_scaler( void dce110_transform_set_scaler_bypass( struct transform *xfm, - struct rect *size) + const struct rect *size) { struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm); uint32_t sclv_mode; diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c index a3b9b20..5312037 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c @@ -455,7 +455,7 @@ static void program_scl_ratios_inits( static void dce110_transform_v_set_scalerv_bypass( struct transform *xfm, - struct rect *size) + const struct rect *size) { uint32_t addr = mmSCLV_MODE; uint32_t value = dm_read_reg(xfm->ctx, addr); diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h index 6c151ae..fc6eb4b 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h +++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h @@ -58,7 +58,7 @@ bool dce80_transform_set_scaler( void dce80_transform_set_scaler_bypass( struct transform *xfm, - struct rect *size); + const struct rect *size); void dce80_transform_set_scaler_filter( struct transform *xfm, diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c index 0248b77..3134446 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c +++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c @@ -83,7 +83,7 @@ static bool setup_scaling_configuration( uint32_t value; if (data->taps.h_taps + data->taps.v_taps <= 2) { - dce80_transform_set_scaler_bypass(&xfm80->base, NULL); + dce80_transform_set_scaler_bypass(&xfm80->base, &data->viewport); return false; } @@ -687,7 +687,7 @@ bool dce80_transform_set_scaler( void dce80_transform_set_scaler_bypass( struct transform *xfm, - struct rect *size) + const struct rect *size) { struct dce80_transform *xfm80 = TO_DCE80_TRANSFORM(xfm); uint32_t sclv_mode; diff --git a/drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h index bc4e1a1..02c05f3 100644 --- a/drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +++ b/drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h @@ -167,7 +167,7 @@ struct transform_funcs { void (*transform_set_scaler_bypass)( struct transform *xfm, - struct rect *size); + const struct rect *size); void (*transform_set_scaler_filter)( struct transform *xfm, -- 2.7.4