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

Commit 5ce8ba7c authored by Adam Jackson's avatar Adam Jackson Committed by Eric Anholt
Browse files

drm/i915: Fix 82854 PCI ID, and treat it like other 85X 



pci.ids and the datasheet both say it's 358e, not 35e8.

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 8f4695ed

drivers/gpu/drm/i915/i915_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ const static struct intel_device_info intel_845g_info = { 
};



const static struct intel_device_info intel_i85x_info = {

	.is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1,

	.is_i8xx = 1, .is_i85x = 1, .is_mobile = 1,

	.cursor_needs_physical = 1,

};



const static struct intel_device_info intel_i865g_info = {
@@ -151,7 +152,7 @@ const static struct pci_device_id pciidlist[] = { 
	INTEL_VGA_DEVICE(0x3577, &intel_i830_info),

	INTEL_VGA_DEVICE(0x2562, &intel_845g_info),

	INTEL_VGA_DEVICE(0x3582, &intel_i85x_info),

	INTEL_VGA_DEVICE(0x35e8, &intel_i85x_info),

	INTEL_VGA_DEVICE(0x358e, &intel_i85x_info),

	INTEL_VGA_DEVICE(0x2572, &intel_i865g_info),

	INTEL_VGA_DEVICE(0x2582, &intel_i915g_info),

	INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ struct intel_overlay; 
struct intel_device_info {

	u8 is_mobile : 1;

	u8 is_i8xx : 1;

	u8 is_i85x : 1;

	u8 is_i915g : 1;

	u8 is_i9xx : 1;

	u8 is_i945gm : 1;
@@ -1070,7 +1071,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 


#define IS_I830(dev)		((dev)->pci_device == 0x3577)

#define IS_845G(dev)		((dev)->pci_device == 0x2562)

#define IS_I85X(dev)		((dev)->pci_device == 0x3582)

#define IS_I85X(dev)		(INTEL_INFO(dev)->is_i85x)

#define IS_I865G(dev)		((dev)->pci_device == 0x2572)

#define IS_GEN2(dev)		(INTEL_INFO(dev)->is_i8xx)

#define IS_I915G(dev)		(INTEL_INFO(dev)->is_i915g)