mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 10:31:33 -04:00
drm/i915/casf: s/casf_enable/enable/
The 'casf_enable' boolean is already inside a casf specific structure, so drop the extra 'casf_' namespace from the bool. Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> Reviewed-by: Nemesa Garg <nemesa.garg@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20260407175244.19654-2-ville.syrjala@linux.intel.com
This commit is contained in:
@@ -110,7 +110,7 @@ int intel_casf_compute_config(struct intel_crtc_state *crtc_state)
|
||||
return 0;
|
||||
|
||||
if (crtc_state->uapi.sharpness_strength == 0) {
|
||||
crtc_state->hw.casf_params.casf_enable = false;
|
||||
crtc_state->hw.casf_params.enable = false;
|
||||
crtc_state->hw.casf_params.strength = 0;
|
||||
return 0;
|
||||
}
|
||||
@@ -121,7 +121,7 @@ int intel_casf_compute_config(struct intel_crtc_state *crtc_state)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
crtc_state->hw.casf_params.casf_enable = true;
|
||||
crtc_state->hw.casf_params.enable = true;
|
||||
|
||||
/*
|
||||
* HW takes a value in form (1.0 + strength) in 4.4 fixed format.
|
||||
@@ -155,7 +155,7 @@ void intel_casf_sharpness_get_config(struct intel_crtc_state *crtc_state)
|
||||
else
|
||||
crtc_state->hw.casf_params.strength =
|
||||
REG_FIELD_GET(FILTER_STRENGTH_MASK, sharp);
|
||||
crtc_state->hw.casf_params.casf_enable = true;
|
||||
crtc_state->hw.casf_params.enable = true;
|
||||
crtc_state->hw.casf_params.win_size =
|
||||
REG_FIELD_GET(FILTER_SIZE_MASK, sharp);
|
||||
}
|
||||
@@ -163,7 +163,7 @@ void intel_casf_sharpness_get_config(struct intel_crtc_state *crtc_state)
|
||||
|
||||
bool intel_casf_needs_scaler(const struct intel_crtc_state *crtc_state)
|
||||
{
|
||||
if (crtc_state->hw.casf_params.casf_enable)
|
||||
if (crtc_state->hw.casf_params.enable)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
@@ -351,7 +351,7 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config,
|
||||
drm_printf(&p, "sharpness strength: %d, sharpness tap size: %d, sharpness enable: %d\n",
|
||||
pipe_config->hw.casf_params.strength,
|
||||
pipe_config->hw.casf_params.win_size,
|
||||
pipe_config->hw.casf_params.casf_enable);
|
||||
pipe_config->hw.casf_params.enable);
|
||||
|
||||
drm_printf(&p, "ips: %i, double wide: %i, drrs: %i\n",
|
||||
pipe_config->ips_enabled, pipe_config->double_wide,
|
||||
|
||||
@@ -994,7 +994,7 @@ static bool intel_casf_enabling(const struct intel_crtc_state *new_crtc_state,
|
||||
if (!new_crtc_state->hw.active)
|
||||
return false;
|
||||
|
||||
return is_enabling(hw.casf_params.casf_enable, old_crtc_state, new_crtc_state);
|
||||
return is_enabling(hw.casf_params.enable, old_crtc_state, new_crtc_state);
|
||||
}
|
||||
|
||||
static bool intel_casf_disabling(const struct intel_crtc_state *old_crtc_state,
|
||||
@@ -1003,7 +1003,7 @@ static bool intel_casf_disabling(const struct intel_crtc_state *old_crtc_state,
|
||||
if (!new_crtc_state->hw.active)
|
||||
return false;
|
||||
|
||||
return is_disabling(hw.casf_params.casf_enable, old_crtc_state, new_crtc_state);
|
||||
return is_disabling(hw.casf_params.enable, old_crtc_state, new_crtc_state);
|
||||
}
|
||||
|
||||
static bool intel_crtc_lobf_enabling(const struct intel_crtc_state *old_crtc_state,
|
||||
@@ -5371,7 +5371,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
|
||||
|
||||
PIPE_CONF_CHECK_I(scaler_state.scaler_id);
|
||||
PIPE_CONF_CHECK_I(pixel_rate);
|
||||
PIPE_CONF_CHECK_BOOL(hw.casf_params.casf_enable);
|
||||
PIPE_CONF_CHECK_BOOL(hw.casf_params.enable);
|
||||
PIPE_CONF_CHECK_I(hw.casf_params.win_size);
|
||||
PIPE_CONF_CHECK_I(hw.casf_params.strength);
|
||||
|
||||
|
||||
@@ -997,7 +997,7 @@ struct intel_casf {
|
||||
struct scaler_filter_coeff coeff[SCALER_FILTER_NUM_TAPS];
|
||||
u8 strength;
|
||||
u8 win_size;
|
||||
bool casf_enable;
|
||||
bool enable;
|
||||
};
|
||||
|
||||
struct intel_crtc_state {
|
||||
|
||||
@@ -986,13 +986,13 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state)
|
||||
if (HAS_CASF(display) && id == 1)
|
||||
intel_casf_sharpness_get_config(crtc_state);
|
||||
|
||||
if (!crtc_state->hw.casf_params.casf_enable)
|
||||
if (!crtc_state->hw.casf_params.enable)
|
||||
crtc_state->pch_pfit.enabled = true;
|
||||
|
||||
pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, i));
|
||||
size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, i));
|
||||
|
||||
if (!crtc_state->hw.casf_params.casf_enable)
|
||||
if (!crtc_state->hw.casf_params.enable)
|
||||
drm_rect_init(&crtc_state->pch_pfit.dst,
|
||||
REG_FIELD_GET(PS_WIN_XPOS_MASK, pos),
|
||||
REG_FIELD_GET(PS_WIN_YPOS_MASK, pos),
|
||||
|
||||
Reference in New Issue
Block a user