[PATCH] drm/i915: pin: delete duplicate check in intel_pin_and_fence_fb_obj()
Rodrigo Vivi
rodrigo.vivi at intel.com
Tue Nov 9 23:00:20 UTC 2021
On Tue, Nov 09, 2021 at 02:48:50PM +0300, Dan Carpenter wrote:
> The "ret" variable is checked on the previous line so we know it's
> zero. No need to check again.
>
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
and pushed.
thanks for the patch
> ---
> drivers/gpu/drm/i915/display/intel_fb_pin.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> index 3f77f3013584..3b20f69e0240 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> @@ -142,13 +142,11 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
> if (ret)
> goto err;
>
> - if (!ret) {
> - vma = i915_gem_object_pin_to_display_plane(obj, &ww, alignment,
> - view, pinctl);
> - if (IS_ERR(vma)) {
> - ret = PTR_ERR(vma);
> - goto err_unpin;
> - }
> + vma = i915_gem_object_pin_to_display_plane(obj, &ww, alignment,
> + view, pinctl);
> + if (IS_ERR(vma)) {
> + ret = PTR_ERR(vma);
> + goto err_unpin;
> }
>
> if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
> --
> 2.20.1
>
More information about the dri-devel
mailing list