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

Commit b727d202 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Fix wrong initializer for "locked" variable in assert_panel_unlocked
  i915: do not setup intel_backlight twice
parents 7a54f5e1 0de3b485

drivers/gpu/drm/i915/intel_display.c

+1 −3
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ static void assert_panel_unlocked(struct drm_i915_private *dev_priv, 
	int pp_reg, lvds_reg;

	u32 val;

	enum pipe panel_pipe = PIPE_A;

	bool locked = locked;

	bool locked = true;



	if (HAS_PCH_SPLIT(dev_priv->dev)) {

		pp_reg = PCH_PP_CONTROL;
@@ -7238,8 +7238,6 @@ static void intel_setup_outputs(struct drm_device *dev) 
			intel_encoder_clones(dev, encoder->clone_mask);

	}



	intel_panel_setup_backlight(dev);



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);

}