Commit a5ebb27b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov

drm/msm/dpu: remove struct dpu_hw_pipe_qos_cfg

Now as the struct dpu_hw_pipe_qos_cfg consists of only one bool field,
drop the structure and use corresponding bool directly.
Reviewed-by: default avatarJeykumar Sankaran <quic_jeykumar@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/537918/
Link: https://lore.kernel.org/r/20230518222238.3815293-9-dmitry.baryshkov@linaro.orgSigned-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 9ccff1d2
...@@ -566,17 +566,13 @@ static void dpu_hw_sspp_setup_creq_lut(struct dpu_hw_sspp *ctx, ...@@ -566,17 +566,13 @@ static void dpu_hw_sspp_setup_creq_lut(struct dpu_hw_sspp *ctx,
} }
static void dpu_hw_sspp_setup_qos_ctrl(struct dpu_hw_sspp *ctx, static void dpu_hw_sspp_setup_qos_ctrl(struct dpu_hw_sspp *ctx,
struct dpu_hw_pipe_qos_cfg *cfg) bool danger_safe_en)
{ {
u32 qos_ctrl = 0;
if (!ctx) if (!ctx)
return; return;
if (cfg->danger_safe_en) DPU_REG_WRITE(&ctx->hw, SSPP_QOS_CTRL,
qos_ctrl |= SSPP_QOS_CTRL_DANGER_SAFE_EN; danger_safe_en ? SSPP_QOS_CTRL_DANGER_SAFE_EN : 0);
DPU_REG_WRITE(&ctx->hw, SSPP_QOS_CTRL, qos_ctrl);
} }
static void dpu_hw_sspp_setup_cdp(struct dpu_sw_pipe *pipe, static void dpu_hw_sspp_setup_cdp(struct dpu_sw_pipe *pipe,
......
...@@ -163,14 +163,6 @@ struct dpu_sw_pipe_cfg { ...@@ -163,14 +163,6 @@ struct dpu_sw_pipe_cfg {
struct drm_rect dst_rect; struct drm_rect dst_rect;
}; };
/**
* struct dpu_hw_pipe_qos_cfg : Source pipe QoS configuration
* @danger_safe_en: enable danger safe generation
*/
struct dpu_hw_pipe_qos_cfg {
bool danger_safe_en;
};
/** /**
* struct dpu_hw_pipe_ts_cfg - traffic shaper configuration * struct dpu_hw_pipe_ts_cfg - traffic shaper configuration
* @size: size to prefill in bytes, or zero to disable * @size: size to prefill in bytes, or zero to disable
...@@ -285,11 +277,10 @@ struct dpu_hw_sspp_ops { ...@@ -285,11 +277,10 @@ struct dpu_hw_sspp_ops {
/** /**
* setup_qos_ctrl - setup QoS control * setup_qos_ctrl - setup QoS control
* @ctx: Pointer to pipe context * @ctx: Pointer to pipe context
* @cfg: Pointer to pipe QoS configuration * @danger_safe_en: flags controlling enabling of danger/safe QoS/LUT
*
*/ */
void (*setup_qos_ctrl)(struct dpu_hw_sspp *ctx, void (*setup_qos_ctrl)(struct dpu_hw_sspp *ctx,
struct dpu_hw_pipe_qos_cfg *cfg); bool danger_safe_en);
/** /**
* setup_histogram - setup histograms * setup_histogram - setup histograms
......
...@@ -343,22 +343,17 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane, ...@@ -343,22 +343,17 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane,
bool enable) bool enable)
{ {
struct dpu_plane *pdpu = to_dpu_plane(plane); struct dpu_plane *pdpu = to_dpu_plane(plane);
struct dpu_hw_pipe_qos_cfg pipe_qos_cfg;
memset(&pipe_qos_cfg, 0, sizeof(pipe_qos_cfg));
pipe_qos_cfg.danger_safe_en = enable;
if (!pdpu->is_rt_pipe) if (!pdpu->is_rt_pipe)
pipe_qos_cfg.danger_safe_en = false; enable = false;
DPU_DEBUG_PLANE(pdpu, "pnum:%d ds:%d is_rt:%d\n", DPU_DEBUG_PLANE(pdpu, "pnum:%d ds:%d is_rt:%d\n",
pdpu->pipe - SSPP_VIG0, pdpu->pipe - SSPP_VIG0,
pipe_qos_cfg.danger_safe_en, enable,
pdpu->is_rt_pipe); pdpu->is_rt_pipe);
pipe->sspp->ops.setup_qos_ctrl(pipe->sspp, pipe->sspp->ops.setup_qos_ctrl(pipe->sspp,
&pipe_qos_cfg); enable);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment