Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1bdbcb authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Only restore backlight combination mode reg for ums 



This was forgotten in

commit 565ee389
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Wed Nov 13 12:56:29 2013 +0200

    drm/i915: do not save/restore backlight registers in KMS

Since the confusion was likely due to the duplicated definition for
this pci config register, let's unify that, too.

Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cc9bd499

drivers/gpu/drm/i915/i915_reg.h

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ 
#define   I915_GC_RENDER_CLOCK_166_MHZ	(0 << 0)

#define   I915_GC_RENDER_CLOCK_200_MHZ	(1 << 0)

#define   I915_GC_RENDER_CLOCK_333_MHZ	(4 << 0)

#define LBB	0xf4

#define PCI_LBPC 0xf4 /* legacy/combination backlight modes, also called LBB */





/* Graphics reset regs */

#define I965_GDRST 0xc0 /* PCI config register */

drivers/gpu/drm/i915/i915_suspend.c

+0 −8
Original line number Diff line number Diff line
@@ -324,10 +324,6 @@ int i915_save_state(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int i;



	if (INTEL_INFO(dev)->gen <= 4)

		pci_read_config_byte(dev->pdev, LBB,

				     &dev_priv->regfile.saveLBB);



	mutex_lock(&dev->struct_mutex);



	i915_save_display(dev);
@@ -377,10 +373,6 @@ int i915_restore_state(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int i;



	if (INTEL_INFO(dev)->gen <= 4)

		pci_write_config_byte(dev->pdev, LBB,

				      dev_priv->regfile.saveLBB);



	mutex_lock(&dev->struct_mutex);



	i915_gem_restore_fences(dev);

drivers/gpu/drm/i915/i915_ums.c

+8 −0
Original line number Diff line number Diff line
@@ -271,6 +271,10 @@ void i915_save_display_reg(struct drm_device *dev) 
	/* FIXME: regfile.save TV & SDVO state */



	/* Backlight */

	if (INTEL_INFO(dev)->gen <= 4)

		pci_read_config_byte(dev->pdev, PCI_LBPC,

				     &dev_priv->regfile.saveLBB);



	if (HAS_PCH_SPLIT(dev)) {

		dev_priv->regfile.saveBLC_PWM_CTL = I915_READ(BLC_PWM_PCH_CTL1);

		dev_priv->regfile.saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_PCH_CTL2);
@@ -293,6 +297,10 @@ void i915_restore_display_reg(struct drm_device *dev) 
	int i;



	/* Backlight */

	if (INTEL_INFO(dev)->gen <= 4)

		pci_write_config_byte(dev->pdev, PCI_LBPC,

				      dev_priv->regfile.saveLBB);



	if (HAS_PCH_SPLIT(dev)) {

		I915_WRITE(BLC_PWM_PCH_CTL1, dev_priv->regfile.saveBLC_PWM_CTL);

		I915_WRITE(BLC_PWM_PCH_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);

drivers/gpu/drm/i915/intel_panel.c

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include <linux/moduleparam.h>

#include "intel_drv.h"



#define PCI_LBPC 0xf4 /* legacy/combination backlight modes */



void

intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,

		       struct drm_display_mode *adjusted_mode)