Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vmwgfx: Use VMW_DEBUG_KMS for vmwgfx mode-setting user errors

For errors during layout change ioctl use VMW_DEBUG_KMS instead of
DRM_ERROR.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

authored by

Deepak Rawat and committed by
Thomas Hellstrom
9bb34e90 745adc3f

+10 -5
+10 -5
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
··· 1462 1462 if (dev_priv->active_display_unit == vmw_du_screen_target && 1463 1463 (drm_rect_width(&rects[i]) > dev_priv->stdu_max_width || 1464 1464 drm_rect_height(&rects[i]) > dev_priv->stdu_max_height)) { 1465 - DRM_ERROR("Screen size not supported.\n"); 1465 + VMW_DEBUG_KMS("Screen size not supported.\n"); 1466 1466 return -EINVAL; 1467 1467 } 1468 1468 ··· 1486 1486 * limit on primary bounding box 1487 1487 */ 1488 1488 if (pixel_mem > dev_priv->prim_bb_mem) { 1489 - DRM_ERROR("Combined output size too large.\n"); 1489 + VMW_DEBUG_KMS("Combined output size too large.\n"); 1490 1490 return -EINVAL; 1491 1491 } 1492 1492 ··· 1496 1496 bb_mem = (u64) bounding_box.x2 * bounding_box.y2 * 4; 1497 1497 1498 1498 if (bb_mem > dev_priv->prim_bb_mem) { 1499 - DRM_ERROR("Topology is beyond supported limits.\n"); 1499 + VMW_DEBUG_KMS("Topology is beyond supported limits.\n"); 1500 1500 return -EINVAL; 1501 1501 } 1502 1502 } ··· 1645 1645 struct vmw_connector_state *vmw_conn_state; 1646 1646 1647 1647 if (!du->pref_active && new_crtc_state->enable) { 1648 + VMW_DEBUG_KMS("Enabling a disabled display unit\n"); 1648 1649 ret = -EINVAL; 1649 1650 goto clean; 1650 1651 } ··· 1702 1701 return ret; 1703 1702 1704 1703 ret = vmw_kms_check_implicit(dev, state); 1705 - if (ret) 1704 + if (ret) { 1705 + VMW_DEBUG_KMS("Invalid implicit state\n"); 1706 1706 return ret; 1707 + } 1707 1708 1708 1709 for_each_new_crtc_in_state(state, crtc, crtc_state, i) { 1709 1710 if (drm_atomic_crtc_needs_modeset(crtc_state)) ··· 2396 2393 if (drm_rects[i].x1 < 0 || drm_rects[i].y1 < 0 || 2397 2394 drm_rects[i].x2 > mode_config->max_width || 2398 2395 drm_rects[i].y2 > mode_config->max_height) { 2399 - DRM_ERROR("Invalid GUI layout.\n"); 2396 + VMW_DEBUG_KMS("Invalid layout %d %d %d %d\n", 2397 + drm_rects[i].x1, drm_rects[i].y1, 2398 + drm_rects[i].x2, drm_rects[i].y2); 2400 2399 ret = -EINVAL; 2401 2400 goto out_free; 2402 2401 }