Merge branch 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux into drm-fixes

msm fixes, pretty scattered.

* 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: fix locking inconsistencies in gpu->destroy()
  drm/msm/dsi: Simplify the code to get the number of read byte
  drm/msm: Attach assigned encoder to eDP and DSI connectors
  drm/msm: setup vram after component_bind_all()
  drm/msm/dsi: use pr_err_ratelimited
  drm/msm: fix unbalanced DRM framebuffer init/destroy
  drm/msm/mdp5: Fix iteration on INTF config array
  drm/msm/dsi: Fixup missing *break* statement during cmd rx
  drm/msm/dp: fix error return code
  drm: msm: Fix build when legacy fbdev support isn't set
  drm/msm/dsi: Fix a couple more 64-bit build warnings
  drm/msm: Fix a couple of 64-bit build warnings

15 files changed, 75 insertions, 67 deletions

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 94a5bee69fe7..bbdcab0a56c1 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -384,7 +384,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *gpu)
         if (gpu->memptrs_bo) {
                 if (gpu->memptrs_iova)
                         msm_gem_put_iova(gpu->memptrs_bo, gpu->base.id);
-                drm_gem_object_unreference(gpu->memptrs_bo);
+                drm_gem_object_unreference_unlocked(gpu->memptrs_bo);
         }
         release_firmware(gpu->pm4);
         release_firmware(gpu->pfp);
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index 28d1f95a90cc..ad50b80225f5 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -177,6 +177,11 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                 goto fail;
         }
 
+        for (i = 0; i < MSM_DSI_ENCODER_NUM; i++) {
+                encoders[i]->bridge = msm_dsi->bridge;
+                msm_dsi->encoders[i] = encoders[i];
+        }
+
         msm_dsi->connector = msm_dsi_manager_connector_init(msm_dsi->id);
         if (IS_ERR(msm_dsi->connector)) {
                 ret = PTR_ERR(msm_dsi->connector);
@@ -185,11 +190,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                 goto fail;
         }
 
-        for (i = 0; i < MSM_DSI_ENCODER_NUM; i++) {
-                encoders[i]->bridge = msm_dsi->bridge;
-                msm_dsi->encoders[i] = encoders[i];
-        }
-
         priv->bridges[priv->num_bridges++]       = msm_dsi->bridge;
         priv->connectors[priv->num_connectors++] = msm_dsi->connector;
 
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 956b22492c9a..649d20d29f92 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1023,7 +1023,7 @@ static int dsi_short_read1_resp(u8 *buf, const struct mipi_dsi_msg *msg)
                 *data = buf[1]; /* strip out dcs type */
                 return 1;
         } else {
-                pr_err("%s: read data does not match with rx_buf len %d\n",
+                pr_err("%s: read data does not match with rx_buf len %zu\n",
                         __func__, msg->rx_len);
                 return -EINVAL;
         }
@@ -1040,7 +1040,7 @@ static int dsi_short_read2_resp(u8 *buf, const struct mipi_dsi_msg *msg)
                 data[1] = buf[2];
                 return 2;
         } else {
-                pr_err("%s: read data does not match with rx_buf len %d\n",
+                pr_err("%s: read data does not match with rx_buf len %zu\n",
                         __func__, msg->rx_len);
                 return -EINVAL;
         }
@@ -1093,7 +1093,6 @@ static int dsi_cmd_dma_rx(struct msm_dsi_host *msm_host,
 {
         u32 *lp, *temp, data;
         int i, j = 0, cnt;
-        bool ack_error = false;
         u32 read_cnt;
         u8 reg[16];
         int repeated_bytes = 0;
@@ -1105,15 +1104,10 @@ static int dsi_cmd_dma_rx(struct msm_dsi_host *msm_host,
         if (cnt > 4)
                 cnt = 4; /* 4 x 32 bits registers only */
 
-        /* Calculate real read data count */
-        read_cnt = dsi_read(msm_host, 0x1d4) >> 16;
-
-        ack_error = (rx_byte == 4) ?
-                (read_cnt == 8) : /* short pkt + 4-byte error pkt */
-                (read_cnt == (pkt_size + 6 + 4)); /* long pkt+4-byte error pkt*/
-
-        if (ack_error)
-                read_cnt -= 4; /* Remove 4 byte error pkt */
+        if (rx_byte == 4)
+                read_cnt = 4;
+        else
+                read_cnt = pkt_size + 6;
 
         /*
          * In case of multiple reads from the panel, after the first read, there
@@ -1215,7 +1209,7 @@ static void dsi_err_worker(struct work_struct *work)
                 container_of(work, struct msm_dsi_host, err_work);
         u32 status = msm_host->err_work_state;
 
-        pr_err("%s: status=%x\n", __func__, status);
+        pr_err_ratelimited("%s: status=%x\n", __func__, status);
         if (status & DSI_ERR_STATE_MDP_FIFO_UNDERFLOW)
                 dsi_sw_reset_restore(msm_host);
 
@@ -1797,6 +1791,7 @@ int msm_dsi_host_cmd_rx(struct mipi_dsi_host *host,
         case MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT:
                 pr_err("%s: rx ACK_ERR_PACLAGE\n", __func__);
                 ret = 0;
+                break;
         case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_1BYTE:
         case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_1BYTE:
                 ret = dsi_short_read1_resp(buf, msg);
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index ee3ebcaa33f5..0a40f3c64e8b 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -462,7 +462,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
         struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
         struct drm_connector *connector = NULL;
         struct dsi_connector *dsi_connector;
-        int ret;
+        int ret, i;
 
         dsi_connector = devm_kzalloc(msm_dsi->dev->dev,
                                 sizeof(*dsi_connector), GFP_KERNEL);
@@ -495,6 +495,10 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
         if (ret)
                 goto fail;
 
+        for (i = 0; i < MSM_DSI_ENCODER_NUM; i++)
+                drm_mode_connector_attach_encoder(connector,
+                                                msm_dsi->encoders[i]);
+
         return connector;
 
 fail:
diff --git a/drivers/gpu/drm/msm/edp/edp_aux.c b/drivers/gpu/drm/msm/edp/edp_aux.c
index 5f5a84f6074c..208f9d47f82e 100644
--- a/drivers/gpu/drm/msm/edp/edp_aux.c
+++ b/drivers/gpu/drm/msm/edp/edp_aux.c
@@ -132,7 +132,7 @@ ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux, struct drm_dp_aux_msg *msg)
         /* msg sanity check */
         if ((native && (msg->size > AUX_CMD_NATIVE_MAX)) ||
                 (msg->size > AUX_CMD_I2C_MAX)) {
-                pr_err("%s: invalid msg: size(%d), request(%x)\n",
+                pr_err("%s: invalid msg: size(%zu), request(%x)\n",
                         __func__, msg->size, msg->request);
                 return -EINVAL;
         }
@@ -155,7 +155,7 @@ ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux, struct drm_dp_aux_msg *msg)
                  */
                 edp_write(aux->base + REG_EDP_AUX_TRANS_CTRL, 0);
                 msm_edp_aux_ctrl(aux, 1);
-                pr_err("%s: aux timeout, %d\n", __func__, ret);
+                pr_err("%s: aux timeout, %zd\n", __func__, ret);
                 goto unlock_exit;
         }
         DBG("completion");
diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index d8812e84da54..b4d1b469862a 100644
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -151,6 +151,8 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)
         if (ret)
                 goto fail;
 
+        drm_mode_connector_attach_encoder(connector, edp->encoder);
+
         return connector;
 
 fail:
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 0ec5abdba5c4..29e52d7c61c0 100644
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -1149,12 +1149,13 @@ int msm_edp_ctrl_init(struct msm_edp *edp)
         ctrl->aux = msm_edp_aux_init(dev, ctrl->base, &ctrl->drm_aux);
         if (!ctrl->aux || !ctrl->drm_aux) {
                 pr_err("%s:failed to init aux\n", __func__);
-                return ret;
+                return -ENOMEM;
         }
 
         ctrl->phy = msm_edp_phy_init(dev, ctrl->base);
         if (!ctrl->phy) {
                 pr_err("%s:failed to init phy\n", __func__);
+                ret = -ENOMEM;
                 goto err_destory_aux;
         }
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
index e001e6b2296a..8b9a7931b162 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
@@ -72,14 +72,13 @@ const struct mdp5_cfg_hw msm8x74_config = {
                 .base = { 0x12d00, 0x12e00, 0x12f00 },
         },
         .intf = {
-                .count = 4,
                 .base = { 0x12500, 0x12700, 0x12900, 0x12b00 },
-        },
-        .intfs = {
-                [0] = INTF_eDP,
-                [1] = INTF_DSI,
-                [2] = INTF_DSI,
-                [3] = INTF_HDMI,
+                .connect = {
+                        [0] = INTF_eDP,
+                        [1] = INTF_DSI,
+                        [2] = INTF_DSI,
+                        [3] = INTF_HDMI,
+                },
         },
         .max_clk = 200000000,
 };
@@ -142,14 +141,13 @@ const struct mdp5_cfg_hw apq8084_config = {
                 .base = { 0x12f00, 0x13000, 0x13100, 0x13200 },
         },
         .intf = {
-                .count = 5,
                 .base = { 0x12500, 0x12700, 0x12900, 0x12b00, 0x12d00 },
-        },
-        .intfs = {
-                [0] = INTF_eDP,
-                [1] = INTF_DSI,
-                [2] = INTF_DSI,
-                [3] = INTF_HDMI,
+                .connect = {
+                        [0] = INTF_eDP,
+                        [1] = INTF_DSI,
+                        [2] = INTF_DSI,
+                        [3] = INTF_HDMI,
+                },
         },
         .max_clk = 320000000,
 };
@@ -196,10 +194,12 @@ const struct mdp5_cfg_hw msm8x16_config = {
 
         },
         .intf = {
-                .count = 1, /* INTF_1 */
-                .base = { 0x6B800 },
+                .base = { 0x00000, 0x6b800 },
+                .connect = {
+                        [0] = INTF_DISABLED,
+                        [1] = INTF_DSI,
+                },
         },
-        /* TODO enable .intfs[] with [1] = INTF_DSI, once DSI is implemented */
         .max_clk = 320000000,
 };
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
index 3a551b0892d8..69349abe59f2 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
@@ -59,6 +59,11 @@ struct mdp5_smp_block {
 
 #define MDP5_INTF_NUM_MAX       5
 
+struct mdp5_intf_block {
+        uint32_t base[MAX_BASES];
+        u32 connect[MDP5_INTF_NUM_MAX]; /* array of enum mdp5_intf_type */
+};
+
 struct mdp5_cfg_hw {
         char  *name;
 
@@ -72,9 +77,7 @@ struct mdp5_cfg_hw {
         struct mdp5_sub_block dspp;
         struct mdp5_sub_block ad;
         struct mdp5_sub_block pp;
-        struct mdp5_sub_block intf;
-
-        u32 intfs[MDP5_INTF_NUM_MAX]; /* array of enum mdp5_intf_type */
+        struct mdp5_intf_block intf;
 
         uint32_t max_clk;
 };
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index dfa8beb9343a..bbacf9d2b738 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -206,8 +206,8 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,
 
 static int get_dsi_id_from_intf(const struct mdp5_cfg_hw *hw_cfg, int intf_num)
 {
-        const int intf_cnt = hw_cfg->intf.count;
-        const u32 *intfs = hw_cfg->intfs;
+        const enum mdp5_intf_type *intfs = hw_cfg->intf.connect;
+        const int intf_cnt = ARRAY_SIZE(hw_cfg->intf.connect);
         int id = 0, i;
 
         for (i = 0; i < intf_cnt; i++) {
@@ -228,7 +228,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)
         struct msm_drm_private *priv = dev->dev_private;
         const struct mdp5_cfg_hw *hw_cfg =
                                         mdp5_cfg_get_hw_config(mdp5_kms->cfg);
-        enum mdp5_intf_type intf_type = hw_cfg->intfs[intf_num];
+        enum mdp5_intf_type intf_type = hw_cfg->intf.connect[intf_num];
         struct drm_encoder *encoder;
         int ret = 0;
 
@@ -365,7 +365,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
         /* Construct encoders and modeset initialize connector devices
          * for each external display interface.
          */
-        for (i = 0; i < ARRAY_SIZE(hw_cfg->intfs); i++) {
+        for (i = 0; i < ARRAY_SIZE(hw_cfg->intf.connect); i++) {
                 ret = modeset_init_intf(mdp5_kms, i);
                 if (ret)
                         goto fail;
@@ -514,8 +514,8 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
          */
         mdp5_enable(mdp5_kms);
         for (i = 0; i < MDP5_INTF_NUM_MAX; i++) {
-                if (!config->hw->intf.base[i] ||
-                                mdp5_cfg_intf_is_virtual(config->hw->intfs[i]))
+                if (mdp5_cfg_intf_is_virtual(config->hw->intf.connect[i]) ||
+                                !config->hw->intf.base[i])
                         continue;
                 mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(i), 0);
         }
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 47f4dd407671..c80a6bee2b18 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -21,9 +21,11 @@
 
 static void msm_fb_output_poll_changed(struct drm_device *dev)
 {
+#ifdef CONFIG_DRM_MSM_FBDEV
         struct msm_drm_private *priv = dev->dev_private;
         if (priv->fbdev)
                 drm_fb_helper_hotplug_event(priv->fbdev);
+#endif
 }
 
 static const struct drm_mode_config_funcs mode_config_funcs = {
@@ -94,7 +96,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
         }
 
         if (reglog)
-                printk(KERN_DEBUG "IO:region %s %08x %08lx\n", dbgname, (u32)ptr, size);
+                printk(KERN_DEBUG "IO:region %s %p %08lx\n", dbgname, ptr, size);
 
         return ptr;
 }
@@ -102,7 +104,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
 void msm_writel(u32 data, void __iomem *addr)
 {
         if (reglog)
-                printk(KERN_DEBUG "IO:W %08x %08x\n", (u32)addr, data);
+                printk(KERN_DEBUG "IO:W %p %08x\n", addr, data);
         writel(data, addr);
 }
 
@@ -110,7 +112,7 @@ u32 msm_readl(const void __iomem *addr)
 {
         u32 val = readl(addr);
         if (reglog)
-                printk(KERN_ERR "IO:R %08x %08x\n", (u32)addr, val);
+                printk(KERN_ERR "IO:R %p %08x\n", addr, val);
         return val;
 }
 
@@ -143,8 +145,8 @@ static int msm_unload(struct drm_device *dev)
         if (gpu) {
                 mutex_lock(&dev->struct_mutex);
                 gpu->funcs->pm_suspend(gpu);
-                gpu->funcs->destroy(gpu);
                 mutex_unlock(&dev->struct_mutex);
+                gpu->funcs->destroy(gpu);
         }
 
         if (priv->vram.paddr) {
@@ -177,7 +179,7 @@ static int get_mdp_ver(struct platform_device *pdev)
         const struct of_device_id *match;
         match = of_match_node(match_types, dev->of_node);
         if (match)
-                return (int)match->data;
+                return (int)(unsigned long)match->data;
 #endif
         return 4;
 }
@@ -216,7 +218,7 @@ static int msm_init_vram(struct drm_device *dev)
                 if (ret)
                         return ret;
                 size = r.end - r.start;
-                DRM_INFO("using VRAM carveout: %lx@%08x\n", size, r.start);
+                DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);
         } else
 #endif
 
@@ -283,10 +285,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
 
         drm_mode_config_init(dev);
 
-        ret = msm_init_vram(dev);
-        if (ret)
-                goto fail;
-
         platform_set_drvdata(pdev, dev);
 
         /* Bind all our sub-components: */
@@ -294,6 +292,10 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
         if (ret)
                 return ret;
 
+        ret = msm_init_vram(dev);
+        if (ret)
+                goto fail;
+
         switch (get_mdp_ver(pdev)) {
         case 4:
                 kms = mdp4_kms_init(dev);
@@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
 
 static void msm_lastclose(struct drm_device *dev)
 {
+#ifdef CONFIG_DRM_MSM_FBDEV
         struct msm_drm_private *priv = dev->dev_private;
         if (priv->fbdev)
                 drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
+#endif
 }
 
 static irqreturn_t msm_irq(int irq, void *arg)
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 6b573e612f27..121713281417 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -172,8 +172,8 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
 {
         struct msm_drm_private *priv = dev->dev_private;
         struct msm_kms *kms = priv->kms;
-        struct msm_framebuffer *msm_fb;
-        struct drm_framebuffer *fb = NULL;
+        struct msm_framebuffer *msm_fb = NULL;
+        struct drm_framebuffer *fb;
         const struct msm_format *format;
         int ret, i, n;
         unsigned int hsub, vsub;
@@ -239,8 +239,7 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
         return fb;
 
 fail:
-        if (fb)
-                msm_framebuffer_destroy(fb);
+        kfree(msm_fb);
 
         return ERR_PTR(ret);
 }
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 479d8af72bcb..52839769eb6c 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -483,7 +483,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
         uint64_t off = drm_vma_node_start(&obj->vma_node);
 
         WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-        seq_printf(m, "%08x: %c(r=%u,w=%u) %2d (%2d) %08llx %p %d\n",
+        seq_printf(m, "%08x: %c(r=%u,w=%u) %2d (%2d) %08llx %p %zu\n",
                         msm_obj->flags, is_active(msm_obj) ? 'A' : 'I',
                         msm_obj->read_fence, msm_obj->write_fence,
                         obj->name, obj->refcount.refcount.counter,
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 7acdaa5688b7..7ac2f1997e4a 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -60,7 +60,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint32_t iova,
                 u32 pa = sg_phys(sg) - sg->offset;
                 size_t bytes = sg->length + sg->offset;
 
-                VERB("map[%d]: %08x %08x(%x)", i, iova, pa, bytes);
+                VERB("map[%d]: %08x %08x(%zx)", i, iova, pa, bytes);
 
                 ret = iommu_map(domain, da, pa, bytes, prot);
                 if (ret)
@@ -99,7 +99,7 @@ static int msm_iommu_unmap(struct msm_mmu *mmu, uint32_t iova,
                 if (unmapped < bytes)
                         return unmapped;
 
-                VERB("unmap[%d]: %08x(%x)", i, iova, bytes);
+                VERB("unmap[%d]: %08x(%zx)", i, iova, bytes);
 
                 BUG_ON(!PAGE_ALIGNED(bytes));
 
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 8171537dd7d1..1f14b908b221 100644
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -56,6 +56,6 @@ fail:
 void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)
 {
         if (ring->bo)
-                drm_gem_object_unreference(ring->bo);
+                drm_gem_object_unreference_unlocked(ring->bo);
         kfree(ring);
 }