From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 12/13] drm/i915: nuke get max backlight functions Date: Wed, 13 Nov 2013 19:54:33 +0200 Message-ID: <1384365273.25182.91.camel@intelbox> References: <6318b46844245bd53a31116bd34f1cf8cf06a1d9.1383920621.git.jani.nikula@intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0301779404==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 281E9FB1FA for ; Wed, 13 Nov 2013 09:55:25 -0800 (PST) In-Reply-To: <6318b46844245bd53a31116bd34f1cf8cf06a1d9.1383920621.git.jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0301779404== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-dm4rhk5g4sLrbKdQgOKT" --=-dm4rhk5g4sLrbKdQgOKT Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2013-11-08 at 16:49 +0200, Jani Nikula wrote: > No longer needed. We now have fully cached max backlight values. >=20 > Signed-off-by: Jani Nikula Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_panel.c | 133 ------------------------------= ------ > 2 files changed, 134 deletions(-) >=20 > 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 */ > =20 > 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/in= tel_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 =3D border; > } > =20 > -static int is_backlight_combination_mode(struct drm_device *dev) > -{ > - struct drm_i915_private *dev_priv =3D 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 =3D connector->base.dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - u32 val; > - > - val =3D I915_READ(BLC_PWM_PCH_CTL2); > - if (dev_priv->regfile.saveBLC_PWM_CTL2 =3D=3D 0) { > - dev_priv->regfile.saveBLC_PWM_CTL2 =3D val; > - } else if (val =3D=3D 0) { > - val =3D dev_priv->regfile.saveBLC_PWM_CTL2; > - I915_WRITE(BLC_PWM_PCH_CTL2, val); > - } > - > - val >>=3D 16; > - > - return val; > -} > - > -static u32 i9xx_get_max_backlight(struct intel_connector *connector) > -{ > - struct drm_device *dev =3D connector->base.dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - u32 val; > - > - val =3D I915_READ(BLC_PWM_CTL); > - if (dev_priv->regfile.saveBLC_PWM_CTL =3D=3D 0) { > - dev_priv->regfile.saveBLC_PWM_CTL =3D val; > - } else if (val =3D=3D 0) { > - val =3D dev_priv->regfile.saveBLC_PWM_CTL; > - I915_WRITE(BLC_PWM_CTL, val); > - } > - > - val >>=3D 17; > - > - if (is_backlight_combination_mode(dev)) > - val *=3D 0xff; > - > - return val; > -} > - > -static u32 i965_get_max_backlight(struct intel_connector *connector) > -{ > - struct drm_device *dev =3D connector->base.dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - u32 val; > - > - val =3D I915_READ(BLC_PWM_CTL); > - if (dev_priv->regfile.saveBLC_PWM_CTL =3D=3D 0) { > - dev_priv->regfile.saveBLC_PWM_CTL =3D val; > - dev_priv->regfile.saveBLC_PWM_CTL2 =3D I915_READ(BLC_PWM_CTL2); > - } else if (val =3D=3D 0) { > - val =3D dev_priv->regfile.saveBLC_PWM_CTL; > - I915_WRITE(BLC_PWM_CTL, val); > - I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2); > - } > - > - val >>=3D 16; > - > - if (is_backlight_combination_mode(dev)) > - val *=3D 0xff; > - > - return val; > -} > - > -static u32 _vlv_get_max_backlight(struct drm_device *dev, enum pipe pipe= ) > -{ > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - u32 val; > - > - val =3D I915_READ(VLV_BLC_PWM_CTL(pipe)); > - if (dev_priv->regfile.saveBLC_PWM_CTL =3D=3D 0) { > - dev_priv->regfile.saveBLC_PWM_CTL =3D val; > - dev_priv->regfile.saveBLC_PWM_CTL2 =3D > - I915_READ(VLV_BLC_PWM_CTL2(pipe)); > - } else if (val =3D=3D 0) { > - val =3D 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 =3D 0x0f42ffff; > - > - val >>=3D 16; > - > - return val; > -} > - > -static u32 vlv_get_max_backlight(struct intel_connector *connector) > -{ > - struct drm_device *dev =3D connector->base.dev; > - enum pipe pipe =3D intel_get_pipe_from_connector(connector); > - > - return _vlv_get_max_backlight(dev, pipe); > -} > - > -static u32 intel_panel_get_max_backlight(struct intel_connector *connect= or) > -{ > - struct drm_device *dev =3D connector->base.dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - u32 max; > - > - WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock)); > - > - max =3D dev_priv->display.get_max_backlight(connector); > - > - DRM_DEBUG_DRIVER("max backlight PWM =3D %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_connec= tor *connector) > =20 > spin_lock_irqsave(&dev_priv->backlight_lock, flags); > =20 > - /* XXX: transitional, call to make sure freq is set */ > - intel_panel_get_max_backlight(connector); > - > WARN_ON(panel->backlight.max =3D=3D 0); > =20 > if (panel->backlight.level =3D=3D 0) { > @@ -1171,28 +1042,24 @@ void intel_panel_init_backlight_funcs(struct drm_= device *dev) > dev_priv->display.disable_backlight =3D pch_disable_backlight; > dev_priv->display.set_backlight =3D pch_set_backlight; > dev_priv->display.get_backlight =3D pch_get_backlight; > - dev_priv->display.get_max_backlight =3D pch_get_max_backlight; > } else if (IS_VALLEYVIEW(dev)) { > dev_priv->display.setup_backlight =3D vlv_setup_backlight; > dev_priv->display.enable_backlight =3D vlv_enable_backlight; > dev_priv->display.disable_backlight =3D vlv_disable_backlight; > dev_priv->display.set_backlight =3D vlv_set_backlight; > dev_priv->display.get_backlight =3D vlv_get_backlight; > - dev_priv->display.get_max_backlight =3D vlv_get_max_backlight; > } else if (IS_GEN4(dev)) { > dev_priv->display.setup_backlight =3D i965_setup_backlight; > dev_priv->display.enable_backlight =3D i965_enable_backlight; > dev_priv->display.disable_backlight =3D i965_disable_backlight; > dev_priv->display.set_backlight =3D i9xx_set_backlight; > dev_priv->display.get_backlight =3D i9xx_get_backlight; > - dev_priv->display.get_max_backlight =3D i965_get_max_backlight; > } else { > dev_priv->display.setup_backlight =3D i9xx_setup_backlight; > dev_priv->display.enable_backlight =3D i9xx_enable_backlight; > dev_priv->display.disable_backlight =3D i9xx_disable_backlight; > dev_priv->display.set_backlight =3D i9xx_set_backlight; > dev_priv->display.get_backlight =3D i9xx_get_backlight; > - dev_priv->display.get_max_backlight =3D i9xx_get_max_backlight; > } > } > =20 --=-dm4rhk5g4sLrbKdQgOKT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSg7zZAAoJEORIIAnNuWDFIUIH/2NER7YHD84BvwY6k0fCR8mn a29RQFb6mAus62HjuYdi31SnfmKQfoMuDqxAYpVkGGPJ6GMaJ/bngciL7Gzeir4z AiSwz/Y5jatXJiYMIL44i2acE7wikZzfq6fRobzTq4zBffTuNc0DT2o3FuuMZ71q A5/MGrdOt83M4KKf9SZJJulJyb1eK8eYkdfiplfem7uiJV13ffGInnDhOdisyH5J D1DG0Enh293gs0kN+2d3futM5K/PbbECUL1kB6fXpJAAhyZilfGY/1/eSz5Qv2cI Ml2cRq4BoMZ4gvIB2iN7BAgGdIsj3qnn5/YEUB+sotvmIkpnpZ8/egyRwCPF6vU= =TcHc -----END PGP SIGNATURE----- --=-dm4rhk5g4sLrbKdQgOKT-- --===============0301779404== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0301779404==--