Commit 0ae55a4c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/modes: switch to drm device based error logging 



Prefer drm_err() and drm_dbg_kms() over DRM_ERROR() and DRM_DEBUG_KMS().

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/3342dd2e98fedd618e5aeef26c44044cd32ead20.1712568037.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 98618005

drivers/gpu/drm/drm_modes.c

+17 −16
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (hact_duration_ns < params->hact_ns.min ||

	     hact_duration_ns > params->hact_ns.max)) {

		DRM_ERROR("Invalid horizontal active area duration: %uns (min: %u, max %u)\n",

		drm_err(dev, "Invalid horizontal active area duration: %uns (min: %u, max %u)\n",

			hact_duration_ns, params->hact_ns.min, params->hact_ns.max);

		return -EINVAL;

	}
@@ -385,7 +385,7 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (hblk_duration_ns < params->hblk_ns.min ||

	     hblk_duration_ns > params->hblk_ns.max)) {

		DRM_ERROR("Invalid horizontal blanking duration: %uns (min: %u, max %u)\n",

		drm_err(dev, "Invalid horizontal blanking duration: %uns (min: %u, max %u)\n",

			hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max);

		return -EINVAL;

	}
@@ -397,7 +397,7 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (hslen_duration_ns < params->hslen_ns.min ||

	     hslen_duration_ns > params->hslen_ns.max)) {

		DRM_ERROR("Invalid horizontal sync duration: %uns (min: %u, max %u)\n",

		drm_err(dev, "Invalid horizontal sync duration: %uns (min: %u, max %u)\n",

			hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max);

		return -EINVAL;

	}
@@ -409,7 +409,8 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (porches_duration_ns > (params->hfp_ns.max + params->hbp_ns.max) ||

	     porches_duration_ns < (params->hfp_ns.min + params->hbp_ns.min))) {

		DRM_ERROR("Invalid horizontal porches duration: %uns\n", porches_duration_ns);

		drm_err(dev, "Invalid horizontal porches duration: %uns\n",

			porches_duration_ns);

		return -EINVAL;

	}
@@ -431,7 +432,7 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (hfp_duration_ns < params->hfp_ns.min ||

	     hfp_duration_ns > params->hfp_ns.max)) {

		DRM_ERROR("Invalid horizontal front porch duration: %uns (min: %u, max %u)\n",

		drm_err(dev, "Invalid horizontal front porch duration: %uns (min: %u, max %u)\n",

			hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max);

		return -EINVAL;

	}
@@ -443,7 +444,7 @@ static int fill_analog_mode(struct drm_device *dev, 
	if (!bt601 &&

	    (hbp_duration_ns < params->hbp_ns.min ||

	     hbp_duration_ns > params->hbp_ns.max)) {

		DRM_ERROR("Invalid horizontal back porch duration: %uns (min: %u, max %u)\n",

		drm_err(dev, "Invalid horizontal back porch duration: %uns (min: %u, max %u)\n",

			hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max);

		return -EINVAL;

	}
@@ -495,7 +496,7 @@ static int fill_analog_mode(struct drm_device *dev, 


	vtotal = vactive + vfp + vslen + vbp;

	if (params->num_lines != vtotal) {

		DRM_ERROR("Invalid vertical total: %upx (expected %upx)\n",

		drm_err(dev, "Invalid vertical total: %upx (expected %upx)\n",

			vtotal, params->num_lines);

		return -EINVAL;

	}
@@ -1813,7 +1814,7 @@ void drm_mode_prune_invalid(struct drm_device *dev, 
			}

			if (verbose) {

				drm_mode_debug_printmodeline(mode);

				DRM_DEBUG_KMS("Not using %s mode: %s\n",

				drm_dbg_kms(dev, "Not using %s mode: %s\n",

					    mode->name,

					    drm_get_mode_status_name(mode->status));

			}