diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-09 23:14:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-09 23:14:55 -0800 |
| commit | 16a3488d961a0bb1000d0bd76f8e8e6c192938ac (patch) | |
| tree | 28f1d5631d42e5602fb722f259a0027b8d80722c | |
| parent | 3d59d5cbc03fc616b95474bb33cf29a659f2cdd1 (diff) | |
| parent | 654000d2d7967e836db76419a59acd682de6654e (diff) | |
Merge "[drm-sde] remove additional release fence offset"
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_crtc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c index 3f5aa4d276c9..4b5e3e7dd34c 100644 --- a/drivers/gpu/drm/msm/sde/sde_crtc.c +++ b/drivers/gpu/drm/msm/sde/sde_crtc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * Copyright (C) 2013 Red Hat * Author: Rob Clark <robdclark@gmail.com> * @@ -1683,7 +1683,6 @@ static int sde_crtc_atomic_get_property(struct drm_crtc *crtc, struct sde_crtc *sde_crtc; struct sde_crtc_state *cstate; int i, ret = -EINVAL; - bool conn_offset = 0; if (!crtc || !state) { SDE_ERROR("invalid argument(s)\n"); @@ -1691,20 +1690,13 @@ static int sde_crtc_atomic_get_property(struct drm_crtc *crtc, sde_crtc = to_sde_crtc(crtc); cstate = to_sde_crtc_state(state); - for (i = 0; i < cstate->num_connectors; ++i) { - conn_offset = sde_connector_needs_offset( - cstate->connectors[i]); - if (conn_offset) - break; - } - i = msm_property_index(&sde_crtc->property_info, property); if (i == CRTC_PROP_OUTPUT_FENCE) { int offset = sde_crtc_get_property(cstate, CRTC_PROP_OUTPUT_FENCE_OFFSET); ret = sde_fence_create(&sde_crtc->output_fence, val, - offset + conn_offset); + offset); if (ret) SDE_ERROR("fence create failed\n"); } else { |