From: Daniel Vetter <daniel@ffwll.ch> To: Claudio Suarez <cssk@net-c.es>, dri-devel@lists.freedesktop.org, 0day robot <lkp@intel.com>, LKML <linux-kernel@vger.kernel.org>, lkp@lists.01.org, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@linux.ie> Subject: Re: [PATCH v2] drm: fix error found in some cases after the patch d1af5cd86997 Date: Mon, 20 Dec 2021 18:11:31 +0100 [thread overview] Message-ID: <YcC5Qxnj8PvqnS6f@phenom.ffwll.local> (raw) In-Reply-To: <YcBKbn/9oqD2taCk@phenom.ffwll.local> 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 <oliver.sang@intel.com> > > 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 <cssk@net-c.es> > > 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
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: lkp@lists.01.org Subject: Re: [PATCH v2] drm: fix error found in some cases after the patch d1af5cd86997 Date: Mon, 20 Dec 2021 18:11:31 +0100 [thread overview] Message-ID: <YcC5Qxnj8PvqnS6f@phenom.ffwll.local> (raw) In-Reply-To: <YcBKbn/9oqD2taCk@phenom.ffwll.local> [-- Attachment #1: Type: text/plain, Size: 3006 bytes --] 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 <oliver.sang@intel.com> > > 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 <cssk@net-c.es> > > 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
next prev parent reply other threads:[~2021-12-20 17:11 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-26 10:49 [PATCH] drm: get rid of DRM_DEBUG_* log calls in drm core, files drm_a*.c Claudio Suarez 2021-11-26 15:45 ` Daniel Vetter 2021-11-26 21:57 ` Claudio Suarez 2021-11-28 14:20 ` [drm] d1af5cd869: BUG:kernel_NULL_pointer_dereference,address kernel test robot 2021-11-28 14:20 ` kernel test robot 2021-11-28 14:20 ` kernel test robot 2021-11-29 19:27 ` [PATCH] drm: fix error found in some cases after the patch d1af5cd86997 Claudio Suarez 2021-11-29 19:27 ` Claudio Suarez 2021-11-29 19:27 ` Claudio Suarez 2021-11-30 8:38 ` Daniel Vetter 2021-11-30 8:38 ` Daniel Vetter 2021-11-30 8:38 ` Daniel Vetter 2021-12-02 9:44 ` Claudio Suarez 2021-12-02 9:44 ` Claudio Suarez 2021-12-02 9:49 ` [PATCH] mock a drm_plane in igt_check_plane_state to make the test more robust Claudio Suarez 2021-12-02 9:49 ` Claudio Suarez 2021-12-02 9:51 ` [PATCH v2] drm: fix error found in some cases after the patch d1af5cd86997 Claudio Suarez 2021-12-02 9:51 ` Claudio Suarez 2021-12-20 9:18 ` Daniel Vetter 2021-12-20 9:18 ` Daniel Vetter 2021-12-20 9:18 ` Daniel Vetter 2021-12-20 17:11 ` Daniel Vetter [this message] 2021-12-20 17:11 ` Daniel Vetter 2021-12-21 22:55 ` Claudio Suarez 2021-12-21 22:55 ` Claudio Suarez
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=YcC5Qxnj8PvqnS6f@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=airlied@linux.ie \ --cc=cssk@net-c.es \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lkp@intel.com \ --cc=lkp@lists.01.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mripard@kernel.org \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.