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

Commit 891cc228 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/ickle/drm-intel 

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS
  agp/intel: Fix device names of i845 and 845G
  drm/i915: Disable GPU semaphores on SandyBridge mobile
  drm/i915/execbuffer: Clear domains before beginning reloc processing
  drm/i915/execbuffer: Reorder relocations to match new object order
  drm/i915: Fix error handler to capture the first batch after the seqno
  drm/i915: Add a module option to override the use of SSC
  drm/i915/panel: The backlight is enabled if the current value is non-zero
  drm/i915/debugfs: Correct format after changing type of err object 'size'
parents d73b3884 22ab70d3

drivers/char/agp/intel-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -717,8 +717,8 @@ static const struct intel_agp_driver_description { 
	{ PCI_DEVICE_ID_INTEL_82820_UP_HB, "i820", &intel_820_driver },

	{ PCI_DEVICE_ID_INTEL_82830_HB, "830M", &intel_830mp_driver },

	{ PCI_DEVICE_ID_INTEL_82840_HB, "i840", &intel_840_driver },

	{ PCI_DEVICE_ID_INTEL_82845_HB, "845G", &intel_845_driver },

	{ PCI_DEVICE_ID_INTEL_82845G_HB, "830M", &intel_845_driver },

	{ PCI_DEVICE_ID_INTEL_82845_HB, "i845", &intel_845_driver },

	{ PCI_DEVICE_ID_INTEL_82845G_HB, "845G", &intel_845_driver },

	{ PCI_DEVICE_ID_INTEL_82850_HB, "i850", &intel_850_driver },

	{ PCI_DEVICE_ID_INTEL_82854_HB, "854", &intel_845_driver },

	{ PCI_DEVICE_ID_INTEL_82855PM_HB, "855PM", &intel_845_driver },

drivers/char/agp/intel-gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static const struct intel_gtt_driver_description { 
		&i81x_gtt_driver},

	{ PCI_DEVICE_ID_INTEL_82830_CGC, "830M",

		&i8xx_gtt_driver},

	{ PCI_DEVICE_ID_INTEL_82845G_IG, "830M",

	{ PCI_DEVICE_ID_INTEL_82845G_IG, "845G",

		&i8xx_gtt_driver},

	{ PCI_DEVICE_ID_INTEL_82854_IG, "854",

		&i8xx_gtt_driver},

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static void print_error_buffers(struct seq_file *m, 
	seq_printf(m, "%s [%d]:\n", name, count);



	while (count--) {

		seq_printf(m, "  %08x %8zd %04x %04x %08x%s%s%s%s%s%s",

		seq_printf(m, "  %08x %8u %04x %04x %08x%s%s%s%s%s%s",

			   err->gtt_offset,

			   err->size,

			   err->read_domains,

drivers/gpu/drm/i915/i915_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ module_param_named(powersave, i915_powersave, int, 0600); 
unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);



unsigned int i915_panel_use_ssc = 1;

module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600);



bool i915_try_reset = true;

module_param_named(reset, i915_try_reset, bool, 0600);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ extern int i915_max_ioctl; 
extern unsigned int i915_fbpercrtc;

extern unsigned int i915_powersave;

extern unsigned int i915_lvds_downclock;

extern unsigned int i915_panel_use_ssc;



extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);