drm/gma500: Drop DRM_GMA3600 config option
With support for the MID-related chips removed, only support for desktop chips is left in the driver. So just build the complete driver if DRM_GMA500 has been selected. Anyone who wants to enable the Poulsbo code would probably also want the Cedarview code. [Patrik: Fixed conflict due to Oaktrail not being dropped] Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210129095604.32423-4-tzimmermann@suse.de
This commit is contained in:
parent
b51035c200
commit
837f23bb4b
3 changed files with 16 additions and 24 deletions
|
@ -1,6 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
config DRM_GMA500
|
config DRM_GMA500
|
||||||
tristate "Intel GMA5/600 KMS Framebuffer"
|
tristate "Intel GMA500/600/3600/3650 KMS Framebuffer"
|
||||||
depends on DRM && PCI && X86 && MMU
|
depends on DRM && PCI && X86 && MMU
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_TTM
|
select DRM_TTM
|
||||||
|
@ -19,10 +19,3 @@ config DRM_GMA600
|
||||||
help
|
help
|
||||||
Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)
|
Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)
|
||||||
platforms with LVDS ports. MIPI is not currently supported.
|
platforms with LVDS ports. MIPI is not currently supported.
|
||||||
|
|
||||||
config DRM_GMA3600
|
|
||||||
bool "Intel GMA3600/3650 support (Experimental)"
|
|
||||||
depends on DRM_GMA500
|
|
||||||
help
|
|
||||||
Say yes to include basic support for Intel GMA3600/3650 (Intel
|
|
||||||
Cedar Trail) platforms.
|
|
||||||
|
|
|
@ -6,36 +6,35 @@
|
||||||
gma500_gfx-y += \
|
gma500_gfx-y += \
|
||||||
accel_2d.o \
|
accel_2d.o \
|
||||||
backlight.o \
|
backlight.o \
|
||||||
|
blitter.o \
|
||||||
|
cdv_device.o \
|
||||||
|
cdv_intel_crt.o \
|
||||||
|
cdv_intel_display.o \
|
||||||
|
cdv_intel_dp.o \
|
||||||
|
cdv_intel_hdmi.o \
|
||||||
|
cdv_intel_lvds.o \
|
||||||
framebuffer.o \
|
framebuffer.o \
|
||||||
gem.o \
|
gem.o \
|
||||||
|
gma_device.o \
|
||||||
|
gma_display.o \
|
||||||
gtt.o \
|
gtt.o \
|
||||||
intel_bios.o \
|
intel_bios.o \
|
||||||
intel_i2c.o \
|
|
||||||
intel_gmbus.o \
|
intel_gmbus.o \
|
||||||
|
intel_i2c.o \
|
||||||
|
mid_bios.o \
|
||||||
mmu.o \
|
mmu.o \
|
||||||
blitter.o \
|
|
||||||
power.o \
|
power.o \
|
||||||
|
psb_device.o \
|
||||||
psb_drv.o \
|
psb_drv.o \
|
||||||
gma_display.o \
|
|
||||||
gma_device.o \
|
|
||||||
psb_intel_display.o \
|
psb_intel_display.o \
|
||||||
psb_intel_lvds.o \
|
psb_intel_lvds.o \
|
||||||
psb_intel_modes.o \
|
psb_intel_modes.o \
|
||||||
psb_intel_sdvo.o \
|
psb_intel_sdvo.o \
|
||||||
psb_lid.o \
|
psb_lid.o \
|
||||||
psb_irq.o \
|
psb_irq.o
|
||||||
psb_device.o \
|
|
||||||
mid_bios.o
|
|
||||||
|
|
||||||
gma500_gfx-$(CONFIG_ACPI) += opregion.o \
|
gma500_gfx-$(CONFIG_ACPI) += opregion.o \
|
||||||
|
|
||||||
gma500_gfx-$(CONFIG_DRM_GMA3600) += cdv_device.o \
|
|
||||||
cdv_intel_crt.o \
|
|
||||||
cdv_intel_display.o \
|
|
||||||
cdv_intel_hdmi.o \
|
|
||||||
cdv_intel_lvds.o \
|
|
||||||
cdv_intel_dp.o
|
|
||||||
|
|
||||||
gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \
|
gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \
|
||||||
oaktrail_crtc.o \
|
oaktrail_crtc.o \
|
||||||
oaktrail_lvds.o \
|
oaktrail_lvds.o \
|
||||||
|
|
|
@ -51,6 +51,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||||
* N2800
|
* N2800
|
||||||
*/
|
*/
|
||||||
static const struct pci_device_id pciidlist[] = {
|
static const struct pci_device_id pciidlist[] = {
|
||||||
|
/* Poulsbo */
|
||||||
{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
||||||
{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
||||||
#if defined(CONFIG_DRM_GMA600)
|
#if defined(CONFIG_DRM_GMA600)
|
||||||
|
@ -64,7 +65,7 @@ static const struct pci_device_id pciidlist[] = {
|
||||||
{ 0x8086, 0x4107, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },
|
{ 0x8086, 0x4107, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },
|
||||||
{ 0x8086, 0x4108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },
|
{ 0x8086, 0x4108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_DRM_GMA3600)
|
/* Cedartrail */
|
||||||
{ 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
{ 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
{ 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
|
@ -81,7 +82,6 @@ static const struct pci_device_id pciidlist[] = {
|
||||||
{ 0x8086, 0x0bed, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0bed, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
{ 0x8086, 0x0bee, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0bee, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
{ 0x8086, 0x0bef, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
{ 0x8086, 0x0bef, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops },
|
||||||
#endif
|
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(pci, pciidlist);
|
MODULE_DEVICE_TABLE(pci, pciidlist);
|
||||||
|
|
Loading…
Add table
Reference in a new issue