Merge "drm/msm/sde: remove fence support through get_property"
diff --git a/drivers/gpu/drm/msm/sde/sde_connector.c b/drivers/gpu/drm/msm/sde/sde_connector.c
index fb1f578..c87ed04 100644
--- a/drivers/gpu/drm/msm/sde/sde_connector.c
+++ b/drivers/gpu/drm/msm/sde/sde_connector.c
@@ -1086,12 +1086,14 @@
c_state = to_sde_connector_state(state);
idx = msm_property_index(&c_conn->property_info, property);
- if (idx == CONNECTOR_PROP_RETIRE_FENCE)
- rc = sde_fence_create(&c_conn->retire_fence, val, 0);
- else
+ if (idx == CONNECTOR_PROP_RETIRE_FENCE) {
+ *val = ~0;
+ rc = 0;
+ } else {
/* get cached property value */
rc = msm_property_atomic_get(&c_conn->property_info,
&c_state->property_state, property, val);
+ }
/* allow for custom override */
if (c_conn->ops.get_property)
diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c
index a7073cb..4e414e1 100644
--- a/drivers/gpu/drm/msm/sde/sde_crtc.c
+++ b/drivers/gpu/drm/msm/sde/sde_crtc.c
@@ -5214,7 +5214,8 @@
i = msm_property_index(&sde_crtc->property_info, property);
if (i == CRTC_PROP_OUTPUT_FENCE) {
- ret = _sde_crtc_get_output_fence(crtc, state, val);
+ *val = ~0;
+ ret = 0;
} else {
ret = msm_property_atomic_get(&sde_crtc->property_info,
&cstate->property_state, property, val);