| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 21 Sep 2009 18:12:07 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Dave Airlie <airlied@...ux.ie>
Cc: torvalds@...ux-foundation.org, dri-devel@...ts.sf.net,
linux-kernel@...r.kernel.org
Subject: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
* Dave Airlie <airlied@...ux.ie> wrote:
>
> Hi Linus,
>
> Please pull the 'drm-linus' branch from
> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus
>
> This contains the main chunk of the drm changes for 2.6.32, I think Eric
> has been on holidays for a week so I'd expect some more Intel changes
> incoming in the merge window. It also contains a few merges for things
> that were conflicting with things I sent to you via the drm-fixes tree,
> but they weren't always trivial.
>
> Major highlights core drm/non-kms:
> move mga/r128/radeon to firmware loader - major LOC churn,
> decreases in-memory radeon module footprint quite a bit.
> r600 3D support in non-kms mode.
> VGA arbitration support for core drm and kms (was waiting for
> jbarnes tree to land).
>
> core KMS:
> add support for GTF/CVT/DMT modes, gets us a long way towards X
> merge intel and radeon kms framebuffer implementations for sanity.
>
> radeon KMS:
> R600 KMS support + acceleration support.
> move to generating the safe register tables with a script.
> radeon tv-out supported ported from userspace
> rn50/r100/r200 command submission trackers added
>
> intel:
> some IGDNG fixes
> important fix for wrapping at end of ring
> more SDVO tv-out support
> dynamic clocking support
>
>
> Dave.
>
> drivers/gpu/drm/Kconfig | 18 +-
> drivers/gpu/drm/Makefile | 8 +-
> drivers/gpu/drm/drm_bufs.c | 4 +-
> drivers/gpu/drm/drm_cache.c | 46 +-
> drivers/gpu/drm/drm_crtc.c | 77 +-
> drivers/gpu/drm/drm_crtc_helper.c | 223 +-
> drivers/gpu/drm/drm_drv.c | 4 +-
> drivers/gpu/drm/drm_edid.c | 504 +-
> drivers/gpu/drm/drm_encoder_slave.c | 116 +
> drivers/gpu/drm/drm_fb_helper.c | 707 +
> drivers/gpu/drm/drm_gem.c | 11 +-
> drivers/gpu/drm/drm_irq.c | 27 +
> drivers/gpu/drm/drm_mm.c | 21 +
> drivers/gpu/drm/drm_modes.c | 435 +-
> drivers/gpu/drm/drm_proc.c | 17 +-
> drivers/gpu/drm/drm_sysfs.c | 28 +
> drivers/gpu/drm/i915/Makefile | 2 +-
> .../i915/{i915_gem_debugfs.c => i915_debugfs.c} | 91 +-
> drivers/gpu/drm/i915/i915_dma.c | 120 +-
> drivers/gpu/drm/i915/i915_drv.c | 9 +-
> drivers/gpu/drm/i915/i915_drv.h | 63 +-
> drivers/gpu/drm/i915/i915_gem.c | 14 +-
> drivers/gpu/drm/i915/i915_gem_tiling.c | 80 +-
> drivers/gpu/drm/i915/i915_irq.c | 21 +
> drivers/gpu/drm/i915/i915_reg.h | 144 +-
> drivers/gpu/drm/i915/i915_suspend.c | 4 +-
> drivers/gpu/drm/i915/intel_bios.c | 8 +-
> drivers/gpu/drm/i915/intel_crt.c | 28 +
> drivers/gpu/drm/i915/intel_display.c | 624 +-
> drivers/gpu/drm/i915/intel_drv.h | 8 +-
> drivers/gpu/drm/i915/intel_fb.c | 737 +-
> drivers/gpu/drm/i915/intel_i2c.c | 8 +-
> drivers/gpu/drm/i915/intel_lvds.c | 22 +-
> drivers/gpu/drm/i915/intel_sdvo.c | 331 +-
> drivers/gpu/drm/i915/intel_tv.c | 30 +
> drivers/gpu/drm/mga/mga_dma.c | 4 +-
> drivers/gpu/drm/mga/mga_drv.h | 1 -
> drivers/gpu/drm/mga/mga_ucode.h |11645 ----------
> drivers/gpu/drm/mga/mga_warp.c | 180 +-
> drivers/gpu/drm/r128/r128_cce.c | 116 +-
> drivers/gpu/drm/r128/r128_drv.h | 8 +
> drivers/gpu/drm/r128/r128_state.c | 36 +-
> drivers/gpu/drm/radeon/Kconfig | 1 -
> drivers/gpu/drm/radeon/Makefile | 43 +-
> drivers/gpu/drm/radeon/atombios.h | 11 +
> drivers/gpu/drm/radeon/atombios_crtc.c | 105 +-
> drivers/gpu/drm/radeon/avivod.h | 69 +
> drivers/gpu/drm/radeon/mkregtable.c | 720 +
> drivers/gpu/drm/radeon/r100.c | 1232 +-
> drivers/gpu/drm/radeon/r100_track.h | 124 +
> drivers/gpu/drm/radeon/r100d.h | 607 +
> drivers/gpu/drm/radeon/r200.c | 456 +
> drivers/gpu/drm/radeon/r300.c | 556 +-
> drivers/gpu/drm/radeon/r300.h | 36 -
> drivers/gpu/drm/radeon/r300d.h | 101 +
> drivers/gpu/drm/radeon/r420.c | 301 +-
> drivers/gpu/drm/radeon/r420d.h | 249 +
> drivers/gpu/drm/radeon/r520.c | 6 -
> drivers/gpu/drm/radeon/r600.c | 1802 ++-
> drivers/gpu/drm/radeon/r600_blit.c | 850 +
> drivers/gpu/drm/radeon/r600_blit_kms.c | 805 +
> drivers/gpu/drm/radeon/r600_blit_shaders.c | 1072 +
> drivers/gpu/drm/radeon/r600_blit_shaders.h | 14 +
> drivers/gpu/drm/radeon/r600_cp.c | 541 +-
> drivers/gpu/drm/radeon/r600_cs.c | 657 +
> drivers/gpu/drm/radeon/r600_microcode.h |23297 --------------------
> drivers/gpu/drm/radeon/r600d.h | 662 +
> drivers/gpu/drm/radeon/radeon.h | 269 +-
> drivers/gpu/drm/radeon/radeon_asic.h | 240 +-
> drivers/gpu/drm/radeon/radeon_atombios.c | 171 +-
> drivers/gpu/drm/radeon/radeon_clocks.c | 10 +-
> drivers/gpu/drm/radeon/radeon_combios.c | 58 +-
> drivers/gpu/drm/radeon/radeon_connectors.c | 480 +-
> drivers/gpu/drm/radeon/radeon_cp.c | 151 +-
> drivers/gpu/drm/radeon/radeon_cs.c | 3 +-
> drivers/gpu/drm/radeon/radeon_device.c | 423 +-
> drivers/gpu/drm/radeon/radeon_display.c | 101 +-
> drivers/gpu/drm/radeon/radeon_drv.c | 23 +-
> drivers/gpu/drm/radeon/radeon_drv.h | 151 +-
> drivers/gpu/drm/radeon/radeon_encoders.c | 137 +-
> drivers/gpu/drm/radeon/radeon_fb.c | 674 +-
> drivers/gpu/drm/radeon/radeon_fence.c | 49 +-
> drivers/gpu/drm/radeon/radeon_gart.c | 9 +-
> drivers/gpu/drm/radeon/radeon_ioc32.c | 15 +
> drivers/gpu/drm/radeon/radeon_irq.c | 18 +
> drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 -
> drivers/gpu/drm/radeon/radeon_kms.c | 25 +-
> drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 85 +-
> drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 368 +-
> drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904 +
> drivers/gpu/drm/radeon/radeon_microcode.h | 1844 --
> drivers/gpu/drm/radeon/radeon_mode.h | 74 +-
> drivers/gpu/drm/radeon/radeon_object.c | 10 +
> drivers/gpu/drm/radeon/radeon_object.h | 1 +
> drivers/gpu/drm/radeon/radeon_reg.h | 79 +-
> drivers/gpu/drm/radeon/radeon_ring.c | 143 +-
> drivers/gpu/drm/radeon/radeon_share.h | 39 -
> drivers/gpu/drm/radeon/radeon_state.c | 23 +-
> drivers/gpu/drm/radeon/radeon_ttm.c | 96 +-
> drivers/gpu/drm/radeon/reg_srcs/r100 | 105 +
> drivers/gpu/drm/radeon/reg_srcs/r200 | 184 +
> drivers/gpu/drm/radeon/reg_srcs/r300 | 729 +
> drivers/gpu/drm/radeon/reg_srcs/rn50 | 30 +
> drivers/gpu/drm/radeon/reg_srcs/rs600 | 729 +
> drivers/gpu/drm/radeon/reg_srcs/rv515 | 486 +
> drivers/gpu/drm/radeon/rs400.c | 56 +-
> drivers/gpu/drm/radeon/rs600.c | 106 +-
> drivers/gpu/drm/radeon/rs690.c | 4 -
> drivers/gpu/drm/radeon/rs780.c | 102 -
> drivers/gpu/drm/radeon/rv515.c | 524 +-
> drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} | 56 +-
> drivers/gpu/drm/radeon/rv770.c | 1050 +-
> drivers/gpu/drm/radeon/rv770d.h | 341 +
> drivers/gpu/drm/ttm/ttm_bo.c | 295 +-
> drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +-
> drivers/gpu/drm/ttm/ttm_global.c | 4 +-
> drivers/gpu/drm/ttm/ttm_memory.c | 508 +-
> drivers/gpu/drm/ttm/ttm_module.c | 58 +-
> drivers/gpu/drm/ttm/ttm_tt.c | 104 +-
> firmware/Makefile | 16 +
> firmware/WHENCE | 121 +
> firmware/matrox/g200_warp.H16 | 28 +
> firmware/matrox/g400_warp.H16 | 44 +
> firmware/r128/r128_cce.bin.ihex | 129 +
> firmware/radeon/R100_cp.bin.ihex | 130 +
> firmware/radeon/R200_cp.bin.ihex | 130 +
> firmware/radeon/R300_cp.bin.ihex | 130 +
> firmware/radeon/R420_cp.bin.ihex | 130 +
> firmware/radeon/R520_cp.bin.ihex | 130 +
> firmware/radeon/R600_me.bin.ihex | 1345 ++
> firmware/radeon/R600_pfp.bin.ihex | 145 +
> firmware/radeon/RS600_cp.bin.ihex | 130 +
> firmware/radeon/RS690_cp.bin.ihex | 130 +
> firmware/radeon/RS780_me.bin.ihex | 1345 ++
> firmware/radeon/RS780_pfp.bin.ihex | 145 +
> firmware/radeon/RV610_me.bin.ihex | 1345 ++
> firmware/radeon/RV610_pfp.bin.ihex | 145 +
> firmware/radeon/RV620_me.bin.ihex | 1345 ++
> firmware/radeon/RV620_pfp.bin.ihex | 145 +
> firmware/radeon/RV630_me.bin.ihex | 1345 ++
> firmware/radeon/RV630_pfp.bin.ihex | 145 +
> firmware/radeon/RV635_me.bin.ihex | 1345 ++
> firmware/radeon/RV635_pfp.bin.ihex | 145 +
> firmware/radeon/RV670_me.bin.ihex | 1345 ++
> firmware/radeon/RV670_pfp.bin.ihex | 145 +
> firmware/radeon/RV710_me.bin.ihex | 341 +
> firmware/radeon/RV710_pfp.bin.ihex | 213 +
> firmware/radeon/RV730_me.bin.ihex | 341 +
> firmware/radeon/RV730_pfp.bin.ihex | 213 +
> firmware/radeon/RV770_me.bin.ihex | 341 +
> firmware/radeon/RV770_pfp.bin.ihex | 213 +
> include/drm/drmP.h | 57 +-
> include/drm/drm_cache.h | 38 +
> include/drm/drm_crtc.h | 16 +
> include/drm/drm_crtc_helper.h | 3 +
> include/drm/drm_encoder_slave.h | 162 +
> include/drm/drm_fb_helper.h | 82 +
> include/drm/drm_mm.h | 7 +
> include/drm/drm_mode.h | 11 +-
> include/drm/drm_sysfs.h | 12 +
> include/drm/radeon_drm.h | 12 +-
> include/drm/ttm/ttm_bo_api.h | 13 +-
> include/drm/ttm/ttm_bo_driver.h | 94 +-
> include/drm/ttm/ttm_memory.h | 43 +-
> include/drm/ttm/ttm_module.h | 2 +
> 165 files changed, 35577 insertions(+), 41361 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_encoder_slave.c
> create mode 100644 drivers/gpu/drm/drm_fb_helper.c
> rename drivers/gpu/drm/i915/{i915_gem_debugfs.c => i915_debugfs.c} (79%)
> delete mode 100644 drivers/gpu/drm/mga/mga_ucode.h
> create mode 100644 drivers/gpu/drm/radeon/avivod.h
> create mode 100644 drivers/gpu/drm/radeon/mkregtable.c
> create mode 100644 drivers/gpu/drm/radeon/r100_track.h
> create mode 100644 drivers/gpu/drm/radeon/r100d.h
> create mode 100644 drivers/gpu/drm/radeon/r200.c
> delete mode 100644 drivers/gpu/drm/radeon/r300.h
> create mode 100644 drivers/gpu/drm/radeon/r300d.h
> create mode 100644 drivers/gpu/drm/radeon/r420d.h
> create mode 100644 drivers/gpu/drm/radeon/r600_blit.c
> create mode 100644 drivers/gpu/drm/radeon/r600_blit_kms.c
> create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c
> create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.h
> create mode 100644 drivers/gpu/drm/radeon/r600_cs.c
> delete mode 100644 drivers/gpu/drm/radeon/r600_microcode.h
> create mode 100644 drivers/gpu/drm/radeon/r600d.h
> create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_tv.c
> delete mode 100644 drivers/gpu/drm/radeon/radeon_microcode.h
> delete mode 100644 drivers/gpu/drm/radeon/radeon_share.h
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r100
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r200
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r300
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rn50
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rs600
> create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rv515
> delete mode 100644 drivers/gpu/drm/radeon/rs780.c
> rename drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} (78%)
> create mode 100644 drivers/gpu/drm/radeon/rv770d.h
> create mode 100644 firmware/matrox/g200_warp.H16
> create mode 100644 firmware/matrox/g400_warp.H16
> create mode 100644 firmware/r128/r128_cce.bin.ihex
> create mode 100644 firmware/radeon/R100_cp.bin.ihex
> create mode 100644 firmware/radeon/R200_cp.bin.ihex
> create mode 100644 firmware/radeon/R300_cp.bin.ihex
> create mode 100644 firmware/radeon/R420_cp.bin.ihex
> create mode 100644 firmware/radeon/R520_cp.bin.ihex
> create mode 100644 firmware/radeon/R600_me.bin.ihex
> create mode 100644 firmware/radeon/R600_pfp.bin.ihex
> create mode 100644 firmware/radeon/RS600_cp.bin.ihex
> create mode 100644 firmware/radeon/RS690_cp.bin.ihex
> create mode 100644 firmware/radeon/RS780_me.bin.ihex
> create mode 100644 firmware/radeon/RS780_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV610_me.bin.ihex
> create mode 100644 firmware/radeon/RV610_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV620_me.bin.ihex
> create mode 100644 firmware/radeon/RV620_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV630_me.bin.ihex
> create mode 100644 firmware/radeon/RV630_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV635_me.bin.ihex
> create mode 100644 firmware/radeon/RV635_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV670_me.bin.ihex
> create mode 100644 firmware/radeon/RV670_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV710_me.bin.ihex
> create mode 100644 firmware/radeon/RV710_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV730_me.bin.ihex
> create mode 100644 firmware/radeon/RV730_pfp.bin.ihex
> create mode 100644 firmware/radeon/RV770_me.bin.ihex
> create mode 100644 firmware/radeon/RV770_pfp.bin.ihex
> create mode 100644 include/drm/drm_cache.h
> create mode 100644 include/drm/drm_encoder_slave.h
> create mode 100644 include/drm/drm_fb_helper.h
> create mode 100644 include/drm/drm_sysfs.h
there's a new build failure:
drivers/built-in.o: In function `drm_irq_uninstall':
(.text+0xb719e): undefined reference to `vga_client_register'
drivers/built-in.o: In function `drm_irq_install':
(.text+0xb7309): undefined reference to `vga_client_register'
drivers/built-in.o: In function `radeon_device_fini':
(.text+0xe400f): undefined reference to `vga_client_register'
drivers/built-in.o: In function `radeon_device_init':
(.text+0xe455b): undefined reference to `vga_client_register'
with the attached config, introduced with upstream merge 44040f1.
At first sight it appears to be due to CONFIG_DRM_RADEON relying on
VGA_ARB facilities but this is not expressed in the Kconfig rules. The
patch below solves this - but this is just a quick patch, i have not
investigated any deeper.
Review of the code suggests that i915 has a similar dependency problem -
i fixed that too.
Thanks,
Ingo
Signed-off-by: Ingo Molnar <mingo@...e.hu>
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index e4d971c..b58dc19 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -59,6 +59,7 @@ config DRM_RADEON
select FW_LOADER
select DRM_KMS_HELPER
select DRM_TTM
+ select VGA_ARB
help
Choose this option if you have an ATI Radeon graphics card. There
are both PCI and AGP versions. You don't need to choose this to
@@ -102,6 +103,7 @@ config DRM_I915
select BACKLIGHT_CLASS_DEVICE if ACPI
select INPUT if ACPI
select ACPI_VIDEO if ACPI
+ select VGA_ARB
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM 865G or 915G integrated graphics. If M is selected, the
View attachment "config" of type "text/plain" (70299 bytes)
Powered by blists - more mailing lists