Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-3
+1
-3
drivers/gpu/drm/i915/intel_display.c
+1
-3
drivers/gpu/drm/i915/intel_display.c
···
878
878
int pp_reg, lvds_reg;
879
879
u32 val;
880
880
enum pipe panel_pipe = PIPE_A;
881
-
bool locked = locked;
881
+
bool locked = true;
882
882
883
883
if (HAS_PCH_SPLIT(dev_priv->dev)) {
884
884
pp_reg = PCH_PP_CONTROL;
···
7237
7237
encoder->base.possible_clones =
7238
7238
intel_encoder_clones(dev, encoder->clone_mask);
7239
7239
}
7240
-
7241
-
intel_panel_setup_backlight(dev);
7242
7240
7243
7241
/* disable all the possible outputs/crtcs before entering KMS mode */
7244
7242
drm_helper_disable_unused_functions(dev);