Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0EBCC433EF for ; Mon, 20 Dec 2021 17:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235019AbhLTRLl (ORCPT ); Mon, 20 Dec 2021 12:11:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233007AbhLTRLg (ORCPT ); Mon, 20 Dec 2021 12:11:36 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5775C061574 for ; Mon, 20 Dec 2021 09:11:35 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id s1so21548169wrg.1 for ; Mon, 20 Dec 2021 09:11:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=orQKzw/rIFyU2i9qhJC15lEG6dnafgAQONkmIMH+/0g=; b=VKDQD1GNQ3pyjeVnNux3ttr/G2JeM+ZQwGii5FIGGzSV7twBVAETJ57OLYIy2hq4S2 uhvXSqDD02I4NO22Ug4v9qVuOilgiVd0LaIFaiB3XY4+upOFM2tX4LOjwVp/ymQCwUm2 /yyd0rcR/MAQHzDuQrH75kNq5MBG9EK8UVwzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=orQKzw/rIFyU2i9qhJC15lEG6dnafgAQONkmIMH+/0g=; b=rOLmHza+tq2xMjkGsaTETLQiw6xPhtg5+Ls1ExvF3j5PVolOvb2y5hEKmxU9CEBhy+ 4ERc/4Pl8Nbfdiu1l2Sj6IA8VjKp1W6LchqabFGD9XowlxHwL+6m2IBGQyGoXCIjRb4Q /0F/koSsTSEt4CKB9VodOR8JeKYHYreKvuMZ4mkWEXGNibdxOQ6SNUl8c/Q2AT5cThHg jbvKvLGI0REXwOfwR3jt+4N10sUQTgHcUsWRFoBZlibd/4HbVcCLedWwtl5fd8O/7jH6 G+0wKseN73pOLazj8nyrmozZynXA97ZhuITpFoRC+JOdTHFbpRZJiz8LMX5/U98Ei27H wHFw== X-Gm-Message-State: AOAM531K81sOuWORw+i8fQWFs2s2qJkIcJrFwiWMasBxzgI6kdfFfGnR TDHa4LrtsIfPhBK8KyyTcr65Tg== X-Google-Smtp-Source: ABdhPJzWvClYYKmbqkQeNOh1Eh5QiBVjHn3DsSK2NbR0Vcu5w9gSZkyxdlgFDJZTWLzL/VergC1rjw== X-Received: by 2002:adf:e0c8:: with SMTP id m8mr14299950wri.113.1640020294365; Mon, 20 Dec 2021 09:11:34 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id m17sm446927wmq.31.2021.12.20.09.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 09:11:33 -0800 (PST) Date: Mon, 20 Dec 2021 18:11:31 +0100 From: Daniel Vetter To: Claudio Suarez , dri-devel@lists.freedesktop.org, 0day robot , LKML , lkp@lists.01.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie Subject: Re: [PATCH v2] drm: fix error found in some cases after the patch d1af5cd86997 Message-ID: Mail-Followup-To: Claudio Suarez , dri-devel@lists.freedesktop.org, 0day robot , LKML , lkp@lists.01.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie References: <20211128142015.GB5295@xsang-OptiPlex-9020> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 20, 2021 at 10:18:38AM +0100, Daniel Vetter wrote: > On Thu, Dec 02, 2021 at 10:51:12AM +0100, Claudio Suarez wrote: > > The patch d1af5cd86997 ("drm: get rid of DRM_DEBUG_* log > > calls in drm core, files drm_a*.c") fails when the drm_device > > cannot be found in the parameter plane_state->crtc. > > Fix it using plane_state->plane. > > > > Reported-by: kernel test robot > > Fixes: d1af5cd86997 ("drm: get rid of DRM_DEBUG_* log calls in drm core, files drm_a*.c") My scrip complained about the fixes line, so I fixed it. I guess you've used the sha1 from your tree, not from upstream? Please always use upstream sha1 when referencing commits. Anyway patches are now pushed. Cheers, Daniel > > Signed-off-by: Claudio Suarez > > Sorry I missed these two patches, but both applied now, thanks. > -Daniel > > > --- > > drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > > index aef2fbd676e5..a7a05e1e26bb 100644 > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > @@ -828,8 +828,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, > > } > > > > if (!crtc_state->enable && !can_update_disabled) { > > - drm_dbg_kms(plane_state->crtc->dev, > > - "Cannot update plane of a disabled CRTC.\n"); > > + drm_dbg_kms(plane_state->plane->dev, > > + "Cannot update plane of a disabled CRTC.\n"); > > return -EINVAL; > > } > > > > @@ -839,8 +839,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, > > hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale); > > vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale); > > if (hscale < 0 || vscale < 0) { > > - drm_dbg_kms(plane_state->crtc->dev, > > - "Invalid scaling of plane\n"); > > + drm_dbg_kms(plane_state->plane->dev, > > + "Invalid scaling of plane\n"); > > drm_rect_debug_print("src: ", &plane_state->src, true); > > drm_rect_debug_print("dst: ", &plane_state->dst, false); > > return -ERANGE; > > @@ -864,8 +864,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, > > return 0; > > > > if (!can_position && !drm_rect_equals(dst, &clip)) { > > - drm_dbg_kms(plane_state->crtc->dev, > > - "Plane must cover entire CRTC\n"); > > + drm_dbg_kms(plane_state->plane->dev, > > + "Plane must cover entire CRTC\n"); > > drm_rect_debug_print("dst: ", dst, false); > > drm_rect_debug_print("clip: ", &clip, false); > > return -EINVAL; > > -- > > 2.33.0 > > > > > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch