From 977b21367fdb17c5f1188163a21d5ebafcbb6575 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 11 Apr 2016 17:43:49 +1000 Subject: [PATCH 1017/1110] drm/amd/dal: drop dead set_critical_scratch code. Signed-off-by: Dave Airlie Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h | 3 --- .../drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h index a8e10c9..6545f65 100644 --- a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h +++ b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h @@ -61,9 +61,6 @@ struct bios_parser_helper { struct dc_context *ctx); bool (*is_accelerated_mode)( struct dc_context *ctx); - void (*set_scratch_critical_state)( - struct dc_context *ctx, - bool state); void (*prepare_scratch_active_and_requested)( struct dc_context *ctx, struct vbios_helper_data *data, diff --git a/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c b/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c index a7e42b5..650a1ac 100644 --- a/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c +++ b/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c @@ -214,21 +214,6 @@ static bool is_accelerated_mode( return (value & ATOM_S6_ACC_MODE) ? true : false; } -static void set_scratch_critical_state( - struct dc_context *ctx, - bool state) -{ - uint32_t addr = mmBIOS_SCRATCH_6; - uint32_t value = dm_read_reg(ctx, addr); - - if (state) - value |= ATOM_S6_CRITICAL_STATE; - else - value &= ~ATOM_S6_CRITICAL_STATE; - - dm_write_reg(ctx, addr, value); -} - /** * prepare_scratch_active_and_requested * @@ -636,7 +621,6 @@ static const struct bios_parser_helper bios_parser_helper_funcs = { prepare_scratch_active_and_requested, .set_scratch_acc_mode_change = set_scratch_acc_mode_change, .set_scratch_active_and_requested = set_scratch_active_and_requested, - .set_scratch_critical_state = set_scratch_critical_state, .take_backlight_control = take_backlight_control, .update_requested_backlight_level = update_requested_backlight_level, }; -- 2.7.4