From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C35B9C00523 for ; Wed, 8 Jan 2020 11:06:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A095920673 for ; Wed, 8 Jan 2020 11:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728034AbgAHLGw (ORCPT ); Wed, 8 Jan 2020 06:06:52 -0500 Received: from mga12.intel.com ([192.55.52.136]:20155 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726276AbgAHLGw (ORCPT ); Wed, 8 Jan 2020 06:06:52 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 03:06:51 -0800 X-IronPort-AV: E=Sophos;i="5.69,409,1571727600"; d="scan'208";a="215920519" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 03:06:48 -0800 From: Jani Nikula To: "Gustavo A. R. Silva" , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , Manasi Navare , Matt Roper Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: Re: [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR In-Reply-To: <20200106070152.GA13299@embeddedor> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200106070152.GA13299@embeddedor> Date: Wed, 08 Jan 2020 13:06:45 +0200 Message-ID: <87pnfuqkai.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 06 Jan 2020, "Gustavo A. R. Silva" wrote: > Fix inconsistent IS_ERR and PTR_ERR in intel_modeset_all_tiles(). > > The proper pointer to be passed as argument is crtc_state. > > This bug was detected with the help of Coccinelle. Thanks, already fixed by Dan in commit 953cac3ec55f ("drm/i915: fix an error code in intel_modeset_all_tiles()"). BR, Jani. > > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset") > Signed-off-by: Gustavo A. R. Silva > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index da5266e76738..a96bee699a5e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -14424,7 +14424,7 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id) > crtc_state = drm_atomic_get_crtc_state(&state->base, > conn_state->crtc); > if (IS_ERR(crtc_state)) { > - ret = PTR_ERR(conn_state); > + ret = PTR_ERR(crtc_state); > break; > } > crtc_state->mode_changed = true; -- Jani Nikula, Intel Open Source Graphics Center