public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 12/13] drm/i915: nuke get max backlight functions
Date: Wed, 13 Nov 2013 19:54:33 +0200	[thread overview]
Message-ID: <1384365273.25182.91.camel@intelbox> (raw)
In-Reply-To: <6318b46844245bd53a31116bd34f1cf8cf06a1d9.1383920621.git.jani.nikula@intel.com>


[-- Attachment #1.1: Type: text/plain, Size: 7011 bytes --]

On Fri, 2013-11-08 at 16:49 +0200, Jani Nikula wrote:
> No longer needed. We now have fully cached max backlight values.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.h    |    1 -
>  drivers/gpu/drm/i915/intel_panel.c |  133 ------------------------------------
>  2 files changed, 134 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2d70ae4..500bab3 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -416,7 +416,6 @@ struct drm_i915_display_funcs {
>  	/* pll clock increase/decrease */
>  
>  	int (*setup_backlight)(struct intel_connector *connector);
> -	uint32_t (*get_max_backlight)(struct intel_connector *connector);
>  	uint32_t (*get_backlight)(struct intel_connector *connector);
>  	void (*set_backlight)(struct intel_connector *connector,
>  			      uint32_t level);
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index da088e3..eadfe33 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -325,132 +325,6 @@ out:
>  	pipe_config->gmch_pfit.lvds_border_bits = border;
>  }
>  
> -static int is_backlight_combination_mode(struct drm_device *dev)
> -{
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -
> -	if (IS_GEN4(dev))
> -		return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE;
> -
> -	if (IS_GEN2(dev))
> -		return I915_READ(BLC_PWM_CTL) & BLM_LEGACY_MODE;
> -
> -	return 0;
> -}
> -
> -static u32 pch_get_max_backlight(struct intel_connector *connector)
> -{
> -	struct drm_device *dev = connector->base.dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	u32 val;
> -
> -	val = I915_READ(BLC_PWM_PCH_CTL2);
> -	if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
> -		dev_priv->regfile.saveBLC_PWM_CTL2 = val;
> -	} else if (val == 0) {
> -		val = dev_priv->regfile.saveBLC_PWM_CTL2;
> -		I915_WRITE(BLC_PWM_PCH_CTL2, val);
> -	}
> -
> -	val >>= 16;
> -
> -	return val;
> -}
> -
> -static u32 i9xx_get_max_backlight(struct intel_connector *connector)
> -{
> -	struct drm_device *dev = connector->base.dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	u32 val;
> -
> -	val = I915_READ(BLC_PWM_CTL);
> -	if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> -		dev_priv->regfile.saveBLC_PWM_CTL = val;
> -	} else if (val == 0) {
> -		val = dev_priv->regfile.saveBLC_PWM_CTL;
> -		I915_WRITE(BLC_PWM_CTL, val);
> -	}
> -
> -	val >>= 17;
> -
> -	if (is_backlight_combination_mode(dev))
> -		val *= 0xff;
> -
> -	return val;
> -}
> -
> -static u32 i965_get_max_backlight(struct intel_connector *connector)
> -{
> -	struct drm_device *dev = connector->base.dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	u32 val;
> -
> -	val = I915_READ(BLC_PWM_CTL);
> -	if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> -		dev_priv->regfile.saveBLC_PWM_CTL = val;
> -		dev_priv->regfile.saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
> -	} else if (val == 0) {
> -		val = dev_priv->regfile.saveBLC_PWM_CTL;
> -		I915_WRITE(BLC_PWM_CTL, val);
> -		I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);
> -	}
> -
> -	val >>= 16;
> -
> -	if (is_backlight_combination_mode(dev))
> -		val *= 0xff;
> -
> -	return val;
> -}
> -
> -static u32 _vlv_get_max_backlight(struct drm_device *dev, enum pipe pipe)
> -{
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	u32 val;
> -
> -	val = I915_READ(VLV_BLC_PWM_CTL(pipe));
> -	if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
> -		dev_priv->regfile.saveBLC_PWM_CTL = val;
> -		dev_priv->regfile.saveBLC_PWM_CTL2 =
> -			I915_READ(VLV_BLC_PWM_CTL2(pipe));
> -	} else if (val == 0) {
> -		val = dev_priv->regfile.saveBLC_PWM_CTL;
> -		I915_WRITE(VLV_BLC_PWM_CTL(pipe), val);
> -		I915_WRITE(VLV_BLC_PWM_CTL2(pipe),
> -			   dev_priv->regfile.saveBLC_PWM_CTL2);
> -	}
> -
> -	if (!val)
> -		val = 0x0f42ffff;
> -
> -	val >>= 16;
> -
> -	return val;
> -}
> -
> -static u32 vlv_get_max_backlight(struct intel_connector *connector)
> -{
> -	struct drm_device *dev = connector->base.dev;
> -	enum pipe pipe = intel_get_pipe_from_connector(connector);
> -
> -	return _vlv_get_max_backlight(dev, pipe);
> -}
> -
> -static u32 intel_panel_get_max_backlight(struct intel_connector *connector)
> -{
> -	struct drm_device *dev = connector->base.dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	u32 max;
> -
> -	WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));
> -
> -	max = dev_priv->display.get_max_backlight(connector);
> -
> -	DRM_DEBUG_DRIVER("max backlight PWM = %d\n", max);
> -
> -	return max;
> -}
> -
>  static int i915_panel_invert_brightness;
>  MODULE_PARM_DESC(invert_brightness, "Invert backlight brightness "
>  	"(-1 force normal, 0 machine defaults, 1 force inversion), please "
> @@ -866,9 +740,6 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
>  
>  	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
>  
> -	/* XXX: transitional, call to make sure freq is set */
> -	intel_panel_get_max_backlight(connector);
> -
>  	WARN_ON(panel->backlight.max == 0);
>  
>  	if (panel->backlight.level == 0) {
> @@ -1171,28 +1042,24 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev)
>  		dev_priv->display.disable_backlight = pch_disable_backlight;
>  		dev_priv->display.set_backlight = pch_set_backlight;
>  		dev_priv->display.get_backlight = pch_get_backlight;
> -		dev_priv->display.get_max_backlight = pch_get_max_backlight;
>  	} else if (IS_VALLEYVIEW(dev)) {
>  		dev_priv->display.setup_backlight = vlv_setup_backlight;
>  		dev_priv->display.enable_backlight = vlv_enable_backlight;
>  		dev_priv->display.disable_backlight = vlv_disable_backlight;
>  		dev_priv->display.set_backlight = vlv_set_backlight;
>  		dev_priv->display.get_backlight = vlv_get_backlight;
> -		dev_priv->display.get_max_backlight = vlv_get_max_backlight;
>  	} else if (IS_GEN4(dev)) {
>  		dev_priv->display.setup_backlight = i965_setup_backlight;
>  		dev_priv->display.enable_backlight = i965_enable_backlight;
>  		dev_priv->display.disable_backlight = i965_disable_backlight;
>  		dev_priv->display.set_backlight = i9xx_set_backlight;
>  		dev_priv->display.get_backlight = i9xx_get_backlight;
> -		dev_priv->display.get_max_backlight = i965_get_max_backlight;
>  	} else {
>  		dev_priv->display.setup_backlight = i9xx_setup_backlight;
>  		dev_priv->display.enable_backlight = i9xx_enable_backlight;
>  		dev_priv->display.disable_backlight = i9xx_disable_backlight;
>  		dev_priv->display.set_backlight = i9xx_set_backlight;
>  		dev_priv->display.get_backlight = i9xx_get_backlight;
> -		dev_priv->display.get_max_backlight = i9xx_get_max_backlight;
>  	}
>  }
>  


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2013-11-13 17:55 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-08 14:48 [PATCH 00/13] drm/i915: backlight rewrite Jani Nikula
2013-11-08 14:48 ` [PATCH 01/13] drm/i915: clean up backlight conditional build Jani Nikula
2013-11-12 21:23   ` Imre Deak
2013-11-08 14:48 ` [PATCH 02/13] drm/i915: make backlight info per-connector Jani Nikula
2013-11-12 21:29   ` Imre Deak
2013-11-08 14:48 ` [PATCH 03/13] drm/i915: make asle notifications update backlight on all connectors Jani Nikula
2013-11-12 21:29   ` Imre Deak
2013-11-08 14:48 ` [PATCH 04/13] drm/i915: handle backlight through chip specific functions Jani Nikula
2013-11-12 21:36   ` Imre Deak
2013-11-12 23:19     ` Daniel Vetter
2013-11-08 14:48 ` [PATCH 05/13] drm/i915: fix gen2-gen3 backlight set Jani Nikula
2013-11-12 22:00   ` Imre Deak
2013-11-13  8:27     ` Jani Nikula
2013-11-13  9:04       ` Daniel Vetter
2013-11-13  9:12       ` Imre Deak
2013-11-08 14:48 ` [PATCH 06/13] drm/i915: vlv does not have pipe field in backlight registers Jani Nikula
2013-11-12 22:00   ` Imre Deak
2013-11-08 14:48 ` [PATCH 07/13] drm/i915: move backlight level setting in enable/disable to hooks Jani Nikula
2013-11-12 22:01   ` Imre Deak
2013-11-08 14:49 ` [PATCH 08/13] drm/i915: use the initialized backlight max value instead of reading it Jani Nikula
2013-11-12 22:42   ` Imre Deak
2013-11-13  8:39     ` Jani Nikula
2013-11-13  9:12       ` Daniel Vetter
2013-11-08 14:49 ` [PATCH 09/13] drm/i915: debug print on backlight register Jani Nikula
2013-11-12 22:48   ` Imre Deak
2013-11-13 10:22     ` Daniel Vetter
2013-11-08 14:49 ` [PATCH 10/13] drm/i915: gather backlight information at setup Jani Nikula
2013-11-13 17:01   ` Imre Deak
2013-11-14  5:19     ` Jani Nikula
2013-11-14  8:22       ` Imre Deak
2013-11-08 14:49 ` [PATCH 11/13] drm/i915: do full backlight setup at enable time Jani Nikula
2013-11-13 17:53   ` Imre Deak
2013-11-14  5:43     ` Jani Nikula
2013-11-14  8:27       ` Daniel Vetter
2013-11-14  8:28       ` Imre Deak
2013-11-14 10:13   ` [PATCH v2 " Jani Nikula
2013-11-14 10:46     ` Imre Deak
2013-11-14 10:14   ` [PATCH 11.5/13] drm/i915: remove QUIRK_NO_PCH_PWM_ENABLE Jani Nikula
2013-11-14 10:50     ` Imre Deak
2013-11-08 14:49 ` [PATCH 12/13] drm/i915: nuke get max backlight functions Jani Nikula
2013-11-13 17:54   ` Imre Deak [this message]
2013-11-08 14:49 ` [PATCH 13/13] drm/i915: do not save/restore backlight registers Jani Nikula
2013-11-12 23:25   ` Daniel Vetter
2013-11-13  8:40     ` Jani Nikula
2013-11-13 10:56     ` [PATCH v2] drm/i915: do not save/restore backlight registers in KMS Jani Nikula
2013-11-13 18:05       ` Imre Deak
2013-11-14 11:22         ` Daniel Vetter
2013-11-11  8:36 ` [PATCH 00/13] drm/i915: backlight rewrite Jani Nikula
2013-11-12 21:22 ` Imre Deak

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=1384365273.25182.91.camel@intelbox \
    --to=imre.deak@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox