* [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled
@ 2014-05-07 11:51 Rahul Sharma
2014-05-22 5:25 ` Rahul Sharma
2014-05-22 6:08 ` Sachin Kamat
0 siblings, 2 replies; 5+ messages in thread
From: Rahul Sharma @ 2014-05-07 11:51 UTC (permalink / raw)
To: dri-devel; +Cc: linux-samsung-soc, inki.dae, joshi, r.sh.open, Rahul Sharma
From: Rahul Sharma <Rahul.Sharma@samsung.com>
Allow to allocate non-contigous buffers when iommu is enabled.
Currently, it tries to allocates contigous buffer which consistently
fail for large buffers and then fall back to non contigous. Apart
from being slow, this implementation is also very noisy and fills
the screen with alloc fail logs.
Change-Id: I523e95aa308122ed2edc55e065ae6eb8be996541
Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
---
drivers/gpu/drm/exynos/exynos_drm_gem.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 5d88924..7136945 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -624,22 +624,20 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
args->pitch = args->width * ((args->bpp + 7) / 8);
args->size = args->pitch * args->height;
- exynos_gem_obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG |
- EXYNOS_BO_WC, args->size);
- /*
- * If physically contiguous memory allocation fails and if IOMMU is
- * supported then try to get buffer from non physically contiguous
- * memory area.
- */
- if (IS_ERR(exynos_gem_obj) && is_drm_iommu_supported(dev)) {
- dev_warn(dev->dev, "contiguous FB allocation failed, falling back to non-contiguous\n");
+ if (is_drm_iommu_supported(dev)) {
+ exynos_gem_obj = exynos_drm_gem_create(dev,
+ EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
+ args->size);
+ } else {
exynos_gem_obj = exynos_drm_gem_create(dev,
- EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
- args->size);
+ EXYNOS_BO_CONTIG | EXYNOS_BO_WC,
+ args->size);
}
- if (IS_ERR(exynos_gem_obj))
+ if (IS_ERR(exynos_gem_obj)) {
+ dev_warn(dev->dev, "FB allocation failed.\n");
return PTR_ERR(exynos_gem_obj);
+ }
ret = exynos_drm_gem_handle_create(&exynos_gem_obj->base, file_priv,
&args->handle);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled
2014-05-07 11:51 [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled Rahul Sharma
@ 2014-05-22 5:25 ` Rahul Sharma
2014-05-22 6:41 ` Inki Dae
2014-05-22 6:08 ` Sachin Kamat
1 sibling, 1 reply; 5+ messages in thread
From: Rahul Sharma @ 2014-05-22 5:25 UTC (permalink / raw)
To: dri-devel@lists.freedesktop.org
Cc: linux-samsung-soc, Inki Dae, sunil joshi, Rahul Sharma,
Rahul Sharma
Hi Inki,
The below fix doesn't affect the FB dev buffer allocation. IMO the scenario
where u-boot allocates the buffer is not disturbed.
Please review the implementation.
Regards,
Rahul Sharma.
On 7 May 2014 17:21, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>
> Allow to allocate non-contigous buffers when iommu is enabled.
> Currently, it tries to allocates contigous buffer which consistently
> fail for large buffers and then fall back to non contigous. Apart
> from being slow, this implementation is also very noisy and fills
> the screen with alloc fail logs.
>
> Change-Id: I523e95aa308122ed2edc55e065ae6eb8be996541
> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_gem.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> index 5d88924..7136945 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> @@ -624,22 +624,20 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
> args->pitch = args->width * ((args->bpp + 7) / 8);
> args->size = args->pitch * args->height;
>
> - exynos_gem_obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG |
> - EXYNOS_BO_WC, args->size);
> - /*
> - * If physically contiguous memory allocation fails and if IOMMU is
> - * supported then try to get buffer from non physically contiguous
> - * memory area.
> - */
> - if (IS_ERR(exynos_gem_obj) && is_drm_iommu_supported(dev)) {
> - dev_warn(dev->dev, "contiguous FB allocation failed, falling back to non-contiguous\n");
> + if (is_drm_iommu_supported(dev)) {
> + exynos_gem_obj = exynos_drm_gem_create(dev,
> + EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
> + args->size);
> + } else {
> exynos_gem_obj = exynos_drm_gem_create(dev,
> - EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
> - args->size);
> + EXYNOS_BO_CONTIG | EXYNOS_BO_WC,
> + args->size);
> }
>
> - if (IS_ERR(exynos_gem_obj))
> + if (IS_ERR(exynos_gem_obj)) {
> + dev_warn(dev->dev, "FB allocation failed.\n");
> return PTR_ERR(exynos_gem_obj);
> + }
>
> ret = exynos_drm_gem_handle_create(&exynos_gem_obj->base, file_priv,
> &args->handle);
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled
2014-05-22 5:25 ` Rahul Sharma
@ 2014-05-22 6:41 ` Inki Dae
0 siblings, 0 replies; 5+ messages in thread
From: Inki Dae @ 2014-05-22 6:41 UTC (permalink / raw)
To: Rahul Sharma
Cc: dri-devel@lists.freedesktop.org, linux-samsung-soc, sunil joshi,
Rahul Sharma
On 2014년 05월 22일 14:25, Rahul Sharma wrote:
> Hi Inki,
>
> The below fix doesn't affect the FB dev buffer allocation. IMO the scenario
> where u-boot allocates the buffer is not disturbed.
> Please review the implementation.
>
Applied.
Thanks,
Inki Dae
> Regards,
> Rahul Sharma.
>
> On 7 May 2014 17:21, Rahul Sharma <rahul.sharma@samsung.com> wrote:
>> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>>
>> Allow to allocate non-contigous buffers when iommu is enabled.
>> Currently, it tries to allocates contigous buffer which consistently
>> fail for large buffers and then fall back to non contigous. Apart
>> from being slow, this implementation is also very noisy and fills
>> the screen with alloc fail logs.
>>
>> Change-Id: I523e95aa308122ed2edc55e065ae6eb8be996541
>> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
>> ---
>> drivers/gpu/drm/exynos/exynos_drm_gem.c | 22 ++++++++++------------
>> 1 file changed, 10 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> index 5d88924..7136945 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> @@ -624,22 +624,20 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
>> args->pitch = args->width * ((args->bpp + 7) / 8);
>> args->size = args->pitch * args->height;
>>
>> - exynos_gem_obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG |
>> - EXYNOS_BO_WC, args->size);
>> - /*
>> - * If physically contiguous memory allocation fails and if IOMMU is
>> - * supported then try to get buffer from non physically contiguous
>> - * memory area.
>> - */
>> - if (IS_ERR(exynos_gem_obj) && is_drm_iommu_supported(dev)) {
>> - dev_warn(dev->dev, "contiguous FB allocation failed, falling back to non-contiguous\n");
>> + if (is_drm_iommu_supported(dev)) {
>> + exynos_gem_obj = exynos_drm_gem_create(dev,
>> + EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
>> + args->size);
>> + } else {
>> exynos_gem_obj = exynos_drm_gem_create(dev,
>> - EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
>> - args->size);
>> + EXYNOS_BO_CONTIG | EXYNOS_BO_WC,
>> + args->size);
>> }
>>
>> - if (IS_ERR(exynos_gem_obj))
>> + if (IS_ERR(exynos_gem_obj)) {
>> + dev_warn(dev->dev, "FB allocation failed.\n");
>> return PTR_ERR(exynos_gem_obj);
>> + }
>>
>> ret = exynos_drm_gem_handle_create(&exynos_gem_obj->base, file_priv,
>> &args->handle);
>> --
>> 1.7.9.5
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled
2014-05-07 11:51 [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled Rahul Sharma
2014-05-22 5:25 ` Rahul Sharma
@ 2014-05-22 6:08 ` Sachin Kamat
2014-05-22 6:32 ` Rahul Sharma
1 sibling, 1 reply; 5+ messages in thread
From: Sachin Kamat @ 2014-05-22 6:08 UTC (permalink / raw)
To: Rahul Sharma
Cc: dri-devel@lists.freedesktop.org, linux-samsung-soc, Inki Dae,
sunil joshi, Rahul Sharma
Hi Rahul,
On 7 May 2014 17:21, Rahul Sharma <rahul.sharma@samsung.com> wrote:
> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>
> Allow to allocate non-contigous buffers when iommu is enabled.
> Currently, it tries to allocates contigous buffer which consistently
> fail for large buffers and then fall back to non contigous. Apart
> from being slow, this implementation is also very noisy and fills
> the screen with alloc fail logs.
>
> Change-Id: I523e95aa308122ed2edc55e065ae6eb8be996541
Not needed.
> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_gem.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> index 5d88924..7136945 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> @@ -624,22 +624,20 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
> args->pitch = args->width * ((args->bpp + 7) / 8);
> args->size = args->pitch * args->height;
>
> - exynos_gem_obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG |
> - EXYNOS_BO_WC, args->size);
> - /*
> - * If physically contiguous memory allocation fails and if IOMMU is
> - * supported then try to get buffer from non physically contiguous
> - * memory area.
> - */
This comment could be retained after suitable modification to reflect
current logic.
> - if (IS_ERR(exynos_gem_obj) && is_drm_iommu_supported(dev)) {
> - dev_warn(dev->dev, "contiguous FB allocation failed, falling back to non-contiguous\n");
> + if (is_drm_iommu_supported(dev)) {
> + exynos_gem_obj = exynos_drm_gem_create(dev,
> + EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
> + args->size);
> + } else {
> exynos_gem_obj = exynos_drm_gem_create(dev,
> - EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
> - args->size);
> + EXYNOS_BO_CONTIG | EXYNOS_BO_WC,
> + args->size);
> }
>
> - if (IS_ERR(exynos_gem_obj))
> + if (IS_ERR(exynos_gem_obj)) {
> + dev_warn(dev->dev, "FB allocation failed.\n");
> return PTR_ERR(exynos_gem_obj);
> + }
>
> ret = exynos_drm_gem_handle_create(&exynos_gem_obj->base, file_priv,
> &args->handle);
> --
> 1.7.9.5
Otherwise looks good.
Reviewed-by: Sachin Kamat <sachin.kamat@linaro.org>
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled
2014-05-22 6:08 ` Sachin Kamat
@ 2014-05-22 6:32 ` Rahul Sharma
0 siblings, 0 replies; 5+ messages in thread
From: Rahul Sharma @ 2014-05-22 6:32 UTC (permalink / raw)
To: Sachin Kamat
Cc: linux-samsung-soc, sunil joshi, dri-devel@lists.freedesktop.org
Thanks Sachin.
On 22 May 2014 11:38, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Hi Rahul,
>
> On 7 May 2014 17:21, Rahul Sharma <rahul.sharma@samsung.com> wrote:
>> From: Rahul Sharma <Rahul.Sharma@samsung.com>
>>
>> Allow to allocate non-contigous buffers when iommu is enabled.
>> Currently, it tries to allocates contigous buffer which consistently
>> fail for large buffers and then fall back to non contigous. Apart
>> from being slow, this implementation is also very noisy and fills
>> the screen with alloc fail logs.
>>
>> Change-Id: I523e95aa308122ed2edc55e065ae6eb8be996541
>
> Not needed.
>
>> Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
>> ---
>> drivers/gpu/drm/exynos/exynos_drm_gem.c | 22 ++++++++++------------
>> 1 file changed, 10 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> index 5d88924..7136945 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
>> @@ -624,22 +624,20 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
>> args->pitch = args->width * ((args->bpp + 7) / 8);
>> args->size = args->pitch * args->height;
>>
>> - exynos_gem_obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG |
>> - EXYNOS_BO_WC, args->size);
>> - /*
>> - * If physically contiguous memory allocation fails and if IOMMU is
>> - * supported then try to get buffer from non physically contiguous
>> - * memory area.
>> - */
>
> This comment could be retained after suitable modification to reflect
> current logic.
>
ok. Posting V2.
Regards,
Rahul Sharma
>> - if (IS_ERR(exynos_gem_obj) && is_drm_iommu_supported(dev)) {
>> - dev_warn(dev->dev, "contiguous FB allocation failed, falling back to non-contiguous\n");
>> + if (is_drm_iommu_supported(dev)) {
>> + exynos_gem_obj = exynos_drm_gem_create(dev,
>> + EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
>> + args->size);
>> + } else {
>> exynos_gem_obj = exynos_drm_gem_create(dev,
>> - EXYNOS_BO_NONCONTIG | EXYNOS_BO_WC,
>> - args->size);
>> + EXYNOS_BO_CONTIG | EXYNOS_BO_WC,
>> + args->size);
>> }
>>
>> - if (IS_ERR(exynos_gem_obj))
>> + if (IS_ERR(exynos_gem_obj)) {
>> + dev_warn(dev->dev, "FB allocation failed.\n");
>> return PTR_ERR(exynos_gem_obj);
>> + }
>>
>> ret = exynos_drm_gem_handle_create(&exynos_gem_obj->base, file_priv,
>> &args->handle);
>> --
>> 1.7.9.5
>
> Otherwise looks good.
> Reviewed-by: Sachin Kamat <sachin.kamat@linaro.org>
>
> --
> With warm regards,
> Sachin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-22 6:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 11:51 [PATCH] drm/exynos: allocate non-contigous buffers when iommu is enabled Rahul Sharma
2014-05-22 5:25 ` Rahul Sharma
2014-05-22 6:41 ` Inki Dae
2014-05-22 6:08 ` Sachin Kamat
2014-05-22 6:32 ` Rahul Sharma
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.