* [PATCH] drm/i915: Do kunmap if renderstate parsing fails
@ 2015-07-16 14:36 Mika Kuoppala
2015-07-16 15:21 ` Siluvery, Arun
2015-07-20 2:51 ` shuang.he
0 siblings, 2 replies; 3+ messages in thread
From: Mika Kuoppala @ 2015-07-16 14:36 UTC (permalink / raw)
To: intel-gfx
Kunmap the renderstate page on error path.
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
drivers/gpu/drm/i915/i915_gem_render_state.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index a0201fc..b6492fe 100644
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -96,8 +96,10 @@ static int render_state_setup(struct render_state *so)
s = lower_32_bits(r);
if (so->gen >= 8) {
if (i + 1 >= rodata->batch_items ||
- rodata->batch[i + 1] != 0)
- return -EINVAL;
+ rodata->batch[i + 1] != 0) {
+ ret = -EINVAL;
+ goto err_out;
+ }
d[i++] = s;
s = upper_32_bits(r);
@@ -120,6 +122,10 @@ static int render_state_setup(struct render_state *so)
}
return 0;
+
+err_out:
+ kunmap(page);
+ return ret;
}
void i915_gem_render_state_fini(struct render_state *so)
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Do kunmap if renderstate parsing fails
2015-07-16 14:36 [PATCH] drm/i915: Do kunmap if renderstate parsing fails Mika Kuoppala
@ 2015-07-16 15:21 ` Siluvery, Arun
2015-07-20 2:51 ` shuang.he
1 sibling, 0 replies; 3+ messages in thread
From: Siluvery, Arun @ 2015-07-16 15:21 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
On 16/07/2015 15:36, Mika Kuoppala wrote:
> Kunmap the renderstate page on error path.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_render_state.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
> index a0201fc..b6492fe 100644
> --- a/drivers/gpu/drm/i915/i915_gem_render_state.c
> +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
> @@ -96,8 +96,10 @@ static int render_state_setup(struct render_state *so)
> s = lower_32_bits(r);
> if (so->gen >= 8) {
> if (i + 1 >= rodata->batch_items ||
> - rodata->batch[i + 1] != 0)
> - return -EINVAL;
> + rodata->batch[i + 1] != 0) {
> + ret = -EINVAL;
> + goto err_out;
> + }
>
> d[i++] = s;
> s = upper_32_bits(r);
> @@ -120,6 +122,10 @@ static int render_state_setup(struct render_state *so)
> }
>
> return 0;
> +
> +err_out:
> + kunmap(page);
> + return ret;
> }
>
> void i915_gem_render_state_fini(struct render_state *so)
>
Looks good to me,
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
regards
Arun
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Do kunmap if renderstate parsing fails
2015-07-16 14:36 [PATCH] drm/i915: Do kunmap if renderstate parsing fails Mika Kuoppala
2015-07-16 15:21 ` Siluvery, Arun
@ 2015-07-20 2:51 ` shuang.he
1 sibling, 0 replies; 3+ messages in thread
From: shuang.he @ 2015-07-20 2:51 UTC (permalink / raw)
To: shuang.he, julianx.dumez, christophe.sureau, lei.a.liu,
intel-gfx, mika.kuoppala
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6815
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302
SNB 315/315 315/315
IVB 342/342 342/342
BYT 285/285 285/285
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-20 2:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-16 14:36 [PATCH] drm/i915: Do kunmap if renderstate parsing fails Mika Kuoppala
2015-07-16 15:21 ` Siluvery, Arun
2015-07-20 2:51 ` shuang.he
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.