* [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock
@ 2018-05-03 12:00 Daniel Mack
2018-05-03 12:00 ` [PATCH RESEND 2/2] drm/msm: use correct aspace pointer in msm_gem_put_iova() Daniel Mack
2018-05-03 12:24 ` [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Rob Clark
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Mack @ 2018-05-03 12:00 UTC (permalink / raw)
To: robdclark, ssusheel, architt, simhavcs
Cc: linux-arm-msm, Rob Clark, Daniel Mack, dri-devel
This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
buffer resources from struct_mutex").
Signed-off-by: Daniel Mack <daniel@zonque.org>
Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
Cc: Rob Clark <rclark@redhat.com>
Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
---
I'm resending these two patches as I got no reply last time.
drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 0f7324a686ca..27637d8a99ff 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -994,7 +994,6 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
ret = msm_gem_get_iova(msm_host->tx_gem_obj,
priv->kms->aspace, &iova);
- mutex_unlock(&dev->struct_mutex);
if (ret) {
pr_err("%s: failed to get iova, %d\n", __func__, ret);
return ret;
--
2.14.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH RESEND 2/2] drm/msm: use correct aspace pointer in msm_gem_put_iova()
2018-05-03 12:00 [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Daniel Mack
@ 2018-05-03 12:00 ` Daniel Mack
2018-05-03 12:24 ` [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Rob Clark
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Mack @ 2018-05-03 12:00 UTC (permalink / raw)
To: robdclark, ssusheel, architt, simhavcs
Cc: linux-arm-msm, Daniel Mack, dri-devel
Even though msm_gem_put_iova() is currently a NOP function, the caller
should pass in the address space pointer it used to obtain the object.
Other call sites were changed in 8bdcd949bbe7e ("drm/msm: pass
address-space to _get_iova() and friends"), but this one seems to have
been forgotten.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Cc: Rob Clark <robdclark@gmail.com>
---
drivers/gpu/drm/msm/dsi/dsi_host.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index c9b14948dc25..f844ca1f8e5a 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1059,9 +1059,10 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
static void dsi_tx_buf_free(struct msm_dsi_host *msm_host)
{
struct drm_device *dev = msm_host->dev;
+ struct msm_drm_private *priv = dev->dev_private;
if (msm_host->tx_gem_obj) {
- msm_gem_put_iova(msm_host->tx_gem_obj, 0);
+ msm_gem_put_iova(msm_host->tx_gem_obj, priv->kms->aspace);
drm_gem_object_put_unlocked(msm_host->tx_gem_obj);
msm_host->tx_gem_obj = NULL;
}
--
2.14.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock
2018-05-03 12:00 [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Daniel Mack
2018-05-03 12:00 ` [PATCH RESEND 2/2] drm/msm: use correct aspace pointer in msm_gem_put_iova() Daniel Mack
@ 2018-05-03 12:24 ` Rob Clark
2018-05-03 17:59 ` Daniel Mack
1 sibling, 1 reply; 4+ messages in thread
From: Rob Clark @ 2018-05-03 12:24 UTC (permalink / raw)
To: Daniel Mack
Cc: Rob Clark, linux-arm-msm, dri-devel, Sushmita Susheelendra,
Vinay Simha
On Thu, May 3, 2018 at 8:00 AM, Daniel Mack <daniel@zonque.org> wrote:
> This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
> buffer resources from struct_mutex").
>
> Signed-off-by: Daniel Mack <daniel@zonque.org>
> Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
> Cc: Rob Clark <rclark@redhat.com>
> Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
> ---
> I'm resending these two patches as I got no reply last time.
I've applied these two to msm-next. Sorry I missed them before...
for some reason they don't seem to show up in the dri-devel
patchworks[1]
BR,
-R
[1] https://patchwork.freedesktop.org/project/dri-devel/series/
>
> drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
> index 0f7324a686ca..27637d8a99ff 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
> @@ -994,7 +994,6 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
>
> ret = msm_gem_get_iova(msm_host->tx_gem_obj,
> priv->kms->aspace, &iova);
> - mutex_unlock(&dev->struct_mutex);
> if (ret) {
> pr_err("%s: failed to get iova, %d\n", __func__, ret);
> return ret;
> --
> 2.14.3
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock
2018-05-03 12:24 ` [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Rob Clark
@ 2018-05-03 17:59 ` Daniel Mack
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Mack @ 2018-05-03 17:59 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, linux-arm-msm, dri-devel, Sushmita Susheelendra,
Vinay Simha
On Thursday, May 03, 2018 02:24 PM, Rob Clark wrote:
> On Thu, May 3, 2018 at 8:00 AM, Daniel Mack <daniel@zonque.org> wrote:
>> This regression stems from 0e08270a1f01 ("drm/msm: Separate locking of
>> buffer resources from struct_mutex").
>>
>> Signed-off-by: Daniel Mack <daniel@zonque.org>
>> Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
>> Cc: Rob Clark <rclark@redhat.com>
>> Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources from struct_mutex")
>> ---
>> I'm resending these two patches as I got no reply last time.
>
> I've applied these two to msm-next. Sorry I missed them before...
> for some reason they don't seem to show up in the dri-devel
> patchworks[1]
No problem, and thanks for applying them :)
Daniel
>
> BR,
> -R
>
> [1] https://patchwork.freedesktop.org/project/dri-devel/series/
>
>>
>> drivers/gpu/drm/msm/dsi/dsi_host.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> index 0f7324a686ca..27637d8a99ff 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
>> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> @@ -994,7 +994,6 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)
>>
>> ret = msm_gem_get_iova(msm_host->tx_gem_obj,
>> priv->kms->aspace, &iova);
>> - mutex_unlock(&dev->struct_mutex);
>> if (ret) {
>> pr_err("%s: failed to get iova, %d\n", __func__, ret);
>> return ret;
>> --
>> 2.14.3
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-03 17:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-03 12:00 [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Daniel Mack
2018-05-03 12:00 ` [PATCH RESEND 2/2] drm/msm: use correct aspace pointer in msm_gem_put_iova() Daniel Mack
2018-05-03 12:24 ` [PATCH RESEND 1/2] drm/msm: remove unbalanced mutex unlock Rob Clark
2018-05-03 17:59 ` Daniel Mack
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.