Revert "media: platform: nvavp: use dynamic syncpt"

This reverts commit 27690e435d7ad65f14935c134e1b496c4c3f816a.

With patch "27690e4" avp driver requests nvhost to provide a syncpt
dynamically at avp_probe() time.
But on some boards avp is probed before nvhost and hence this request
results into random memory corruption.
To fix this, revert above patch for now and hard code avp syncpt

Bug 1305024

Change-Id: Ibaa93429d777c5569df5e183b9c8f36e078a1993
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/368076
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Tested-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/drivers/media/platform/tegra/nvavp/nvavp_dev.c b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
index 5531c326a8aa2b915a35406b239e4da5b7f0df22..f3e8ebb7af338b798d723ab48c21405ed3df44ac 100644 (file)
--- a/drivers/media/platform/tegra/nvavp/nvavp_dev.c
+++ b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
@@ -827,6 +827,7 @@ static int nvavp_pushbuffer_init(struct nvavp_info *nvavp)
                }
                nvavp_set_channel_control_area(nvavp, channel_id);
                if (IS_VIDEO_CHANNEL_ID(channel_id)) {
+                       nvavp->syncpt_id = NVSYNCPT_AVP_0;
                        nvavp->syncpt_value = nvhost_syncpt_read_ext(
                                nvavp->nvhost_dev, nvavp->syncpt_id);
                }
@@ -2166,9 +2167,6 @@ static int tegra_nvavp_probe(struct platform_device *ndev)
        for (channel_id = 0; channel_id < NVAVP_NUM_CHANNELS; channel_id++)
                mutex_init(&nvavp->channel_info[channel_id].pushbuffer_lock);
 
-       /* get and store a syncpt id */
-       nvavp->syncpt_id = nvhost_get_syncpt_client_managed("avp_0");
-
        /* TODO DO NOT USE NVAVP DEVICE */
        nvavp->cop_clk = clk_get(&ndev->dev, "cop");
        if (IS_ERR(nvavp->cop_clk)) {