diff options
| author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2015-07-17 17:08:51 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-21 09:25:48 +0200 |
| commit | dd72bde05de5d68d56e59698f7f2c102afce904b (patch) | |
| tree | 6bf5e17757b7dde3032bb16213c8526973170699 /drivers/gpu/drm/i915/i915_gem_render_state.c | |
| parent | 2617268ff9d8f8b6901a07962c985d774b999e58 (diff) | |
| download | talos-obmc-linux-dd72bde05de5d68d56e59698f7f2c102afce904b.tar.gz talos-obmc-linux-dd72bde05de5d68d56e59698f7f2c102afce904b.zip | |
drm/i915: Do kunmap if renderstate parsing fails
Kunmap the renderstate page on error path.
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_render_state.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_render_state.c | 10 |
1 files 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 a0201fc94d25..b6492fe3722b 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) |
