On Mon, Nov 29, 2021 at 08:27:45PM +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. Fix it.
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") Signed-off-by: Claudio Suarez cssk@net-c.es
drivers/gpu/drm/drm_atomic_helper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index aef2fbd676e5..8bd4472d7949 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -312,7 +312,7 @@ update_connector_routing(struct drm_atomic_state *state,
if (!new_connector_state->crtc) { drm_dbg_atomic(connector->dev, "Disabling [CONNECTOR:%d:%s]\n",
connector->base.id, connector->name);
connector->base.id, connector->name);
Can you pls split this checkpatch fix out?
set_best_encoder(state, new_connector_state, NULL);@@ -805,6 +805,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, bool can_update_disabled) { struct drm_framebuffer *fb = plane_state->fb;
- struct drm_device *dev = plane_state->plane ? plane_state->plane->dev : NULL;
For real drivers plane_state->plane really should never be NULL, and looking at the test report we blow up in an selftest. I think the right fix here is to make the selftest more robust and also mock a drm_plane (with a NULL plane->dev pointer, that should be fine).
Can you pls spin that and test it with the selftests enabled in the config?
Thanks, Daniel
struct drm_rect *src = &plane_state->src; struct drm_rect *dst = &plane_state->dst; unsigned int rotation = plane_state->rotation; @@ -828,8 +829,7 @@ 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(dev, "Cannot update plane of a disabled CRTC.\n");@@ -839,8 +839,7 @@ 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(dev, "Invalid scaling of plane\n");@@ -864,8 +863,7 @@ 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(dev, "Plane must cover entire CRTC\n");-- 2.33.0