[Intel-gfx] [PATCH 03/13] drm/i915/dp_aux_backlight: use struct drm_device based logging

Daniel Vetter daniel at ffwll.ch
Wed Mar 25 08:39:11 UTC 2020


On Fri, Mar 20, 2020 at 04:36:28PM +0200, Jani Nikula wrote:
> Convert all the DRM_* logging macros to the struct drm_device based
> macros to provide device specific logging.
> 
> No functional changes.
> 
> Generated using the following semantic patch, originally written by
> Wambui Karuga <wambui.karugax at gmail.com>, with manual fixups on top:
> 
> @@
> identifier fn, T;
> @@
> 
> fn(...,struct drm_i915_private *T,...) {
> <+...
> (
> -DRM_INFO(
> +drm_info(&T->drm,
> ...)
> |
> -DRM_NOTE(
> +drm_notice(&T->drm,
> ...)
> |
> -DRM_ERROR(
> +drm_err(&T->drm,
> ...)
> |
> -DRM_WARN(
> +drm_warn(&T->drm,
> ...)
> |
> -DRM_DEBUG_DRIVER(
> +drm_dbg(&T->drm,
> ...)
> |
> -DRM_DEBUG_KMS(
> +drm_dbg_kms(&T->drm,
> ...)
> |
> -DRM_DEBUG_ATOMIC(
> +drm_dbg_atomic(&T->drm,
> ...)
> )
> ...+>
> }
> 
> @@
> identifier fn, T;
> @@
> 
> fn(...) {
> ...
> struct drm_i915_private *T = ...;
> <+...
> (
> -DRM_INFO(
> +drm_info(&T->drm,
> ...)
> |
> -DRM_NOTE(
> +drm_notice(&T->drm,
> ...)
> |
> -DRM_ERROR(
> +drm_err(&T->drm,
> ...)
> |
> -DRM_WARN(
> +drm_warn(&T->drm,
> ...)
> |
> -DRM_DEBUG_DRIVER(
> +drm_dbg(&T->drm,
> ...)
> |
> -DRM_DEBUG_KMS(
> +drm_dbg_kms(&T->drm,
> ...)
> |
> -DRM_DEBUG_ATOMIC(
> +drm_dbg_atomic(&T->drm,
> ...)
> )
> ...+>
> }
> 
> Cc: Wambui Karuga <wambui.karugax at gmail.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  .../drm/i915/display/intel_dp_aux_backlight.c | 84 +++++++++++--------
>  1 file changed, 50 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> index 3e706bb850a8..4b916468540f 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> @@ -27,6 +27,7 @@
>  
>  static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
>  {
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  	u8 reg_val = 0;
>  
>  	/* Early return when display use other mechanism to enable backlight. */
> @@ -35,8 +36,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
>  
>  	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
>  			      &reg_val) < 0) {
> -		DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
> -			      DP_EDP_DISPLAY_CONTROL_REGISTER);
> +		drm_dbg_kms(&i915->drm, "Failed to read DPCD register 0x%x\n",
> +			    DP_EDP_DISPLAY_CONTROL_REGISTER);
>  		return;
>  	}
>  	if (enable)
> @@ -46,8 +47,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
>  
>  	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
>  			       reg_val) != 1) {
> -		DRM_DEBUG_KMS("Failed to %s aux backlight\n",
> -			      enable ? "enable" : "disable");
> +		drm_dbg_kms(&i915->drm, "Failed to %s aux backlight\n",
> +			    enable ? "enable" : "disable");
>  	}
>  }
>  
> @@ -58,6 +59,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
>  static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)
>  {
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  	u8 read_val[2] = { 0x0 };
>  	u8 mode_reg;
>  	u16 level = 0;
> @@ -65,8 +67,9 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)
>  	if (drm_dp_dpcd_readb(&intel_dp->aux,
>  			      DP_EDP_BACKLIGHT_MODE_SET_REGISTER,
>  			      &mode_reg) != 1) {
> -		DRM_DEBUG_KMS("Failed to read the DPCD register 0x%x\n",
> -			      DP_EDP_BACKLIGHT_MODE_SET_REGISTER);
> +		drm_dbg_kms(&i915->drm,
> +			    "Failed to read the DPCD register 0x%x\n",
> +			    DP_EDP_BACKLIGHT_MODE_SET_REGISTER);
>  		return 0;
>  	}
>  
> @@ -80,8 +83,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)
>  
>  	if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
>  			     &read_val, sizeof(read_val)) < 0) {
> -		DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
> -			      DP_EDP_BACKLIGHT_BRIGHTNESS_MSB);
> +		drm_dbg_kms(&i915->drm, "Failed to read DPCD register 0x%x\n",
> +			    DP_EDP_BACKLIGHT_BRIGHTNESS_MSB);
>  		return 0;
>  	}
>  	level = read_val[0];
> @@ -100,6 +103,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev
>  {
>  	struct intel_connector *connector = to_intel_connector(conn_state->connector);
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  	u8 vals[2] = { 0x0 };
>  
>  	vals[0] = level;
> @@ -111,7 +115,8 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev
>  	}
>  	if (drm_dp_dpcd_write(&intel_dp->aux, DP_EDP_BACKLIGHT_BRIGHTNESS_MSB,
>  			      vals, sizeof(vals)) < 0) {
> -		DRM_DEBUG_KMS("Failed to write aux backlight level\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "Failed to write aux backlight level\n");
>  		return;
>  	}
>  }
> @@ -133,7 +138,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector)
>  
>  	freq = dev_priv->vbt.backlight.pwm_freq_hz;
>  	if (!freq) {
> -		DRM_DEBUG_KMS("Use panel default backlight frequency\n");
> +		drm_dbg_kms(&dev_priv->drm,
> +			    "Use panel default backlight frequency\n");
>  		return false;
>  	}
>  
> @@ -146,13 +152,14 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector)
>  	fxp_max = DIV_ROUND_CLOSEST(fxp * 5, 4);
>  
>  	if (fxp_min > fxp_actual || fxp_actual > fxp_max) {
> -		DRM_DEBUG_KMS("Actual frequency out of range\n");
> +		drm_dbg_kms(&dev_priv->drm, "Actual frequency out of range\n");
>  		return false;
>  	}
>  
>  	if (drm_dp_dpcd_writeb(&intel_dp->aux,
>  			       DP_EDP_BACKLIGHT_FREQ_SET, (u8) f) < 0) {
> -		DRM_DEBUG_KMS("Failed to write aux backlight freq\n");
> +		drm_dbg_kms(&dev_priv->drm,
> +			    "Failed to write aux backlight freq\n");
>  		return false;
>  	}
>  	return true;
> @@ -163,13 +170,14 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st
>  {
>  	struct intel_connector *connector = to_intel_connector(conn_state->connector);
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  	struct intel_panel *panel = &connector->panel;
>  	u8 dpcd_buf, new_dpcd_buf, edp_backlight_mode;
>  
>  	if (drm_dp_dpcd_readb(&intel_dp->aux,
>  			DP_EDP_BACKLIGHT_MODE_SET_REGISTER, &dpcd_buf) != 1) {
> -		DRM_DEBUG_KMS("Failed to read DPCD register 0x%x\n",
> -			      DP_EDP_BACKLIGHT_MODE_SET_REGISTER);
> +		drm_dbg_kms(&i915->drm, "Failed to read DPCD register 0x%x\n",
> +			    DP_EDP_BACKLIGHT_MODE_SET_REGISTER);
>  		return;
>  	}
>  
> @@ -186,7 +194,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st
>  		if (drm_dp_dpcd_writeb(&intel_dp->aux,
>  				       DP_EDP_PWMGEN_BIT_COUNT,
>  				       panel->backlight.pwmgen_bit_count) < 0)
> -			DRM_DEBUG_KMS("Failed to write aux pwmgen bit count\n");
> +			drm_dbg_kms(&i915->drm,
> +				    "Failed to write aux pwmgen bit count\n");
>  
>  		break;
>  
> @@ -203,7 +212,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st
>  	if (new_dpcd_buf != dpcd_buf) {
>  		if (drm_dp_dpcd_writeb(&intel_dp->aux,
>  			DP_EDP_BACKLIGHT_MODE_SET_REGISTER, new_dpcd_buf) < 0) {
> -			DRM_DEBUG_KMS("Failed to write aux backlight mode\n");
> +			drm_dbg_kms(&i915->drm,
> +				    "Failed to write aux backlight mode\n");
>  		}
>  	}
>  
> @@ -237,9 +247,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)
>  	 * minimum value will applied automatically. So no need to check that.
>  	 */
>  	freq = i915->vbt.backlight.pwm_freq_hz;
> -	DRM_DEBUG_KMS("VBT defined backlight frequency %u Hz\n", freq);
> +	drm_dbg_kms(&i915->drm, "VBT defined backlight frequency %u Hz\n",
> +		    freq);
>  	if (!freq) {
> -		DRM_DEBUG_KMS("Use panel default backlight frequency\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "Use panel default backlight frequency\n");
>  		return max_backlight;
>  	}
>  
> @@ -254,12 +266,14 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)
>  	 */
>  	if (drm_dp_dpcd_readb(&intel_dp->aux,
>  			      DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &pn_min) != 1) {
> -		DRM_DEBUG_KMS("Failed to read pwmgen bit count cap min\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "Failed to read pwmgen bit count cap min\n");
>  		return max_backlight;
>  	}
>  	if (drm_dp_dpcd_readb(&intel_dp->aux,
>  			      DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX, &pn_max) != 1) {
> -		DRM_DEBUG_KMS("Failed to read pwmgen bit count cap max\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "Failed to read pwmgen bit count cap max\n");
>  		return max_backlight;
>  	}
>  	pn_min &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
> @@ -268,7 +282,8 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)
>  	fxp_min = DIV_ROUND_CLOSEST(fxp * 3, 4);
>  	fxp_max = DIV_ROUND_CLOSEST(fxp * 5, 4);
>  	if (fxp_min < (1 << pn_min) || (255 << pn_max) < fxp_max) {
> -		DRM_DEBUG_KMS("VBT defined backlight frequency out of range\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "VBT defined backlight frequency out of range\n");
>  		return max_backlight;
>  	}
>  
> @@ -279,10 +294,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)
>  			break;
>  	}
>  
> -	DRM_DEBUG_KMS("Using eDP pwmgen bit count of %d\n", pn);
> +	drm_dbg_kms(&i915->drm, "Using eDP pwmgen bit count of %d\n", pn);
>  	if (drm_dp_dpcd_writeb(&intel_dp->aux,
>  			       DP_EDP_PWMGEN_BIT_COUNT, pn) < 0) {
> -		DRM_DEBUG_KMS("Failed to write aux pwmgen bit count\n");
> +		drm_dbg_kms(&i915->drm,
> +			    "Failed to write aux pwmgen bit count\n");
>  		return max_backlight;
>  	}
>  	panel->backlight.pwmgen_bit_count = pn;
> @@ -312,6 +328,7 @@ static bool
>  intel_dp_aux_display_control_capable(struct intel_connector *connector)
>  {
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  
>  	/* Check the eDP Display control capabilities registers to determine if
>  	 * the panel can support backlight control over the aux channel
> @@ -319,7 +336,7 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector)
>  	if (intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP &&
>  	    (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP) &&
>  	    !(intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP)) {
> -		DRM_DEBUG_KMS("AUX Backlight Control Supported!\n");
> +		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
>  		return true;
>  	}
>  	return false;
> @@ -329,8 +346,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
>  {
>  	struct intel_panel *panel = &intel_connector->panel;
>  	struct intel_dp *intel_dp = enc_to_intel_dp(intel_connector->encoder);
> -	struct drm_device *dev = intel_connector->base.dev;
> -	struct drm_i915_private *dev_priv = to_i915(dev);
> +	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>  
>  	if (i915_modparams.enable_dpcd_backlight == 0 ||
>  	    !intel_dp_aux_display_control_capable(intel_connector))
> @@ -340,17 +356,17 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
>  	 * There are a lot of machines that don't advertise the backlight
>  	 * control interface to use properly in their VBIOS, :\
>  	 */
> -	if (dev_priv->vbt.backlight.type !=
> +	if (i915->vbt.backlight.type !=
>  	    INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE &&
>  	    !drm_dp_has_quirk(&intel_dp->desc, intel_dp->edid_quirks,
>  			      DP_QUIRK_FORCE_DPCD_BACKLIGHT)) {
> -		DRM_DEV_INFO(dev->dev,
> -			     "Panel advertises DPCD backlight support, but "
> -			     "VBT disagrees. If your backlight controls "
> -			     "don't work try booting with "
> -			     "i915.enable_dpcd_backlight=1. If your machine "
> -			     "needs this, please file a _new_ bug report on "
> -			     "drm/i915, see " FDO_BUG_URL " for details.\n");
> +		drm_info(&i915->drm,
> +			 "Panel advertises DPCD backlight support, but "
> +			 "VBT disagrees. If your backlight controls "
> +			 "don't work try booting with "
> +			 "i915.enable_dpcd_backlight=1. If your machine "
> +			 "needs this, please file a _new_ bug report on "
> +			 "drm/i915, see " FDO_BUG_URL " for details.\n");
>  		return -ENODEV;
>  	}

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

>  
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list