Commit 49dfe764 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark

drm/msm/dpu: Remove dpu_crtc_is_enabled()

The static inline function dpu_crtc_enabled() is only called once
and the function that calls it in turn is only called once and
the return value can be easily checked in the calling functions
so collapse everything down.

v3: No changes
Reviewed-by: default avatarSean Paul <sean@poorly.run>
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 35d600dd
...@@ -57,18 +57,13 @@ static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc) ...@@ -57,18 +57,13 @@ static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)
return to_dpu_kms(priv->kms); return to_dpu_kms(priv->kms);
} }
static bool _dpu_core_perf_crtc_is_power_on(struct drm_crtc *crtc)
{
return dpu_crtc_is_enabled(crtc);
}
static bool _dpu_core_video_mode_intf_connected(struct drm_crtc *crtc) static bool _dpu_core_video_mode_intf_connected(struct drm_crtc *crtc)
{ {
struct drm_crtc *tmp_crtc; struct drm_crtc *tmp_crtc;
drm_for_each_crtc(tmp_crtc, crtc->dev) { drm_for_each_crtc(tmp_crtc, crtc->dev) {
if ((dpu_crtc_get_intf_mode(tmp_crtc) == INTF_MODE_VIDEO) && if ((dpu_crtc_get_intf_mode(tmp_crtc) == INTF_MODE_VIDEO) &&
_dpu_core_perf_crtc_is_power_on(tmp_crtc)) { tmp_crtc->enabled) {
DPU_DEBUG("video interface connected crtc:%d\n", DPU_DEBUG("video interface connected crtc:%d\n",
tmp_crtc->base.id); tmp_crtc->base.id);
return true; return true;
...@@ -164,7 +159,7 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, ...@@ -164,7 +159,7 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc,
curr_client_type = dpu_crtc_get_client_type(crtc); curr_client_type = dpu_crtc_get_client_type(crtc);
drm_for_each_crtc(tmp_crtc, crtc->dev) { drm_for_each_crtc(tmp_crtc, crtc->dev) {
if (_dpu_core_perf_crtc_is_power_on(tmp_crtc) && if (tmp_crtc->enabled &&
(dpu_crtc_get_client_type(tmp_crtc) == (dpu_crtc_get_client_type(tmp_crtc) ==
curr_client_type) && curr_client_type) &&
(tmp_crtc != crtc)) { (tmp_crtc != crtc)) {
...@@ -223,7 +218,7 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, ...@@ -223,7 +218,7 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms,
int ret = 0; int ret = 0;
drm_for_each_crtc(tmp_crtc, crtc->dev) { drm_for_each_crtc(tmp_crtc, crtc->dev) {
if (_dpu_core_perf_crtc_is_power_on(tmp_crtc) && if (tmp_crtc->enabled &&
curr_client_type == curr_client_type ==
dpu_crtc_get_client_type(tmp_crtc)) { dpu_crtc_get_client_type(tmp_crtc)) {
dpu_cstate = to_dpu_crtc_state(tmp_crtc->state); dpu_cstate = to_dpu_crtc_state(tmp_crtc->state);
...@@ -280,7 +275,7 @@ void dpu_core_perf_crtc_release_bw(struct drm_crtc *crtc) ...@@ -280,7 +275,7 @@ void dpu_core_perf_crtc_release_bw(struct drm_crtc *crtc)
*/ */
if (dpu_crtc_get_intf_mode(crtc) == INTF_MODE_CMD) if (dpu_crtc_get_intf_mode(crtc) == INTF_MODE_CMD)
drm_for_each_crtc(tmp_crtc, crtc->dev) { drm_for_each_crtc(tmp_crtc, crtc->dev) {
if (_dpu_core_perf_crtc_is_power_on(tmp_crtc) && if (tmp_crtc->enabled &&
dpu_crtc_get_intf_mode(tmp_crtc) == dpu_crtc_get_intf_mode(tmp_crtc) ==
INTF_MODE_VIDEO) INTF_MODE_VIDEO)
return; return;
...@@ -315,7 +310,7 @@ static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms) ...@@ -315,7 +310,7 @@ static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms)
struct dpu_crtc_state *dpu_cstate; struct dpu_crtc_state *dpu_cstate;
drm_for_each_crtc(crtc, kms->dev) { drm_for_each_crtc(crtc, kms->dev) {
if (_dpu_core_perf_crtc_is_power_on(crtc)) { if (crtc->enabled) {
dpu_cstate = to_dpu_crtc_state(crtc->state); dpu_cstate = to_dpu_crtc_state(crtc->state);
clk_rate = max(dpu_cstate->new_perf.core_clk_rate, clk_rate = max(dpu_cstate->new_perf.core_clk_rate,
clk_rate); clk_rate);
...@@ -366,7 +361,7 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc, ...@@ -366,7 +361,7 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc,
old = &dpu_crtc->cur_perf; old = &dpu_crtc->cur_perf;
new = &dpu_cstate->new_perf; new = &dpu_cstate->new_perf;
if (_dpu_core_perf_crtc_is_power_on(crtc) && !stop_req) { if (crtc->enabled && !stop_req) {
for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) { for (i = 0; i < DPU_CORE_PERF_DATA_BUS_ID_MAX; i++) {
/* /*
* cases for bus bandwidth update. * cases for bus bandwidth update.
......
...@@ -309,13 +309,4 @@ static inline enum dpu_crtc_client_type dpu_crtc_get_client_type( ...@@ -309,13 +309,4 @@ static inline enum dpu_crtc_client_type dpu_crtc_get_client_type(
return crtc && crtc->state ? RT_CLIENT : NRT_CLIENT; return crtc && crtc->state ? RT_CLIENT : NRT_CLIENT;
} }
/**
* dpu_crtc_is_enabled - check if dpu crtc is enabled or not
* @crtc: Pointer to crtc
*/
static inline bool dpu_crtc_is_enabled(struct drm_crtc *crtc)
{
return crtc ? crtc->enabled : false;
}
#endif /* _DPU_CRTC_H_ */ #endif /* _DPU_CRTC_H_ */
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