All of lore.kernel.org
 help / color / mirror / Atom feed
* [git pull] drm tree.
@ 2009-09-21  5:12 Dave Airlie
  2009-09-21 11:59 ` Ed Tomlinson
  2009-09-21 16:12 ` [origin tree build failure] [PATCH] " Ingo Molnar
  0 siblings, 2 replies; 16+ messages in thread
From: Dave Airlie @ 2009-09-21  5:12 UTC (permalink / raw)
  To: torvalds; +Cc: dri-devel, linux-kernel

[-- Attachment #1: Type: TEXT/PLAIN, Size: 80704 bytes --]


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

commit 28d520433b6375740990ab99d69b0d0067fd656b
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 21 14:33:58 2009 +1000

    drm/vgaarb: add VGA arbitration support to the drm and kms.
    
    VGA arb requires DRM support for non-kms drivers, to turn on/off
    irqs when disabling the mem/io regions.
    
    VGA arb requires KMS support for GPUs where we can turn off VGA
    decoding. Currently we know how to do this for intel and radeon
    kms drivers, which allows them to be removed from the arbiter.
    
    This patch comes from Fedora rawhide kernel.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit aadd4e17452d3d5c2269cd2b000b7de7cfb6c79e
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Mon Sep 21 14:48:45 2009 +1000

    drm/radeon: some r420s have a CP race with the DMA engine.
    
    This patch makes sure the CP doesn't DMA do VRAM while 2D
    is active by inserting a CP resync token.
    
    todo: port to kms.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 5a6e9f9658c853fea8ebbf64cd36287f00a011a2
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Fri Sep 18 11:30:30 2009 -0400

    drm/radeon/r600/kms: rv670 is not DCE3
    
    RV670 was using the wrong modesetting code.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 18a4cd2e9147dd41234dade56edb62c6222832eb
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Sep 21 14:15:10 2009 +1000

    drm/radeon/kms: r420 idle after programming GA_ENHANCE
    
    https://bugs.freedesktop.org/show_bug.cgi?id=24041
    
    The idle allows rs690 to startup properly.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fe62e1a45d8b11cf653cba79e244fc07bb9a84b0
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Sep 21 14:06:30 2009 +1000

    drm/radeon/kms: more fixes to rv770 suspend/resume path.
    
    This resumes my
    RV730PRO (4650)
    RV770 (4850)
    fine.
    
    Still researching the RV4550 (RV710), resumes without X fine.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 4153e584ee02ee59388a89879795fd3653a6b6da
Author: Dave Airlie <airlied@linux.ie>
Date:   Fri Sep 18 18:41:24 2009 +1000

    drm/radeon/kms: more alignment for rv770.c with r600.c
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 9052aa2458fc13788e468a010fa0ed9aa4020380
Author: Dave Airlie <airlied@linux.ie>
Date:   Fri Sep 18 18:33:07 2009 +1000

    drm/radeon/kms: rv770 blit init called too late.
    
    re-align with r600 code, to init blit earlier.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fc30b8efbe1b271eb64e0d4f6cb2a91bb57ee5f3
Author: Dave Airlie <airlied@linux.ie>
Date:   Fri Sep 18 15:19:37 2009 +1000

    drm/radeon/kms: move around new init path code to avoid posting at init
    
    We really don't want to post the card at init, it takes a relatively
    long time and isn't required, so split the resume path into
    a startup path called by both init/resume and separate resume
    entry point to do posting.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit bc1a631e5104317cc8b4ef7d14adc597f2844003
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Sep 15 11:07:52 2009 +1000

    drm/radeon/r600: fix some issues with suspend/resume.
    
    a) don't zero gart table on gart enable
    b) move pinning shader object into resume path
    c) unpin shader object on suspend
    d) set cp ready to false after cp shutdown on suspend.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 698443d9ec1a33eff65b27b9514e06998bf57eb3
Author: Dave Airlie <airlied@linux.ie>
Date:   Fri Sep 18 14:16:38 2009 +1000

    drm/radeon/kms: disable VGA rendering engine before taking over VRAM
    
    Before we use any of VRAM, we need to disable the VGA rendering
    engine, this render text mode into a graphical framebuffer
    for scanout, however it does this on vblank, and can end up
    overwriting the GART table and r600 shader objects.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 5e6dde7ec2e72f49ff749204efc03a59478d7d34
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Thu Sep 17 09:42:28 2009 +0200

    drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
    
    Someone on IRC reported problems after commit
    95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6 ('drm/radeon/kms: Move
    radeon_clocks_init() call back after getting VRAM info.'). And indeed, at least
    some ASIC vram_info hooks use the clock info obtained by
    radeon_get_clock_info(). So, move that call out of radeon_clocks_init(), ahead
    of the radeon_vram_info() call.
    
    [airlied - fixup missing r600/rv770 calls]
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    
    drm/radeon/kms: fix get clock info calls for r600/rv770 init path.
    
    These were missed when it got split out.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 445282db9e815e7f5e82761c3c971dc9ea988d85
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed Sep 9 17:40:54 2009 +1000

    drm/radeon/kms: add initial connector properties
    
    This adds:
    coherent mode: TMDS coherent mode for atom cards.
    scaling mode: LVDS scaler mode
    load detect: DAC load detection, DVI-I, VGA, TV
    tmds pll: legacy TMDS pll selection
    tv standard: TV standard selection.
    
    for later: other TV ones? dvi subconnector selection using std prop
    
    [contains fixes pointed out on dri-devel for atom bios mixups
     by Michel]
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c88f9f0c91de55efaece6d9bd9ec920b90244776
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:30 2009 +0200

    drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 733289c2656c556d5cf36eafa1c8ec77222c359f
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Sep 16 15:24:21 2009 +0200

    drm/radeon/kms: don't fail if we fail to init GPU acceleration
    
    Userspace can query if acceleration is working or not true get
    info ioctl and could fallback to software if for some reason
    kernel failed to initialize KMS. This should allow to give a
    working KMS setup in all case (even with non functionning accel).
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7cbb355e947b3b426cefd9a3dc0dda3af9f9345a
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Sep 17 16:11:31 2009 +1000

    drm/r600/kms: fixup number of loops per blit calculation.
    
    Some people were seeing
    *ERROR* radeon: writting more dword to ring than expected
    after certain blits, the loops calculation didn't take
    into account that we do a separate blit for the remainder
    after doing the aligned blits.
    
    Acked-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 41456df2d45299c2eea5aaabafbaa2430ab9a124
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Sep 16 10:15:21 2009 +1000

    drm/radeon/kms: reprogram format in set base.
    
    This should in theory fix the problem with a mode set being required
    for adjusting the color depth.
    
    This also adds in the necessary bits to the format tables for
    8-bit, though it doesn't work yet.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 65cb15a686cedab52abc336d7a400fe3a110ac4c
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Sep 18 14:31:48 2009 +1000

    drm/radeon: avivo chips have no separate int bit for display
    
    display interrupts are not enabled via this register, the
    DISPLAY_INT bit is a status only to show that other regs
    need to be read.
    
    Noticed by Alex Deucher
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b15591f3120309093fc6d3df26b4242187d7b384
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Thu Sep 17 14:25:12 2009 -0400

    drm/radeon/r600: don't do interrupts
    
    Interrupts are not supported yet.  This prevents
    things like mesa from trying to use them.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 812c369dbf3b5a726b52bbfb8adbc230f3f81bcf
Author: Pekka Paalanen <pq@iki.fi>
Date:   Thu Sep 17 22:59:54 2009 +0300

    drm: fix _DRM_GEM addmap error message
    
    Fix the error message: this is add, not rm.
    Move the closing brace to proper spot: _DRM_GEM branch should not be
    included in the block.
    
    Signed-off-by: Pekka Paalanen <pq@iki.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 9b1596af17dc9bf38c304f69fb253d6cfa73d136
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Fri Sep 18 10:43:52 2009 +1000

    drm: update crtc x/y when only fb changes
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit e87b2c42b397ae64ac13a390011931f7ef222321
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Sep 17 18:14:41 2009 -0700

    drm: fix drm_fb_helper handling of kernel crtcs
    
    The drm_fb_helper shouldn't mess with CRTCs that aren't enabled or in
    its initial config. Ideally it shouldn't even include CRTCs in its
    initial config if they're not in use, but my old fix for that no longer
    works.  At any rate, this fixes a real bug I was seeing where after a
    console blank, both pipes would come back on, even though only one had
    been enabled before that.  Since the other pipe had a bogus config,
    this led to some screen corruption.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 8dfaa8a7779ad2667d539aca6ae11cd87f562db6
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:27 2009 +0200

    drm/radeon/kms: Get LVDS native mode details from EDID if necessary.
    
    Fixes RMX problems on older Apple laptops which don't have an x86 BIOS ROM.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit f657c2a7310ad56e2b67f35f4c5c6106a7146b9c
Author: Yang Zhao <yang@yangman.ca>
Date:   Tue Sep 15 12:21:01 2009 +1000

    drm/radeon: Save and restore bios scratch regs during S/R
    
    [airlied:- adapted slightly in naming]
    
    Signed-off-by: Yang Zhao <yang@yangman.ca>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ecb114a128d150422d22eda238cb812f6b20bf39
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Sep 15 11:12:56 2009 +1000

    drm/radeon/kms: IB locking dumps out a lockdep ordering issue
    
    We sometimes lock IB then the ring and sometimes the ring then
    the IB. This is mostly due to the IB locking not being well defined
    about what data in the structs it actually locks. Define what I
    believe is the correct behaviour and gets rid of the lock dep ordering
    warning.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 42dea5ddb56fe10e1d9a7840ddcb1df97a208a99
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Sep 15 20:21:11 2009 +1000

    drm/radeon/kms: we should return 0 when we have no modes not -1.
    
    This fixes my monitor with broken EDID so it at least get 800x600.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 48e113e516a94ac9622a8326c4de670beb3366e6
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:32 2009 +0200

    drm/radeon/kms: Free CS parser state tracking memory.
    
    Fixes leak hidden in commit 9f022ddfb23793b475ff7e57ac08a766dd5d31bd
    ('drm/radeon/kms: convert r4xx to new init path').
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit fdd5cace733370ab7a518a98ef084e02aa76fdea
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:33 2009 +0200

    drm/radeon/kms: Don't kzalloc memory which is immediately overwritten.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:26 2009 +0200

    drm/radeon/kms: Move radeon_clocks_init() call back after getting VRAM info.
    
    It may indirectly call radeon_set_clock_gating() which relies on the VRAM info.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit fb1fbf8e098cd4cd2c1dece3dc8f15e7de82170a
Author: Michel Dänzer <daenzer@vmware.com>
Date:   Tue Sep 15 17:09:28 2009 +0200

    drm/radeon/kms: Only add common modes which fit in both panel dimensions.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 70ba2a374704e00df8868a7ac3d7350329d28924
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 15 09:03:43 2009 +1000

    drm/radeon/kms: add 32/64 ioctl support.
    
    Although the new radeon driver ioctls don't need this, some of
    the drm initialisation ioctls require it, so add this to make them
    work.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 4aac047323e3082d0866b8ad3784236632105af4
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Mon Sep 14 18:29:49 2009 +0200

    drm/radeon/kms: clear confusion in GART init/deinit path
    
    GART static one time initialization was mixed up with GART
    enabling/disabling which could happen several time for instance
    during suspend/resume cycles. This patch splits all GART
    handling into 4 differents function. gart_init is for one
    time initialization, gart_deinit is called upon module unload
    to free resources allocated by gart_init, gart_enable enable
    the GART and is intented to be call after first initialization
    and at each resume cycle or reset cycle. Finaly gart_disable
    stop the GART and is intended to be call at suspend time or
    when unloading the module.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 21f9a437222e92adb3abc68584a5f04801b92739
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Fri Sep 11 15:55:33 2009 +0200

    drm/radeon/kms: cleanup - remove radeon_share.h
    
    radeon_share.h was begining to give problem with include order in
    respect of radeon.h. It's easier and also i think cleaner to move
    what was in radeon_share.h into radeon.h. At the same time use the
    extern keyword for function shared accross the module.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a4d68279b44522a2b2374a6bd4861756bfad40fe
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Fri Sep 11 13:00:43 2009 +0200

    drm/radeon/kms: move mtrr range add and memory information
    
    Move mtrr range and memory information printing to radeon_object_init,
    this are memory information and initialization common to all GPU and
    they better fit in this function. Will also prevent code duplication
    with upcoming init path changes.
    
    airlied: fixed warning introduced
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 9f022ddfb23793b475ff7e57ac08a766dd5d31bd
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Fri Sep 11 15:35:22 2009 +0200

    drm/radeon/kms: convert r4xx to new init path
    
    This convert r4xx to new init path it also fix few bugs.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit d42571efe33552cd519b7f3800a788b5f2d51798
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Fri Sep 11 15:27:14 2009 -0400

    drm/radeon/kms: fix typo in quirks
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 1be340563cf40210487afe332c0d7c9a523dba5f
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Fri Sep 11 12:02:03 2009 -0400

    drm/radeon/kms/r600: fix blit dword count for non r6xx
    
    rv6xx emits two extra dwords in the render target setup.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 7747b713049e63aa64bcac679535ddfff92b312d
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Fri Sep 11 11:15:43 2009 -0400

    drm/radeon/kms: add common lvds modes in the ddc case
    
    previous patch only handled the non-ddc case.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 2f9a60d76692ffbc749d97ac55717f70eb1f9432
Author: Dave Airlie <airlied@linux.ie>
Date:   Fri Sep 11 18:35:38 2009 +1000

    drm/radeon/kms: set fbdev_info for suspend/resume
    
    this hopefully will bring back suspend/resume under kms.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6cf8a3f58806f12b975a89cfd7edf01566ff80a0
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Thu Sep 10 21:46:48 2009 +0200

    drm/radeon/kms: move modeset init outside of GPU init
    
    We are splitting GPU & modeset init so that it's easier
    to abord only remaining GPU init when somethings fails.
    We want to always provide enough funcionalities to get
    fbcon and a shadowfb X working. Only acceptable error
    during initialization are memory allocation failure or
    io mapping failure.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 923f6848e1686059ef8d272d1fca4d3577911a41
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Thu Sep 10 17:53:39 2009 -0400

    drm/radeon/kms: add common scaled modes for TV and LVDS
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 705af9c7a8bcb9c8752a73be9ca356acb5c7688c
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Thu Sep 10 16:31:13 2009 -0400

    drm/radeon/kms: pull in latest quirks and fixes from ddx
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a381287759b2b65e7de9fb35801c781cab016f10
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Thu Sep 10 15:54:35 2009 -0400

    drm/radeon/kms/r600: use blit for BO moves
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c000273ebc830c27b8c9e03d5f4c147d3e310f48
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Thu Sep 10 13:47:09 2009 +0200

    drm/radeon/kms: R3XX/R4XX AGP asic use PCI GART not PCIE GART
    
    R3XX/R4XX AGP asic use the old PCI GART block, not the new PCIE GART.
    Make sure we pick the right GART when disabling AGP.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Acked-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 119e20dc149581db3064661b2e659f308f97b663
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Thu Sep 10 02:53:50 2009 -0400

    drm/radeon/kms/r600: fix blit support
    
    select the correct max number of bytes per blit based
    on whether the size is multiple of 4 bytes.  This
    determines whether we can use 8 or 32 bit pixels for
    the blit.
    
    airlied: also merged the IB padding patch +
    correcting the VS offset for context
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a513c184d99fe10e7b20771ef86f5f807769318f
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Sep 9 22:23:07 2009 +0200

    drm/radeon/kms: Don't try to process irq when we are unloading
    
    If module is being unloaded we should not try to handle irq especialy
    we should not call into drm helper or we could hard hang the computer
    free_irq will call the irq handler to make sure we behave properly.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 905b68223be18937159a29b354e6a332952ff952
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Sep 9 22:24:20 2009 +0200

    drm/radeon/kms: add R4XX mc register access helper.
    
    Atombios will use the mc register access helper and R4XX hw have a
    bigger mc range than R3XX so add R4XX specific mc register access
    helper.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a18d7ea15356679f58c2fafe2957786c5f7f9201
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Sep 9 22:23:27 2009 +0200

    drm/radeon/kms: call r100_cp_disable rather than duplicating code.
    
    r100_cp_fini was duplicating code of r100_cp_disable, call r100_cp_disable
    instead.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 45600232b3dbb97817c9e15de848c742901893e1
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Wed Sep 9 22:23:45 2009 +0200

    drm/radeon/kms: wait for cp idle before stopping it.
    
    If we stop CP and that it's still processing thing GPU hang might
    happen, this patch wait for CP idle (the wait can timeout) so we
    can avoid shutting down CP at bad time. This is especialy usefull
    when reseting the GPU as it seems GPU reset fails to properly reset
    CP when the CP wasn't stop after being idle.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 5d93b135fc051be3740cbe55729fc7b86a7069d7
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Wed Sep 9 16:09:36 2009 -0400

    drm/radeon/r600: fix legacy blit code
    
    ARRAY_SIZE is number of elements not bytes.  Fix
    ring counts accordingly, also make a few functions
    static.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit cecc6b63a5de547a345c491bb4c18c01a15984a4
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Tue Sep 8 14:45:05 2009 -0400

    drm/radeon/r600: use fence->timeout directly
    
    Fixes fence timeouts on r6xx/r7xx.  Noticed by
    taiu on IRC.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>

commit 60d15f551abdbc5fef70d85f55aac1e85950bf59
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Tue Sep 8 14:22:45 2009 -0400

    drm/radeon/kms: re-apply 2007d633d639c896396e4c4b53b38068f3831307
    
    Got accidently reverted by c93bb85b5cba3e3a06f2cad8e9bc5c23d3d10aac
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d
Merge: c746e20... 3ff323f...
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 8 14:49:32 2009 +1000

    Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
    
    This was a non-trivial merge with some patches sent to Linus
    in drm-fixes.
    
    Conflicts:
    	drivers/gpu/drm/radeon/r300.c
    	drivers/gpu/drm/radeon/radeon_asic.h
    	drivers/gpu/drm/radeon/rs600.c
    	drivers/gpu/drm/radeon/rs690.c
    	drivers/gpu/drm/radeon/rv515.c

commit c746e205f2fb6f74b4a622382607f065eca5eb49
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Sep 8 14:38:45 2009 +1000

    drm/radeon/kms: don't allow ERESTART to hit userspace.
    
    the pre-r600 fence code returns ebusy if we get hit by a signal
    so we should continue to do that.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 620f37811dcc9e0f97ee79fbf8908fcc097deaee
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Sep 8 11:51:46 2009 +1000

    drm: prune modes when output is disconnected.
    
    When an output was disconnected, its mode list would remain.  If you later
    plugged into a sink with no EDID (projector, etc), you'd inherit the mode
    list from the old sink, which is not what you want.
    
    taken from Fedora kernel
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 1ecff1eb0b83efa85be5b54c958e831e37f993f3
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Sep 8 11:48:40 2009 +1000

    drm: shut the EDID warnings up.
    
    These really aren't all that useful.
    
    taken from Fedora kernel.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ec2a4c3fdc8e82fe82a25d800e85c1ea06b74372
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Aug 4 11:43:41 2009 +1000

    drm/i915: get the bridge device once.
    
    The driver gets the bridge device in a number of places, upcoming
    vga arb code paths need the bridge device, however they need it in
    under a lock, and the pci lookup can allocate memory. So clean
    this code up before then and get the bridge once for the driver lifetime.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f1938cd6e900a85de64184e46d841efc9efd3484
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 8 11:32:08 2009 +1000

    drm: include seq_file.h for debugfs builds.
    
    Fixes a warning seen on powerpc.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f641e51e7469cc3a8115a3bd70b4526d566b1c60
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 8 11:17:38 2009 +1000

    drm/radeon/kms: lower debugging on dpms events.
    
    Lower the debugging on encoders when getting DPMS events.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a0cdc6495bdd0ea12390b9edaf13c8cb653df109
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 8 11:09:50 2009 +1000

    drm/kms/radeon: make kms default a runtime option
    
    This makes the kms/enable disable a runtime not a build time
    option.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6fcefd56f5060ca99ab03c9f2ad1f17c3a543ca1
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 8 11:08:32 2009 +1000

    drm/kms: fix kms helper license + Kconfig
    
    Allow the KMS module to work properly, and also rename
    it to KMS_HELPER so its clearer what its for.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 3ce0a23d2d253185df24e22e3d5f89800bb3dd1c
Author: Jerome Glisse <jglisse@redhat.com>
Date:   Tue Sep 8 10:10:24 2009 +1000

    drm/radeon/kms: add r600 KMS support
    
    This adds the r600 KMS + CS support to the Linux kernel.
    
    The r600 TTM support is quite basic and still needs more
    work esp around using interrupts, but the polled fencing
    should work okay for now.
    
    Also currently TTM is using memcpy to do VRAM moves,
    the code is here to use a 3D blit to do this, but
    isn't fully debugged yet.
    
    Authors:
    Alex Deucher <alexdeucher@gmail.com>
    Dave Airlie <airlied@redhat.com>
    Jerome Glisse <jglisse@redhat.com>
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 4ce001abafafe77e5dd943d1480fc9f87894e96f
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 13 16:32:14 2009 +1000

    drm/radeon/kms: add initial radeon tv-out support.
    
    This ports the tv-out code from the DDX to KMS.
    
    adds a radeon.tv module option, radeon.tv=0 to disable tv
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 551ebd837c75fc75df81811a18b7136c39cab487
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 1 15:25:57 2009 +1000

    drm/radeon/kms: add rn50/r100/r200 CS tracker.
    
    This adds the command stream checker for the RN50, R100 and R200 cards.
    
    It stops any access to 3D registers on RN50, and does checks
    on buffer sizes on the r100/r200 cards. It also fixes some texture
    sizing checks on r300.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 11670d3c93210793562748d83502ecbef4034765
Merge: 575dc34... 01dfba9...
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 7 20:27:20 2009 +1000

    Merge intel drm-intel-next branch
    
    Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_drv.h
    	drivers/gpu/drm/i915/intel_sdvo.c

commit 575dc34ee0de867ba83abf25998e0963bff451fa
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 7 18:43:26 2009 +1000

    drm/kms: remove old std mode fallback code.
    
    The new code adds modes in the helper, which makes more sense
    I disliked the non-driver code adding modes.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 50fe4cfdc759fb3c0cffc3b90281efb139631fb7
Author: ykzhao <yakui.zhao@intel.com>
Date:   Thu Sep 3 14:30:04 2009 +0800

    drm/kms/i915: Add the default mode for CRT output without EDID
    
    Add the default mode for every output device when there
    is no mode for it.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f0fda0a47b26aba986fe65897891956c1792b526
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Thu Sep 3 09:33:48 2009 +0800

    drm/kms: add a function that can add the mode for the output device without EDID
    
    Add a function that can be used to add the default mode for the output device
    without EDID.
    It will add the default mode that meets with the requirements of given
    hdisplay/vdisplay limit.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 559ee21d261a54c42594ef9405d27e9008eedf44
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Thu Sep 3 09:33:47 2009 +0800

    drm/kms: try to find the std mode in DMT table
    
    When we need to add the standard timing mode, we will firstly check whether it
    can be found in DMT table by comparing the hdisplay/vdisplay/vfresh_rate.
    If it can't be found, then we will use the cvt/gtf to add the required mode.
    If it can be found, it will be returned.
    
    At the same time the function of drm_mode_vrefresh is also fixed. It will
    return the result of actual refresh_rate plus 0.5.
    For example:
    When the calculated value is 84.9, then the fresh_rate is 85.
    When the calculated value is 70.02, then the fresh_rate is 70.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit aa9eaa1f0962152d0bde821149d82fe7b70a6f92
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Thu Sep 3 09:33:46 2009 +0800

    drm/kms: Add the default mode table
    
    When we add a standard timing mode in UMS, we will first check whether it can
    be found in default mode table. If it can't be found, then we will use cvt/gtf
    to add the standard timing mode.
    Add the default mode table so that we can check whether the given mode
    can be found in the default mode table as what we have done in UMS mode.
    
    If the status of one output device is connected but there is no EDID, it will
    have no correct mode. In such case we can add some default modes for it. Of
    course we only add the modes in the default modes list that visible part is not
    greater than 1024x768.
    
    The default mode is autogenerated from the DMT spec. And it is copied from
    xserver/hw/xfree86/modes/xf86EdidModes.c. But the mode with reduced blank
    feature is removed.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 13a8195b148615b15a4f4385f695f2a232095414
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 7 15:45:33 2009 +1000

    drm: split crtc/fb helpers into a separate module
    
    I really don't want to have core drm module rely on CONFIG_FB,
    so this is the easiest answer.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit adf551bb25bfb83b79ce3c3887557ed817e26cc9
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 7 13:49:07 2009 +1000

    drm/radeon/kms: add updated registers from drm-fixes.
    
    Fixes up the DISCARD + 2 sided stencil in the new generator scripts.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a498b8210f2f6ee0529c28048b5c4cecc17937c2
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Sep 1 14:40:41 2009 +1000

    drm/radeon/kms: block depthxy offset from use from userspace.
    
    This could be used to bypass CS checks.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0
Author: Eric Anholt <eric@anholt.net>
Date:   Sun Sep 6 15:18:53 2009 -0700

    drm/i915: Put the idle reclocking work on our private workqueue as well.
    
    Fixes (again) whole-system lockups due to GPU lockups.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 0ef82af7253c1929a3995f271b8b0db462d1a0c3
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Sat Sep 5 18:07:06 2009 +0100

    drm/i915: Pad ringbuffer with NOOPs before wrapping
    
    According to the docs, the ringbuffer is not allowed to wrap in the middle
    of an instruction.
    
    G45 PRM, Vol 1b, p101:
      While the “free space” wrap may allow commands to be wrapped around the
      end of the Ring Buffer, the wrap should only occur between commands.
      Padding (with NOP) may be required to follow this restriction.
    
    Do as commanded.
    
    [Having seen bug reports where there is evidence of split commands, but
    apparently the GPU has continued on merrily before a bizarre and untimely
    death, this may or may not fix a few random hangs.]
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    CC: Eric Anholt <eric@anholt.net>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 5e17ee74b541b56b5d4cfab6502a5116f224e32c
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date:   Thu Sep 3 09:30:06 2009 +0800

    drm/i915: do dynamic clock freq control only in kernel modesetting
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 57cdaf90f5f607eb029356074fefb66c9b1c0659
Author: Keith Packard <keithp@keithp.com>
Date:   Fri Sep 4 13:07:54 2009 +0800

    drm/I915: Use the CRT DDC to get the EDID for DVI-connector on Mac
    
    mac Mini's have a single DDC line on the DVI connector, shared between the
    analog link and the digital link. So, if DDC isn't detected on GPIOE (the
    usual SDVO DDC link), try GPIOA (the usual VGA DDC link) when there isn't a
    VGA monitor connected.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 553bd149bb2de7848b2b84642876f27202421368
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date:   Wed Sep 2 10:57:52 2009 +0800

    drm/i915: fix tiling on IGDNG
    
    It seems that on IGDNG the same swizzling setup always applys.
    And front buffer tiling needs to set address swizzle in display
    arb control too.
    
    Fix plane tricle feed setting in v1 which should be disable bit,
    and always setup address swizzle to let hardware care for buffer
    tiling in all cases.
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 65655d4ab72456c4c3e503fead55fabf8211a79d
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Aug 11 16:05:31 2009 +0200

    drm/i915: modeset: always set intel_crtc->dpms_mode by moving the assignment up.
    
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit c05422d52ee6b4cff8b63eab1a7351780518fc5e
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Aug 11 16:05:30 2009 +0200

    drm/i915: remove open-coded drm_mode_object_find
    
    And clean up a small whitespace goof-up in the same function, while
    I was looking at it.
    
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 67cf781bea52d461b7c8b63b23be19e87c33d7bf
Author: Eric Anholt <eric@anholt.net>
Date:   Mon Aug 31 08:52:02 2009 -0700

    drm/i915: Make the downclocking debug code be under DRM_DEBUG not DRM_ERROR.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit d6073d775c4b26107351cb8d5e21cec4391f6314
Author: Kyle McMartin <kyle@redhat.com>
Date:   Tue May 26 12:27:34 2009 -0400

    drm/i915: i915_modeset is signed
    
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 652c393a3368af84359da37c45afc35a91144960
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Aug 17 13:31:43 2009 -0700

    drm/i915: add dynamic clock frequency control
    
    There are several sources of unnecessary power consumption on Intel
    graphics systems. The first is the LVDS clock. TFTs don't suffer from
    persistence issues like CRTs, and so we can reduce the LVDS refresh rate
    when the screen is idle. It will be automatically upclocked when
    userspace triggers graphical activity. Beyond that, we can enable memory
    self refresh. This allows the memory to go into a lower power state when
    the graphics are idle. Finally, we can drop some clocks on the gpu
    itself. All of these things can be reenabled between frames when GPU
    activity is triggered, and so there should be no user visible graphical
    changes.
    
    Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 043029655816ed4cfc2ed247020ef97e5d637392
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Mon Aug 24 10:25:23 2009 +0800

    drm/i915: Support IGD EOS
    
    In the event that any one of the DAC analog outputs (R,G,B) were driven
    at full-scale (white video) or some analog level close to full-scale
    voltage, and if the video cable were then disconnected, the analog video
    voltage level would exceed the maximum electrical overstress limit of the
    native (thin-oxide) transistors thus causing a long-term reliability concern.
    The electrical overstress condition occurs in this particular case.
    
    This patch address the IGD EOS (electrical overstress condition) issue.
    When the EOS interrupt occurs, OS should disable DAC and then disable EOS,
    then the normal hotplug operation follows.
    
    TODO: it appears the normal unplug interrupt is missed as reported by Li Peng,
    need more checks here.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit ce6feabd1b38f9adf4a962d71bc4762047e8f889
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Aug 24 13:50:26 2009 +0800

    drm/i915: Enable PAL and SECAM format and add the propery for SDVO-TV
    
    Currently SDVO TV only support NTSC-M format. In this patch
    we introduce PAL and SECAM formats available and create seting-format
    property at init time. When user dynamically chose preferred
    format by xrandr command, it will refine all modelines
    provided by SDVO device, then instruct SDVO device to execute.
    At the same time the property is added for SDVO-TV so that the SDVO-TV mode can be changed
    by using xrandr.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=22891
    
    Signed-off-by: Ma Ling <ling.ma@intel.com>
    review-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 213c2e643145fc7d8a67f2d5d54ee0f6d7193e2e
Author: Ma Ling <ling.ma@intel.com>
Date:   Mon Aug 24 13:50:25 2009 +0800

    drm/i915: select TV format according to connector type
    
    For integrated TV there are 3 connector types: S-VIDEO, Composite and
    Component(YprPb). Those tv formats whose component flag is true should
    be assigned to Component connector, others are for S-VIDEO and Composite.
    The patch intends to find appropriate tv format for each connector.
    In such case it will return the correct modeline to user space. Otherwise
    it will return the incorrect modeline when S-video/composite is connected.
    
    Signed-off-by: Ma Ling <ling.ma@intel.com>
    reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 5f6a169598938d9e5703f06b64c4f4f972561ce5
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date:   Mon Aug 10 21:37:24 2009 +0800

    drm/i915: update debugfs interrupt info on IGDNG
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 9e3a6d155ed0a7636b926a798dd7221ea107b274
Author: Ben Gamari <bgamari.foss@gmail.com>
Date:   Wed Jul 1 22:26:53 2009 -0400

    drm/i915: Add i915 register dumping debugfs file
    
    Add a debugfs file to dump the entire register range. Here we
    assume that reading write-only/reserved registers won't make the chip
    angry. Seems to hold true, thankfully.
    
    Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 27c202ad7f141d4efa9c64e30bf4a4d3bcd799ae
Author: Ben Gamari <bgamari.foss@gmail.com>
Date:   Wed Jul 1 22:26:52 2009 -0400

    drm/i915: Move i915_gem_debugfs.c to i915_debugfs.c
    
    Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
    [anholt: hand-applied for conflicts]
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit ff6fdbed8f465f796da7ab32cde67e2dfb9e1f8f
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Tue Sep 1 03:39:04 2009 +0200

    drm/crtc_helper: avoid NULL-pointer dereference when encoder is NULL
    
    Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 9c552dd79346f86a3b53e41255c92c6f560b80fb
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Sep 2 14:00:11 2009 +1000

    drm/crtc: fix mismerge of last patch.
    
    We only want to NULL encoder->crtc when it is off.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a3a0544b2c84e1d7a2022b558ecf66d8c6a8dd93
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Aug 31 15:16:30 2009 +1000

    drm/kms: add explicit encoder disable function and detach harder.
    
    For shared tv-out and VGA encoders, we really need to know if
    the encoder is just being switched off temporarily in blanking
    or if we are really disabling it hard.
    
    Also we need to try harder to disconnect encoders from unused
    connectors so we can share more efficently.
    
    (shared encoders stuff is coming in radeon tv-out support)
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ed017d9fb17af3162f5acf922eb5731c541e1f3a
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Sep 2 09:41:13 2009 +1000

    drm: fix drm_cache.c for arch with no support.
    
    This produces a warn on for architectures where this gets called
    but we don't have a cache flushing implementation suitable.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fa8a123855e20068204982596b8fafceb1a67f0b
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Aug 26 13:13:37 2009 +1000

    drm/mm: add ability to dump mm lists via debugfs
    
    This adds code to the drm_mm to talk to debugfs, and adds
    support to radeon to add the VRAM and GTT mm lists to debugfs.
    
    I tested with spinlock debugging and it doesn't give out.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 3420e74262a7d6496d0ac433d6f61c9972f015f6
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Aug 31 10:33:29 2009 +1000

    drm: fix two issues with fb consolidation.
    
    Set accel to none, we really don't want anyone thinking
    fb is an accel interface.
    Pass pitch not depth to function for intel.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 3b51096f95633e6ab47675984e8e38fc37b09eeb
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Fri Aug 28 22:58:07 2009 +0400

    drm: use proc_create_data()
    
    airlied: fixup race against drm info by filling out
    tmp before adding it to proc.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 882f0219518196a94cd2772004e87b178467139a
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Wed Aug 26 18:20:49 2009 +0800

    drm/kms: Parse the detailed time info in CEA-EDID
    
    Sometimes we can obtain the EDID with multiple blocks from the display device.
    For example: HDMI monitor.
    When the CEA-EDID block is detected, we should also parse the detailed timing
    info from it. Otherwise we will lose some modes for the display device.
    
    The first step is check whether the CEA EDID block is found. If it exists,
    it will skip the CEA-data block and parse the detailed timing info.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 785b93ef8c309730c2de84ce9c229e40e2d01480
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Aug 28 15:46:53 2009 +1000

    drm/kms: move driver specific fb common code to helper functions (v2)
    
    Initially I always meant this code to be shared, but things
    ran away from me before I got to it.
    
    This refactors the i915 and radeon kms fbdev interaction layers
    out into generic helpers + driver specific pieces.
    
    It moves all the panic/sysrq enhancements to the core file,
    and stores a linked list of kernel fbs. This could possibly be
    improved to only store the fb which has fbcon on it for panics
    etc.
    
    radeon retains some specific codes used for a big endian
    workaround.
    
    changes:
    fix oops in v1
    fix freeing path for crtc_info
    
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7dc482dfeeeefcfd000d4271c4626937406756d7
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sun Aug 23 16:59:04 2009 +0100

    drm/r128: Add test for initialisation to all ioctls that require it
    
    Almost all r128's private ioctls require that the CCE state has
    already been initialised.  However, most do not test that this has
    been done, and will proceed to dereference a null pointer.  This may
    result in a security vulnerability, since some ioctls are
    unprivileged.
    
    This adds a macro for the common initialisation test and changes all
    ioctl implementations that require prior initialisation to use that
    macro.
    
    Also, r128_do_init_cce() does not test that the CCE state has not
    been initialised already.  Repeated initialisation may lead to a crash
    or resource leak.  This adds that test.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 70967ab9c0c9017645d167d33675eab996633631
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sat Aug 29 14:53:51 2009 +0100

    radeon: Use request_firmware()
    
    Loosely based on a patch by
    Jaswinder Singh Rajput <jaswinderlinux@gmail.com>.
    
    KMS support by Dave Airlie <airlied@redhat.com>.
    
    For Radeon 100- to 500-series, firmware blobs look like:
        struct {
            __be32 datah;
            __be32 datal;
        } cp_ucode[256];
    
    For Radeon 600-series, there are two separate firmware blobs:
        __be32 me_ucode[PM4_UCODE_SIZE * 3];
        __be32 pfp_ucode[PFP_UCODE_SIZE];
    
    For Radeon 700-series, likewise:
        __be32 me_ucode[R700_PM4_UCODE_SIZE];
        __be32 pfp_ucode[R700_PFP_UCODE_SIZE];
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 1ae70072f0699916c1a77a9bacad958ee46f7395
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Sat Aug 29 22:20:34 2009 +0200

    drm: dereference of tmp in drm_proc_create_files()
    
    tmp allocation may fail, prevent a dereference.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ff846ab7f76ffecba4f0bef026163d2a2364d7d0
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Wed Aug 19 00:56:45 2009 +0200

    drm/crtc_helper: NULL encoder->crtc when switching encoders
    
    - Previously the old encoder would be called during modeset and without a connector bad things happened.
    
    Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f380ef86916904e4b79f7bec599deb51057b2d0c
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Wed Aug 19 00:56:44 2009 +0200

    drm/crtc_helper: place drm_helper_encoder_in_use() in the header file
    
    - The symbol was already exported.
    
    Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit e67aae79f93d9584aaa24d2a2c76383e9d588f98
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Thu Aug 27 10:18:29 2009 +0200

    drm/crtc_helper: replace modeset fail path with something simpler
    
    - The previous system was not very transparent, nor flexible.
    - This is needed to be able to fix a few bugs in the mechanism.
    
    Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 689d7c2a1127378854c7d7ea8d7c81238a824240
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 27 11:51:23 2009 +1000

    drm/radeon: cleanup mkregtable.c
    
    This cleans up the code in mkregtable.c to be more kernel style.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a1a2d1d32250f6fcc317419e9dfb4a5a6946d2e6
Author: Pekka Paalanen <pq@iki.fi>
Date:   Sun Aug 23 12:40:55 2009 +0300

    drm: GEM handles are u32, not int
    
    Several functions in the GEM kernel API used int as handle type, but
    user API has it __u32 which is also the intended type.
    
    Replace int with u32.
    
    Signed-off-by: Pekka Paalanen <pq@iki.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 3f7dc91adef90a20f806282724c40d68d5b020aa
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 27 11:10:15 2009 +1000

    drm/rs600/690: use autogenerated safe register tables.
    
    This ports rs690 to the safe reg tables and makes rs600 also
    use the same table.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 52f97df5da1f94d2b7db1bb53a2f053ae162b649
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sun Aug 23 18:37:26 2009 +0100

    drm/r128: Use request_firmware() to load CCE microcode
    
    Firmware blob looks like this:
        __be32 datah
        __be32 datal
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ece2be7993cc5e269cbf0cad6442b401a2c31915
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sun Aug 23 18:34:25 2009 +0100

    drm/mga: Use request_firmware() to load microcode
    
    Image format is IHEX, one record for each pipe in order (record
    addresses are ignored).
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c9c97b8c75019814d8c007059bc827bb475be917
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 27 09:53:47 2009 +1000

    drm/ttm: consolidate cache flushing code in one place.
    
    This merges the TTM and drm cache flushing into one file in the
    drm core.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Aug 21 13:21:01 2009 +1000

    drm/radeon/kms: generate the safe register tables.
    
    Previously we just made these offline and included them,
    but no reason we can't generate them at build time.
    
    TODO: add rs690 + r100/r200 when done.
    should we do rs480/rs690 no tcl version?
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 759e4f83f418f4001e724042b4c0e408d615d9ec
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Thu Aug 20 10:29:09 2009 +0200

    drm/ttm: Fixes for "Memory accounting rework."
    
    ttm:
    Fix error paths when kobject_add returns an error.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Thu Aug 20 10:29:08 2009 +0200

    drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
    
    ttm:
    Remove a stray debug printout.
    Remove a re-init of the lru spinlock at device init.
    
    radeon:
    Fix the size of the bo_global allocation.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 51c8b4071d84d46cc100baa5931ad06b2a823c95
Merge: a987fca... 6c30c53...
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 20 13:38:04 2009 +1000

    Merge Linus master to drm-next
    
    linux-next conflict reported needed resolution.
    
    Conflicts:
    	drivers/gpu/drm/drm_crtc.c
    	drivers/gpu/drm/drm_edid.c
    	drivers/gpu/drm/i915/intel_sdvo.c
    	drivers/gpu/drm/radeon/radeon_ttm.c
    	drivers/gpu/drm/ttm/ttm_bo.c

commit a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Tue Aug 18 16:51:56 2009 +0200

    ttm: Make parts of a struct ttm_bo_device global.
    
    Common resources, like memory accounting and swap lists should be
    global and not per device. Introduce a struct ttm_bo_global to
    accomodate this, and register it with sysfs. Add a small sysfs interface
    to return the number of active buffer objects.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 5fd9cbad3a4ae82c83c55b9c621d156c326724ef
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Mon Aug 17 16:28:39 2009 +0200

    drm/ttm: Memory accounting rework.
    
    Use inclusive zones to simplify accounting and its sysfs representation.
    Use DMA32 accounting where applicable.
    
    Add a sysfs interface to make the heuristically determined limits
    readable and configurable.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit e9840be8c23601285a70520b4898818f28ce8c2b
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Tue Aug 18 10:27:57 2009 +0200

    drm/ttm: Add a virtual ttm sysfs device.
    
    The device directory will be the base directory of the
    sysfs representation of other ttm subsystems.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 327c225bd548bf7871f116a0baa5ebdac884e452
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Mon Aug 17 16:28:37 2009 +0200

    drm: Enable drm drivers to add drm sysfs devices.
    
    Export utility functions for drivers to add specialized devices in the
    sysfs drm class subdirectory.
    
    Initially this will be needed form TTM to add a virtual device that
    handles power management.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit a0724fcf829e5afb66159ef68cb16a805ea11b42
Author: Pekka Paalanen <pq@iki.fi>
Date:   Mon Aug 17 01:18:38 2009 +0300

    drm/ttm: optimize bo_kmap_type values
    
    A micro-optimization on the function ttm_kmap_obj_virtual().
    
    By defining the values of enum ttm_bo_kmap_obj::bo_kmap_type to have a
    bit indicating iomem, size of the function ttm_kmap_obj_virtual() will be
    reduced by 16 bytes on x86_64 (gcc 4.1.2).
    
    ttm_kmap_obj_virtual() may be heavily used, when buffer objects are
    accessed via wrappers, that work for both kinds of memory addresses:
    iomem cookies and kernel virtual.
    
    Signed-off-by: Pekka Paalanen <pq@iki.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 949ef70e2d1a5c12178875f513df34fc85d91a38
Author: Pekka Paalanen <pq@iki.fi>
Date:   Mon Aug 17 19:49:19 2009 +0300

    drm/kms: no need to return void value (encoder)
    
    Cc: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Pekka Paalanen <pq@iki.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 53bd83899f5ba6b0da8f5ef976129273854a72d4
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed Jul 1 10:04:40 2009 -0700

    drm: clarify scaling property names
    
    Now that we're using the scaling property in the Intel driver I noticed
    that the names were a bit confusing.  I've corrected them according to
    our discussion on IRC and the mailing list, though I've left out
    potential new additions for a new scaling property with an integer (or
    two) for the scaling factor.  None of the drivers implement that today,
    but if someone wants to do it, I think it could be done with the
    addition of a single new type and a new property to describe the
    scaling factor in the X and Y directions.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Acked-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 776f3360de6ed246e973577828f725681120fd7a
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Aug 19 15:56:37 2009 +1000

    drm: fixup includes in encoder slave header files.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 453a7d46dca88704ed88b364c445ff55680a8557
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed Aug 19 15:51:55 2009 +1000

    drm: remove root requirement from DRM_IOCTL_SET_VERSION (+ DRM_IOCTL_AUTH_MAGIC)
    
    Just a DRM_MASTER flag is sufficient here, though maybe this call is
    totally deprecated anyway (xf86-video-intel still calls it though).
    
    (airlied: drop ioctl auth_magic as discussed on mailing list also)
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit cfcf4738cd6b5d7bed1473acad76d6430cf1fb0a
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Aug 13 13:31:54 2009 +1000

    drm: fixup include file in drm_encoder_slave
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a75f0236292a5fca65f26efedca48bd07db1834d
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Wed Aug 12 02:30:10 2009 +0200

    drm: Add more standard TV properties.
    
    Overscan, saturation, hue. Used in the nouveau driver for GPUs with
    integrated TV encoders.
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 841b4117b30d544690fceb952037b1cddf14783f
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Wed Aug 12 02:30:09 2009 +0200

    drm: Fix drm_cvt_mode() for interlaced modes.
    
    The calculated vdisplay was half the right value.
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b6b7902e54c7e8abbc213d8bdc290350c00ccfe5
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Sun Aug 2 04:19:20 2009 +0200

    drm: Define some new standard TV properties.
    
    Namely "brightness", "contrast" and "flicker reduction".
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit aeaa1ad3ff32be833680e484d99ec29d892da1ff
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Sun Aug 2 04:19:19 2009 +0200

    drm: Define DRM_MODE_SUBCONNECTOR_SCART
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 74bd3c26b90f39b9dcc05c471333da8998572b5d
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Sun Aug 2 04:19:18 2009 +0200

    drm: Define DRM_MODE_CONNECTOR_TV
    
    The existing TV connector types are often unsuitable either because
    there is no way to probe them until they're actually plugged in or
    because they can change during run time (e.g. 7-pin DIN connectors
    that behave as S-Video, Component, Composite or SCART depending on the
    adaptor plugged in).
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 2066facca4c7dfe9f5068ece0200a4dbf10f49e1
Author: Francisco Jerez <currojerez@riseup.net>
Date:   Sun Aug 2 04:19:17 2009 +0200

    drm/kms: slave encoder interface.
    
    Define some helper functions to make easier to detach a KMS encoder
    implementation from the drm module of the GPU it's used in. This is
    mainly useful for some external I2C encoders known to be present on
    cards with GPUs from several different manufacturers.
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 58367ed65f30128d8b763bf4c1fb942da49ade15
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jul 20 13:48:07 2009 +0800

    drm: Add the debug info in generic drm mode by using DRM_DEBUG_KMS
    
    Add the debug info in generic drm mode by using DRM_DEBUG_KMS
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 87fdff81cd2d770f0adc742e21eb5e062ad20def
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jul 20 13:48:06 2009 +0800

    DRM: Add the explanation about DRM debug level
    
    Add the explanation about DRM debug level in the drmP header file. This is to
    explain how/where to use the different DRM debug level.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f940f37f022f7392ab81a35516222cbd46110b42
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jul 20 13:48:05 2009 +0800

    drm: Remove the macro defintion of DRM_DEBUG_MODE
    
    Two macro definitions of DRM_DEBUG_KMS/MODE can be used to add the debug
    info related with KMS. It is confusing.
    So remove the macro definition of DRM_DEBUG_MODE. Instead it can be replaced
    by the DRM_DEBUG_KMS.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Acked-by: Ian Romanick <ian.d.romanick@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 8a4c47f346cc7a12d0897c05eb3cc1add26b487f
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jul 20 13:48:04 2009 +0800

    drm: Remove the unused prefix in DRM_DEBUG_KMS/DRIVER/MODE
    
    We will have to add a prefix when using the macro defintion of DRM_DEBUG_KMS
    /DRM_DEBUG_DRIVER/MODE. It is not convenient. We should use the DRM_NAME
    as default prefix.
    So remove the prefix in the macro definition of DRM_DEBUG_KMS/DRIVER/MODE.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Acked-by: Ian Romanick <ian.d.romanick@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 5c61259e6c7290082108e93815f7f72f27da14f4
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jun 22 13:17:10 2009 +0800

    drm/mode: get the modeline for standard timing in EDID by using CVT/GTF
    
    Create the standard timing modeline by using CVT/GFT algorithm while
    interpreting the EDID.
    
    In course of interpreting the EDID, the timing level will be obtained,
    which is used to determine whether the CVT/GTF algorithm is selected to
    generate the modeline for the given hdisplay/vdisplay/vrefresh_rate.
    In the UMS mode firstly it will check whether it can be found in
    the DMT table. If it can be found, then the modeline is returned. Then the
    timing_level is used to choose CVT/GTF.
    As there is no DMT table, no modeline is returned when timing level
    is DMT. For the other two timing levels, the CVT/GTF will be called to
    generate the required standard timing modeline.
    
    [airlied: fixed up conflicts since EDID rework]
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 26bbdadad356ec02d33657858d91675f3e9aca94
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jun 22 13:17:09 2009 +0800

    drm/mode: add the GTF algorithm in kernel space
    
    Add the GTF algorithm in kernel space. And this function can be called to
    generate the required modeline.
    
    I copied it from the file of xserver/hw/xfree86/modes/xf86gtf.c. What I have
    done is to translate it by using integer calculation. This is to avoid
    the float-point calculation in kernel space.
    At the same tie I also refer to the function of fb_get_mode in
    drivers/video/fbmon.c
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit d782c3f95c9263dc0b98e7115f75f1e18b9600b3
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Mon Jun 22 13:17:08 2009 +0800

    drm/mode: add the CVT algorithm in kernel space
    
    Add the CVT algorithm in kernel space. And this function can be called to
    generate the required modeline.
    
    I copied it from the file of xserver/hw/xfree86/modes/xf86cvt.c. What I have
    done is to translate it by using integer calculation. This is to avoid
    the float-point calculation in kernel space.
    
    [airlied:- cleaned up some bits]
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [git pull] drm tree.
  2009-09-21  5:12 [git pull] drm tree Dave Airlie
@ 2009-09-21 11:59 ` Ed Tomlinson
  2009-09-21 14:17   ` Alex Deucher
  2009-09-21 16:12 ` [origin tree build failure] [PATCH] " Ingo Molnar
  1 sibling, 1 reply; 16+ messages in thread
From: Ed Tomlinson @ 2009-09-21 11:59 UTC (permalink / raw)
  To: Dave Airlie; +Cc: dri-devel, linux-kernel

On Monday 21 September 2009 01:12:54 Dave Airlie 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.

Dave,

What user space stuff (xorg/mesa) is required to use the R300 3D?

TIA,
Ed Tomlinson

> 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
>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [git pull] drm tree.
  2009-09-21 11:59 ` Ed Tomlinson
@ 2009-09-21 14:17   ` Alex Deucher
  2009-09-21 22:40     ` Ed Tomlinson
  0 siblings, 1 reply; 16+ messages in thread
From: Alex Deucher @ 2009-09-21 14:17 UTC (permalink / raw)
  To: Ed Tomlinson; +Cc: Dave Airlie, linux-kernel, dri-devel

On Mon, Sep 21, 2009 at 7:59 AM, Ed Tomlinson <edt@aei.ca> wrote:
> On Monday 21 September 2009 01:12:54 Dave Airlie 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.
>
> Dave,
>
> What user space stuff (xorg/mesa) is required to use the R300 3D?
>

r300 3D has been available for years.  If you mean r600 3D, you need
xf86-video-ati 6.12.4 or newer and mesa from git master.

Alex

> TIA,
> Ed Tomlinson
>
>> 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
>>
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay
> ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
> http://p.sf.net/sfu/devconf
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/dri-devel
>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-21  5:12 [git pull] drm tree Dave Airlie
  2009-09-21 11:59 ` Ed Tomlinson
@ 2009-09-21 16:12 ` Ingo Molnar
  2009-09-21 16:50   ` [PATCH] drm: Fix build failure in radeon and i915 drivers Ingo Molnar
  2009-09-22  3:56   ` [origin tree build failure] [PATCH] Re: [git pull] drm tree Dave Airlie
  1 sibling, 2 replies; 16+ messages in thread
From: Ingo Molnar @ 2009-09-21 16:12 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, dri-devel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 17239 bytes --]


* Dave Airlie <airlied@linux.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@elte.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

[-- Attachment #2: config --]
[-- Type: text/plain, Size: 70298 bytes --]

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31
# Mon Sep 21 18:04:27 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
# CONFIG_X86_64 is not set
CONFIG_X86=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_FAST_CMPXCHG_LOCAL=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
# CONFIG_GENERIC_TIME_VSYSCALL is not set
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ZONE_DMA32 is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y

#
# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_BZIP2=y
# CONFIG_KERNEL_LZMA is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
# CONFIG_TASK_IO_ACCOUNTING is not set
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_TREE=y

#
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
CONFIG_RCU_TRACE=y
CONFIG_RCU_FANOUT=32
CONFIG_RCU_FANOUT_EXACT=y
CONFIG_TREE_RCU_TRACE=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=20
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_GROUP_SCHED is not set
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_NS=y
CONFIG_CGROUP_FREEZER=y
# CONFIG_CGROUP_DEVICE is not set
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
# CONFIG_CGROUP_MEM_RES_CTLR is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
# CONFIG_IPC_NS is not set
CONFIG_USER_NS=y
CONFIG_PID_NS=y
# CONFIG_NET_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EMBEDDED=y
# CONFIG_UID16 is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
# CONFIG_ELF_CORE is not set
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
# CONFIG_EPOLL is not set
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
# CONFIG_SHMEM is not set
CONFIG_AIO=y
CONFIG_HAVE_PERF_COUNTERS=y

#
# Performance Counters
#
# CONFIG_PERF_COUNTERS is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
CONFIG_SLUB_DEBUG=y
# CONFIG_STRIP_ASM_SYMS is not set
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
# CONFIG_MARKERS is not set
CONFIG_OPROFILE=y
# CONFIG_OPROFILE_IBS is not set
CONFIG_OPROFILE_EVENT_MULTIPLEX=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_API_DEBUG=y

#
# GCOV-based kernel profiling
#
# CONFIG_GCOV_KERNEL is not set
CONFIG_SLOW_WORK=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
# CONFIG_MODULES is not set
CONFIG_BLOCK=y
CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_INTEGRITY=y

#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
CONFIG_FREEZER=y

#
# Processor type and features
#
CONFIG_TICK_ONESHOT=y
# CONFIG_NO_HZ is not set
CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_SPARSE_IRQ=y
CONFIG_X86_MPPARSE=y
CONFIG_X86_BIGSMP=y
CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_ELAN=y
CONFIG_X86_MRST=y
CONFIG_X86_RDC321X=y
# CONFIG_X86_32_NON_STANDARD is not set
# CONFIG_SCHED_OMIT_FRAME_POINTER is not set
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_MEMTEST is not set
CONFIG_X86_CPU=y
CONFIG_X86_L1_CACHE_BYTES=64
CONFIG_X86_INTERNODE_CACHE_BYTES=64
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=4
CONFIG_X86_XADD=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_ALIGNMENT_16=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_MINIMUM_CPU_FAMILY=4
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_CYRIX_32=y
CONFIG_CPU_SUP_AMD=y
CONFIG_CPU_SUP_CENTAUR=y
CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y
# CONFIG_X86_DS is not set
CONFIG_HPET_TIMER=y
# CONFIG_DMI is not set
# CONFIG_IOMMU_HELPER is not set
# CONFIG_IOMMU_API is not set
CONFIG_NR_CPUS=32
CONFIG_SCHED_SMT=y
# CONFIG_SCHED_MC is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_INTEL is not set
CONFIG_X86_MCE_AMD=y
# CONFIG_X86_ANCIENT_MCE is not set
CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_VM86=y
# CONFIG_TOSHIBA is not set
CONFIG_I8K=y
CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_MICROCODE is not set
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
CONFIG_X86_CPU_DEBUG=y
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_X86_PAE=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_NEED_NODE_MEMMAP_SIZE=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_FLATMEM_MANUAL is not set
# CONFIG_DISCONTIGMEM_MANUAL is not set
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM=y
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
# CONFIG_X86_RESERVE_LOW_64K is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
CONFIG_MTRR_SANITIZER=y
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR_ALL=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=100
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
# CONFIG_HOTPLUG_CPU is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE=""
# CONFIG_CMDLINE_OVERRIDE is not set

#
# Power management and ACPI options
#
CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_VERBOSE=y
# CONFIG_SUSPEND is not set
# CONFIG_PM_RUNTIME is not set
# CONFIG_ACPI is not set

#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y

#
# Bus options (PCI etc.)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
CONFIG_PCI_GOMMCONFIG=y
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOOLPC is not set
# CONFIG_PCI_GOANY is not set
CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
CONFIG_PCI_DEBUG=y
CONFIG_PCI_STUB=y
# CONFIG_HT_IRQ is not set
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
CONFIG_EISA=y
CONFIG_EISA_VLB_PRIMING=y
CONFIG_EISA_PCI_EISA=y
CONFIG_EISA_VIRTUAL_ROOT=y
CONFIG_EISA_NAMES=y
CONFIG_MCA=y
CONFIG_MCA_LEGACY=y
CONFIG_MCA_PROC_FS=y
CONFIG_SCx200=y
CONFIG_SCx200HR_TIMER=y
CONFIG_OLPC=y
CONFIG_K8_NB=y
CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=y
# CONFIG_PCMCIA_LOAD_CIS is not set
CONFIG_PCMCIA_IOCTL=y
# CONFIG_CARDBUS is not set

#
# PC-card bridges
#
# CONFIG_YENTA is not set
# CONFIG_PD6729 is not set
# CONFIG_I82092 is not set
CONFIG_I82365=y
CONFIG_TCIC=y
CONFIG_PCMCIA_PROBE=y
CONFIG_PCCARD_NONSTATIC=y
# CONFIG_HOTPLUG_PCI is not set

#
# Executable file formats / Emulations
#
CONFIG_BINFMT_ELF=y
CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_MISC=y
CONFIG_HAVE_ATOMIC_IOMAP=y
CONFIG_NET=y

#
# Networking options
#
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=y
CONFIG_XFRM_SUB_POLICY=y
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_IPCOMP=y
CONFIG_NET_KEY=y
CONFIG_NET_KEY_MIGRATE=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_ASK_IP_FIB_HASH is not set
CONFIG_IP_FIB_TRIE=y
# CONFIG_IP_FIB_HASH is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=y
CONFIG_NET_IPGRE=y
# CONFIG_NET_IPGRE_BROADCAST is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
CONFIG_INET_AH=y
# CONFIG_INET_ESP is not set
CONFIG_INET_IPCOMP=y
CONFIG_INET_XFRM_TUNNEL=y
CONFIG_INET_TUNNEL=y
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
# CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_INET_LRO=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=y
CONFIG_TCP_CONG_CUBIC=y
CONFIG_TCP_CONG_WESTWOOD=y
CONFIG_TCP_CONG_HTCP=y
CONFIG_TCP_CONG_HSTCP=y
# CONFIG_TCP_CONG_HYBLA is not set
CONFIG_TCP_CONG_VEGAS=y
CONFIG_TCP_CONG_SCALABLE=y
CONFIG_TCP_CONG_LP=y
CONFIG_TCP_CONG_VENO=y
CONFIG_TCP_CONG_YEAH=y
CONFIG_TCP_CONG_ILLINOIS=y
# CONFIG_DEFAULT_BIC is not set
# CONFIG_DEFAULT_CUBIC is not set
# CONFIG_DEFAULT_HTCP is not set
# CONFIG_DEFAULT_VEGAS is not set
# CONFIG_DEFAULT_WESTWOOD is not set
CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
# CONFIG_INET6_AH is not set
CONFIG_INET6_ESP=y
CONFIG_INET6_IPCOMP=y
CONFIG_IPV6_MIP6=y
CONFIG_INET6_XFRM_TUNNEL=y
CONFIG_INET6_TUNNEL=y
CONFIG_INET6_XFRM_MODE_TRANSPORT=y
CONFIG_INET6_XFRM_MODE_TUNNEL=y
CONFIG_INET6_XFRM_MODE_BEET=y
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y
# CONFIG_IPV6_SIT is not set
CONFIG_IPV6_TUNNEL=y
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_MROUTE=y
# CONFIG_IPV6_PIMSM_V2 is not set
CONFIG_NETLABEL=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
CONFIG_NETFILTER_DEBUG=y
CONFIG_NETFILTER_ADVANCED=y

#
# Core Netfilter Configuration
#
CONFIG_NETFILTER_NETLINK=y
CONFIG_NETFILTER_NETLINK_QUEUE=y
CONFIG_NETFILTER_NETLINK_LOG=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
# CONFIG_NF_CONNTRACK_SECMARK is not set
# CONFIG_NF_CONNTRACK_EVENTS is not set
# CONFIG_NF_CT_PROTO_DCCP is not set
CONFIG_NF_CT_PROTO_GRE=y
CONFIG_NF_CT_PROTO_SCTP=y
CONFIG_NF_CT_PROTO_UDPLITE=y
# CONFIG_NF_CONNTRACK_AMANDA is not set
# CONFIG_NF_CONNTRACK_FTP is not set
# CONFIG_NF_CONNTRACK_H323 is not set
# CONFIG_NF_CONNTRACK_IRC is not set
# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
CONFIG_NF_CONNTRACK_PPTP=y
CONFIG_NF_CONNTRACK_SANE=y
CONFIG_NF_CONNTRACK_SIP=y
CONFIG_NF_CONNTRACK_TFTP=y
# CONFIG_NF_CT_NETLINK is not set
# CONFIG_NETFILTER_TPROXY is not set
CONFIG_NETFILTER_XTABLES=y
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_DSCP=y
CONFIG_NETFILTER_XT_TARGET_HL=y
CONFIG_NETFILTER_XT_TARGET_LED=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
CONFIG_NETFILTER_XT_TARGET_RATEEST=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
CONFIG_NETFILTER_XT_MATCH_DCCP=y
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
CONFIG_NETFILTER_XT_MATCH_ESP=y
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
CONFIG_NETFILTER_XT_MATCH_HELPER=y
CONFIG_NETFILTER_XT_MATCH_HL=y
# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
CONFIG_NETFILTER_XT_MATCH_REALM=y
# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
CONFIG_NETFILTER_XT_MATCH_SCTP=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
CONFIG_NETFILTER_XT_MATCH_STRING=y
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
CONFIG_NETFILTER_XT_MATCH_TIME=y
# CONFIG_NETFILTER_XT_MATCH_U32 is not set
CONFIG_NETFILTER_XT_MATCH_OSF=y
# CONFIG_IP_VS is not set

#
# IP: Netfilter Configuration
#
# CONFIG_NF_DEFRAG_IPV4 is not set
# CONFIG_NF_CONNTRACK_IPV4 is not set
CONFIG_IP_NF_QUEUE=y
CONFIG_IP_NF_IPTABLES=y
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
# CONFIG_IP_NF_MATCH_AH is not set
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_TTL is not set
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_TARGET_LOG=y
# CONFIG_IP_NF_TARGET_ULOG is not set
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_ECN=y
# CONFIG_IP_NF_TARGET_TTL is not set
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_SECURITY=y
# CONFIG_IP_NF_ARPTABLES is not set

#
# IPv6: Netfilter Configuration
#
CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_IP6_NF_QUEUE=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=y
CONFIG_IP6_NF_MATCH_EUI64=y
CONFIG_IP6_NF_MATCH_FRAG=y
CONFIG_IP6_NF_MATCH_OPTS=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
CONFIG_IP6_NF_MATCH_MH=y
CONFIG_IP6_NF_MATCH_RT=y
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_TARGET_LOG=y
# CONFIG_IP6_NF_FILTER is not set
CONFIG_IP6_NF_MANGLE=y
# CONFIG_IP6_NF_RAW is not set
CONFIG_IP6_NF_SECURITY=y
CONFIG_IP_DCCP=y
CONFIG_INET_DCCP_DIAG=y

#
# DCCP CCIDs Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP_CCID2_DEBUG=y
# CONFIG_IP_DCCP_CCID3 is not set

#
# DCCP Kernel Hacking
#
CONFIG_IP_DCCP_DEBUG=y
CONFIG_IP_SCTP=y
CONFIG_SCTP_DBG_MSG=y
CONFIG_SCTP_DBG_OBJCNT=y
# CONFIG_SCTP_HMAC_NONE is not set
CONFIG_SCTP_HMAC_SHA1=y
# CONFIG_SCTP_HMAC_MD5 is not set
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=y
CONFIG_ATM_CLIP=y
CONFIG_ATM_CLIP_NO_ICMP=y
CONFIG_ATM_LANE=y
# CONFIG_ATM_MPOA is not set
# CONFIG_ATM_BR2684 is not set
# CONFIG_BRIDGE is not set
CONFIG_NET_DSA=y
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_NET_DSA_MV88E6060=y
CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
CONFIG_NET_DSA_MV88E6131=y
CONFIG_NET_DSA_MV88E6123_61_65=y
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
CONFIG_LLC=y
CONFIG_LLC2=y
CONFIG_IPX=y
CONFIG_IPX_INTERN=y
CONFIG_ATALK=y
# CONFIG_DEV_APPLETALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_PHONET is not set
CONFIG_IEEE802154=y
CONFIG_NET_SCHED=y

#
# Queueing/Scheduling
#
CONFIG_NET_SCH_CBQ=y
CONFIG_NET_SCH_HTB=y
# CONFIG_NET_SCH_HFSC is not set
CONFIG_NET_SCH_ATM=y
CONFIG_NET_SCH_PRIO=y
CONFIG_NET_SCH_MULTIQ=y
# CONFIG_NET_SCH_RED is not set
CONFIG_NET_SCH_SFQ=y
# CONFIG_NET_SCH_TEQL is not set
CONFIG_NET_SCH_TBF=y
# CONFIG_NET_SCH_GRED is not set
# CONFIG_NET_SCH_DSMARK is not set
# CONFIG_NET_SCH_NETEM is not set
CONFIG_NET_SCH_DRR=y
CONFIG_NET_SCH_INGRESS=y

#
# Classification
#
CONFIG_NET_CLS=y
# CONFIG_NET_CLS_BASIC is not set
# CONFIG_NET_CLS_TCINDEX is not set
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=y
CONFIG_NET_CLS_U32=y
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
# CONFIG_NET_CLS_RSVP is not set
CONFIG_NET_CLS_RSVP6=y
CONFIG_NET_CLS_FLOW=y
CONFIG_NET_CLS_CGROUP=y
# CONFIG_NET_EMATCH is not set
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=y
CONFIG_NET_ACT_GACT=y
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=y
CONFIG_NET_ACT_IPT=y
CONFIG_NET_ACT_NAT=y
# CONFIG_NET_ACT_PEDIT is not set
CONFIG_NET_ACT_SIMP=y
CONFIG_NET_ACT_SKBEDIT=y
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
CONFIG_DCB=y

#
# Network testing
#
CONFIG_NET_PKTGEN=y
# CONFIG_NET_DROP_MONITOR is not set
CONFIG_HAMRADIO=y

#
# Packet Radio protocols
#
CONFIG_AX25=y
CONFIG_AX25_DAMA_SLAVE=y
# CONFIG_NETROM is not set
# CONFIG_ROSE is not set

#
# AX.25 network device drivers
#
CONFIG_MKISS=y
# CONFIG_6PACK is not set
# CONFIG_BPQETHER is not set
CONFIG_SCC=y
CONFIG_SCC_DELAY=y
CONFIG_SCC_TRXECHO=y
CONFIG_BAYCOM_SER_FDX=y
# CONFIG_BAYCOM_SER_HDX is not set
CONFIG_BAYCOM_PAR=y
CONFIG_BAYCOM_EPP=y
# CONFIG_YAM is not set
CONFIG_CAN=y
CONFIG_CAN_RAW=y
CONFIG_CAN_BCM=y

#
# CAN Device Drivers
#
# CONFIG_CAN_VCAN is not set
# CONFIG_CAN_DEV is not set
# CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_IRDA=y

#
# IrDA protocols
#
CONFIG_IRLAN=y
CONFIG_IRCOMM=y
CONFIG_IRDA_ULTRA=y

#
# IrDA options
#
# CONFIG_IRDA_CACHE_LAST_LSAP is not set
CONFIG_IRDA_FAST_RR=y
CONFIG_IRDA_DEBUG=y

#
# Infrared-port device drivers
#

#
# SIR device drivers
#
# CONFIG_IRTTY_SIR is not set

#
# Dongle support
#
CONFIG_KINGSUN_DONGLE=y
CONFIG_KSDAZZLE_DONGLE=y
CONFIG_KS959_DONGLE=y

#
# FIR device drivers
#
# CONFIG_USB_IRDA is not set
CONFIG_SIGMATEL_FIR=y
CONFIG_NSC_FIR=y
CONFIG_WINBOND_FIR=y
CONFIG_TOSHIBA_FIR=y
CONFIG_SMC_IRCC_FIR=y
CONFIG_ALI_FIR=y
CONFIG_VLSI_FIR=y
CONFIG_VIA_FIR=y
# CONFIG_MCS_FIR is not set
CONFIG_BT=y
# CONFIG_BT_L2CAP is not set
CONFIG_BT_SCO=y

#
# Bluetooth device drivers
#
CONFIG_BT_HCIBTUSB=y
# CONFIG_BT_HCIUART is not set
CONFIG_BT_HCIBCM203X=y
CONFIG_BT_HCIBPA10X=y
# CONFIG_BT_HCIBFUSB is not set
CONFIG_BT_HCIDTL1=y
# CONFIG_BT_HCIBT3C is not set
CONFIG_BT_HCIBLUECARD=y
# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
CONFIG_BT_MRVL=y
CONFIG_AF_RXRPC=y
# CONFIG_AF_RXRPC_DEBUG is not set
CONFIG_RXKAD=y
CONFIG_FIB_RULES=y
# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set

#
# Device Drivers
#

#
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_DEBUG_DRIVER=y
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
# CONFIG_MTD is not set
CONFIG_PARPORT=y
CONFIG_PARPORT_PC=y
CONFIG_PARPORT_SERIAL=y
CONFIG_PARPORT_PC_FIFO=y
CONFIG_PARPORT_PC_SUPERIO=y
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=y
CONFIG_PARPORT_1284=y
CONFIG_PARPORT_NOT_PC=y
CONFIG_PNP=y
# CONFIG_PNP_DEBUG_MESSAGES is not set

#
# Protocols
#
# CONFIG_ISAPNP is not set
CONFIG_PNPBIOS=y
CONFIG_PNPBIOS_PROC_FS=y
# CONFIG_PNPACPI is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
CONFIG_BLK_DEV_XD=y
# CONFIG_PARIDE is not set
CONFIG_BLK_CPQ_DA=y
CONFIG_BLK_CPQ_CISS_DA=y
CONFIG_CISS_SCSI_TAPE=y
CONFIG_BLK_DEV_DAC960=y
CONFIG_BLK_DEV_UMEM=y
# CONFIG_BLK_DEV_COW_COMMON is not set
# CONFIG_BLK_DEV_LOOP is not set
CONFIG_BLK_DEV_NBD=y
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_UB=y
# CONFIG_BLK_DEV_RAM is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_ATA_OVER_ETH=y
CONFIG_BLK_DEV_HD=y
# CONFIG_MISC_DEVICES is not set
CONFIG_TIFM_CORE=y
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set

#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_TGT=y
CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y

#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
CONFIG_CHR_DEV_OSST=y
# CONFIG_BLK_DEV_SR is not set
CONFIG_CHR_DEV_SG=y
# CONFIG_CHR_DEV_SCH is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y

#
# SCSI Transports
#
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_FC_ATTRS=y
CONFIG_SCSI_FC_TGT_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=y
CONFIG_SCSI_SAS_ATTRS=y
CONFIG_SCSI_SAS_LIBSAS=y
# CONFIG_SCSI_SAS_ATA is not set
CONFIG_SCSI_SAS_HOST_SMP=y
CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
CONFIG_SCSI_SRP_ATTRS=y
# CONFIG_SCSI_SRP_TGT_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=y
# CONFIG_SCSI_CXGB3_ISCSI is not set
# CONFIG_SCSI_BNX2_ISCSI is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
CONFIG_SCSI_3W_9XXX=y
CONFIG_SCSI_7000FASST=y
CONFIG_SCSI_ACARD=y
# CONFIG_SCSI_AHA152X is not set
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_AHA1740 is not set
CONFIG_SCSI_AACRAID=y
CONFIG_SCSI_AIC7XXX=y
CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
CONFIG_AIC7XXX_RESET_DELAY_MS=5000
# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
CONFIG_AIC7XXX_DEBUG_MASK=0
CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
CONFIG_SCSI_AIC7XXX_OLD=y
CONFIG_SCSI_AIC79XX=y
CONFIG_AIC79XX_CMDS_PER_DEVICE=32
CONFIG_AIC79XX_RESET_DELAY_MS=5000
CONFIG_AIC79XX_DEBUG_ENABLE=y
CONFIG_AIC79XX_DEBUG_MASK=0
CONFIG_AIC79XX_REG_PRETTY_PRINT=y
CONFIG_SCSI_AIC94XX=y
# CONFIG_AIC94XX_DEBUG is not set
# CONFIG_SCSI_MVSAS is not set
CONFIG_SCSI_DPT_I2O=y
CONFIG_SCSI_ADVANSYS=y
# CONFIG_SCSI_IN2000 is not set
CONFIG_SCSI_ARCMSR=y
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=y
CONFIG_MEGARAID_MAILBOX=y
CONFIG_MEGARAID_LEGACY=y
CONFIG_MEGARAID_SAS=y
CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
CONFIG_SCSI_MPT2SAS_LOGGING=y
# CONFIG_SCSI_HPTIOP is not set
CONFIG_SCSI_BUSLOGIC=y
# CONFIG_SCSI_FLASHPOINT is not set
CONFIG_LIBFC=y
CONFIG_LIBFCOE=y
# CONFIG_FCOE is not set
CONFIG_FCOE_FNIC=y
# CONFIG_SCSI_DMX3191D is not set
CONFIG_SCSI_DTC3280=y
CONFIG_SCSI_EATA=y
CONFIG_SCSI_EATA_TAGGED_QUEUE=y
# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=y
CONFIG_SCSI_FD_MCS=y
# CONFIG_SCSI_GDTH is not set
CONFIG_SCSI_GENERIC_NCR5380=y
CONFIG_SCSI_GENERIC_NCR5380_MMIO=y
CONFIG_SCSI_GENERIC_NCR53C400=y
CONFIG_SCSI_IBMMCA=y
CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y
# CONFIG_IBMMCA_SCSI_DEV_RESET is not set
CONFIG_SCSI_IPS=y
CONFIG_SCSI_INITIO=y
# CONFIG_SCSI_INIA100 is not set
CONFIG_SCSI_PPA=y
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_IZIP_EPP16 is not set
CONFIG_SCSI_IZIP_SLOW_CTR=y
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NCR_D700 is not set
CONFIG_SCSI_STEX=y
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_MMIO is not set
CONFIG_SCSI_IPR=y
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPR_DUMP is not set
# CONFIG_SCSI_NCR_Q720 is not set
# CONFIG_SCSI_PAS16 is not set
CONFIG_SCSI_QLOGIC_FAS=y
CONFIG_SCSI_QLOGIC_1280=y
CONFIG_SCSI_QLA_FC=y
# CONFIG_SCSI_QLA_ISCSI is not set
CONFIG_SCSI_LPFC=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_SIM710=y
CONFIG_SCSI_SYM53C416=y
CONFIG_SCSI_DC395x=y
CONFIG_SCSI_DC390T=y
# CONFIG_SCSI_T128 is not set
CONFIG_SCSI_U14_34F=y
# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
CONFIG_SCSI_U14_34F_MAX_TAGS=8
CONFIG_SCSI_ULTRASTOR=y
CONFIG_SCSI_NSP32=y
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_PMCRAID is not set
CONFIG_SCSI_SRP=y
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
# CONFIG_SATA_PMP is not set
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
CONFIG_ATA_SFF=y
# CONFIG_SATA_SVW is not set
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
CONFIG_SATA_NV=y
CONFIG_PDC_ADMA=y
CONFIG_SATA_QSTOR=y
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIS is not set
CONFIG_SATA_ULI=y
CONFIG_SATA_VIA=y
CONFIG_SATA_VITESSE=y
CONFIG_SATA_INIC162X=y
CONFIG_PATA_ALI=y
CONFIG_PATA_AMD=y
CONFIG_PATA_ARTOP=y
CONFIG_PATA_ATP867X=y
CONFIG_PATA_ATIIXP=y
CONFIG_PATA_CMD640_PCI=y
# CONFIG_PATA_CMD64X is not set
CONFIG_PATA_CS5520=y
# CONFIG_PATA_CS5530 is not set
CONFIG_PATA_CS5535=y
CONFIG_PATA_CS5536=y
CONFIG_PATA_CYPRESS=y
CONFIG_PATA_EFAR=y
CONFIG_ATA_GENERIC=y
CONFIG_PATA_HPT366=y
CONFIG_PATA_HPT37X=y
CONFIG_PATA_HPT3X2N=y
CONFIG_PATA_HPT3X3=y
CONFIG_PATA_HPT3X3_DMA=y
CONFIG_PATA_IT821X=y
CONFIG_PATA_IT8213=y
CONFIG_PATA_JMICRON=y
CONFIG_PATA_LEGACY=y
CONFIG_PATA_TRIFLEX=y
CONFIG_PATA_MARVELL=y
# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=y
# CONFIG_PATA_NINJA32 is not set
CONFIG_PATA_NS87410=y
CONFIG_PATA_NS87415=y
CONFIG_PATA_OPTI=y
# CONFIG_PATA_OPTIDMA is not set
CONFIG_PATA_PCMCIA=y
CONFIG_PATA_PDC_OLD=y
# CONFIG_PATA_QDI is not set
CONFIG_PATA_RADISYS=y
CONFIG_PATA_RDC=y
CONFIG_PATA_RZ1000=y
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SERVERWORKS=y
# CONFIG_PATA_PDC2027X is not set
CONFIG_PATA_SIL680=y
CONFIG_PATA_SIS=y
CONFIG_PATA_VIA=y
CONFIG_PATA_WINBOND=y
CONFIG_PATA_WINBOND_VLB=y
# CONFIG_PATA_PLATFORM is not set
CONFIG_PATA_SCH=y
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
# CONFIG_MD_AUTODETECT is not set
CONFIG_MD_LINEAR=y
# CONFIG_MD_RAID0 is not set
# CONFIG_MD_RAID1 is not set
CONFIG_MD_RAID10=y
# CONFIG_MD_RAID456 is not set
CONFIG_MD_MULTIPATH=y
CONFIG_MD_FAULTY=y
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
CONFIG_DM_CRYPT=y
# CONFIG_DM_SNAPSHOT is not set
# CONFIG_DM_MIRROR is not set
CONFIG_DM_ZERO=y
CONFIG_DM_MULTIPATH=y
CONFIG_DM_MULTIPATH_QL=y
CONFIG_DM_MULTIPATH_ST=y
CONFIG_DM_DELAY=y
CONFIG_DM_UEVENT=y
CONFIG_FUSION=y
CONFIG_FUSION_SPI=y
CONFIG_FUSION_FC=y
# CONFIG_FUSION_SAS is not set
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_CTL=y
CONFIG_FUSION_LAN=y
CONFIG_FUSION_LOGGING=y

#
# IEEE 1394 (FireWire) support
#

#
# You can enable one or both FireWire driver stacks.
#

#
# See the help texts for more information.
#
CONFIG_FIREWIRE=y
CONFIG_FIREWIRE_OHCI=y
CONFIG_FIREWIRE_OHCI_DEBUG=y
# CONFIG_FIREWIRE_SBP2 is not set
# CONFIG_FIREWIRE_NET is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
CONFIG_IFB=y
CONFIG_DUMMY=y
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
CONFIG_EQUALIZER=y
CONFIG_TUN=y
CONFIG_VETH=y
CONFIG_NET_SB1000=y
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=y

#
# MII PHY device drivers
#
CONFIG_MARVELL_PHY=y
CONFIG_DAVICOM_PHY=y
CONFIG_QSEMI_PHY=y
# CONFIG_LXT_PHY is not set
CONFIG_CICADA_PHY=y
CONFIG_VITESSE_PHY=y
# CONFIG_SMSC_PHY is not set
CONFIG_BROADCOM_PHY=y
CONFIG_ICPLUS_PHY=y
CONFIG_REALTEK_PHY=y
CONFIG_NATIONAL_PHY=y
CONFIG_STE10XP=y
CONFIG_LSI_ET1011C_PHY=y
CONFIG_FIXED_PHY=y
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
CONFIG_SUNGEM=y
CONFIG_CASSINI=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_LANCE is not set
CONFIG_NET_VENDOR_SMC=y
# CONFIG_WD80x3 is not set
CONFIG_ULTRAMCA=y
CONFIG_ULTRA=y
CONFIG_ULTRA32=y
CONFIG_SMC9194=y
CONFIG_ENC28J60=y
# CONFIG_ENC28J60_WRITEVERIFY is not set
# CONFIG_ETHOC is not set
# CONFIG_NET_VENDOR_RACAL is not set
CONFIG_DNET=y
CONFIG_NET_TULIP=y
CONFIG_DE2104X=y
CONFIG_DE2104X_DSL=0
CONFIG_TULIP=y
CONFIG_TULIP_MWI=y
CONFIG_TULIP_MMIO=y
# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=y
CONFIG_WINBOND_840=y
CONFIG_DM9102=y
CONFIG_ULI526X=y
# CONFIG_AT1700 is not set
CONFIG_DEPCA=y
CONFIG_HP100=y
CONFIG_NET_ISA=y
CONFIG_E2100=y
CONFIG_EWRK3=y
# CONFIG_EEXPRESS is not set
CONFIG_EEXPRESS_PRO=y
# CONFIG_HPLAN_PLUS is not set
# CONFIG_HPLAN is not set
# CONFIG_LP486E is not set
CONFIG_ETH16I=y
# CONFIG_NE2000 is not set
# CONFIG_ZNET is not set
# CONFIG_SEEQ8005 is not set
CONFIG_NE2_MCA=y
# CONFIG_IBMLANA is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IBM_NEW_EMAC_RGMII is not set
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_AC3200 is not set
CONFIG_APRICOT=y
# CONFIG_B44 is not set
CONFIG_FORCEDETH=y
# CONFIG_FORCEDETH_NAPI is not set
CONFIG_CS89x0=y
CONFIG_E100=y
CONFIG_LNE390=y
# CONFIG_FEALNX is not set
CONFIG_NATSEMI=y
CONFIG_NE2K_PCI=y
CONFIG_NE3210=y
CONFIG_ES3210=y
# CONFIG_8139CP is not set
CONFIG_8139TOO=y
CONFIG_8139TOO_PIO=y
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R6040=y
CONFIG_SIS900=y
# CONFIG_EPIC100 is not set
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
CONFIG_TLAN=y
# CONFIG_KS8842 is not set
CONFIG_KS8851=y
# CONFIG_VIA_RHINE is not set
CONFIG_SC92031=y
# CONFIG_NET_POCKET is not set
CONFIG_ATL2=y
CONFIG_NETDEV_1000=y
CONFIG_ACENIC=y
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=y
CONFIG_E1000=y
CONFIG_E1000E=y
CONFIG_IP1000=y
CONFIG_IGB=y
CONFIG_IGB_DCA=y
CONFIG_IGBVF=y
CONFIG_NS83820=y
# CONFIG_HAMACHI is not set
CONFIG_YELLOWFIN=y
CONFIG_R8169=y
CONFIG_SIS190=y
CONFIG_SKGE=y
CONFIG_SKGE_DEBUG=y
# CONFIG_SKY2 is not set
CONFIG_VIA_VELOCITY=y
CONFIG_TIGON3=y
CONFIG_BNX2=y
# CONFIG_CNIC is not set
CONFIG_QLA3XXX=y
CONFIG_ATL1=y
CONFIG_ATL1E=y
# CONFIG_ATL1C is not set
# CONFIG_JME is not set
CONFIG_NETDEV_10000=y
CONFIG_MDIO=y
CONFIG_CHELSIO_T1=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T3_DEPENDS=y
CONFIG_CHELSIO_T3=y
# CONFIG_ENIC is not set
CONFIG_IXGBE=y
# CONFIG_IXGBE_DCA is not set
# CONFIG_IXGBE_DCB is not set
# CONFIG_IXGB is not set
CONFIG_S2IO=y
# CONFIG_VXGE is not set
CONFIG_MYRI10GE=y
# CONFIG_MYRI10GE_DCA is not set
# CONFIG_NETXEN_NIC is not set
CONFIG_NIU=y
CONFIG_MLX4_EN=y
CONFIG_MLX4_CORE=y
CONFIG_MLX4_DEBUG=y
# CONFIG_TEHUTI is not set
CONFIG_BNX2X=y
CONFIG_QLGE=y
# CONFIG_SFC is not set
CONFIG_BE2NET=y
CONFIG_TR=y
CONFIG_IBMTR=y
CONFIG_IBMOL=y
CONFIG_IBMLS=y
# CONFIG_3C359 is not set
CONFIG_TMS380TR=y
CONFIG_TMSPCI=y
CONFIG_SKISA=y
CONFIG_PROTEON=y
CONFIG_ABYSS=y
CONFIG_MADGEMC=y
# CONFIG_SMCTR is not set
# CONFIG_WLAN is not set

#
# Enable WiMAX (Networking options) to see the WiMAX drivers
#

#
# USB Network Adapters
#
CONFIG_USB_CATC=y
CONFIG_USB_KAWETH=y
# CONFIG_USB_PEGASUS is not set
CONFIG_USB_RTL8150=y
CONFIG_USB_USBNET=y
CONFIG_USB_NET_AX8817X=y
CONFIG_USB_NET_CDCETHER=y
CONFIG_USB_NET_CDC_EEM=y
# CONFIG_USB_NET_DM9601 is not set
CONFIG_USB_NET_SMSC95XX=y
CONFIG_USB_NET_GL620A=y
# CONFIG_USB_NET_NET1080 is not set
CONFIG_USB_NET_PLUSB=y
CONFIG_USB_NET_MCS7830=y
CONFIG_USB_NET_RNDIS_HOST=y
# CONFIG_USB_NET_CDC_SUBSET is not set
CONFIG_USB_NET_ZAURUS=y
CONFIG_USB_NET_INT51X1=y
CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_3C589=y
CONFIG_PCMCIA_3C574=y
# CONFIG_PCMCIA_FMVJ18X is not set
# CONFIG_PCMCIA_PCNET is not set
# CONFIG_PCMCIA_NMCLAN is not set
# CONFIG_PCMCIA_SMC91C92 is not set
# CONFIG_PCMCIA_XIRC2PS is not set
# CONFIG_PCMCIA_AXNET is not set
# CONFIG_WAN is not set
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=y
# CONFIG_ATM_TCP is not set
CONFIG_ATM_LANAI=y
CONFIG_ATM_ENI=y
CONFIG_ATM_ENI_DEBUG=y
CONFIG_ATM_ENI_TUNE_BURST=y
CONFIG_ATM_ENI_BURST_TX_16W=y
CONFIG_ATM_ENI_BURST_TX_8W=y
CONFIG_ATM_ENI_BURST_TX_4W=y
CONFIG_ATM_ENI_BURST_TX_2W=y
CONFIG_ATM_ENI_BURST_RX_16W=y
CONFIG_ATM_ENI_BURST_RX_8W=y
# CONFIG_ATM_ENI_BURST_RX_4W is not set
CONFIG_ATM_ENI_BURST_RX_2W=y
# CONFIG_ATM_FIRESTREAM is not set
CONFIG_ATM_ZATM=y
CONFIG_ATM_ZATM_DEBUG=y
CONFIG_ATM_NICSTAR=y
CONFIG_ATM_NICSTAR_USE_SUNI=y
# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
CONFIG_ATM_IDT77252=y
CONFIG_ATM_IDT77252_DEBUG=y
CONFIG_ATM_IDT77252_RCV_ALL=y
CONFIG_ATM_IDT77252_USE_SUNI=y
# CONFIG_ATM_AMBASSADOR is not set
CONFIG_ATM_HORIZON=y
CONFIG_ATM_HORIZON_DEBUG=y
CONFIG_ATM_IA=y
# CONFIG_ATM_IA_DEBUG is not set
# CONFIG_ATM_FORE200E is not set
# CONFIG_ATM_HE is not set
CONFIG_ATM_SOLOS=y
# CONFIG_IEEE802154_DRIVERS is not set
# CONFIG_FDDI is not set
CONFIG_HIPPI=y
CONFIG_ROADRUNNER=y
# CONFIG_ROADRUNNER_LARGE_RINGS is not set
# CONFIG_PLIP is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
CONFIG_NET_FC=y
CONFIG_NETCONSOLE=y
# CONFIG_NETCONSOLE_DYNAMIC is not set
CONFIG_NETPOLL=y
CONFIG_NETPOLL_TRAP=y
CONFIG_NET_POLL_CONTROLLER=y
# CONFIG_ISDN is not set
CONFIG_PHONE=y
# CONFIG_PHONE_IXJ is not set

#
# Input device support
#
CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=y
CONFIG_INPUT_POLLDEV=y

#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=y
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set

#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_LKKBD=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_MATRIX=y
# CONFIG_KEYBOARD_LM8323 is not set
CONFIG_KEYBOARD_NEWTON=y
CONFIG_KEYBOARD_STOWAWAY=y
CONFIG_KEYBOARD_SUNKBD=y
CONFIG_KEYBOARD_TWL4030=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
# CONFIG_JOYSTICK_ANALOG is not set
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_COBRA is not set
# CONFIG_JOYSTICK_GF2K is not set
CONFIG_JOYSTICK_GRIP=y
# CONFIG_JOYSTICK_GRIP_MP is not set
# CONFIG_JOYSTICK_GUILLEMOT is not set
# CONFIG_JOYSTICK_INTERACT is not set
CONFIG_JOYSTICK_SIDEWINDER=y
CONFIG_JOYSTICK_TMDC=y
CONFIG_JOYSTICK_IFORCE=y
CONFIG_JOYSTICK_IFORCE_USB=y
CONFIG_JOYSTICK_IFORCE_232=y
CONFIG_JOYSTICK_WARRIOR=y
CONFIG_JOYSTICK_MAGELLAN=y
# CONFIG_JOYSTICK_SPACEORB is not set
CONFIG_JOYSTICK_SPACEBALL=y
CONFIG_JOYSTICK_STINGER=y
CONFIG_JOYSTICK_TWIDJOY=y
CONFIG_JOYSTICK_ZHENHUA=y
# CONFIG_JOYSTICK_DB9 is not set
CONFIG_JOYSTICK_GAMECON=y
CONFIG_JOYSTICK_TURBOGRAFX=y
CONFIG_JOYSTICK_JOYDUMP=y
CONFIG_JOYSTICK_XPAD=y
# CONFIG_JOYSTICK_XPAD_FF is not set
# CONFIG_JOYSTICK_XPAD_LEDS is not set
CONFIG_JOYSTICK_WALKERA0701=y
CONFIG_INPUT_TABLET=y
CONFIG_TABLET_USB_ACECAD=y
CONFIG_TABLET_USB_AIPTEK=y
# CONFIG_TABLET_USB_GTCO is not set
CONFIG_TABLET_USB_KBTAB=y
CONFIG_TABLET_USB_WACOM=y
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_APANEL is not set
CONFIG_INPUT_WISTRON_BTNS=y
CONFIG_INPUT_ATI_REMOTE=y
CONFIG_INPUT_ATI_REMOTE2=y
CONFIG_INPUT_KEYSPAN_REMOTE=y
CONFIG_INPUT_POWERMATE=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_INPUT_CM109=y
CONFIG_INPUT_TWL4030_PWRBUTTON=y
# CONFIG_INPUT_UINPUT is not set
CONFIG_INPUT_PCF50633_PMU=y
CONFIG_INPUT_GPIO_ROTARY_ENCODER=y
CONFIG_INPUT_PCAP=y

#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_CT82C710=y
CONFIG_SERIO_PARKBD=y
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=y
CONFIG_GAMEPORT=y
CONFIG_GAMEPORT_NS558=y
CONFIG_GAMEPORT_L4=y
CONFIG_GAMEPORT_EMU10K1=y
# CONFIG_GAMEPORT_FM801 is not set

#
# Character devices
#
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_DEVKMEM=y
# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_NOZOMI=y

#
# Serial drivers
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_MCA=y

#
# Non-8250 serial port support
#
# CONFIG_SERIAL_MAX3100 is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_CONSOLE_POLL=y
CONFIG_SERIAL_JSM=y
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_PRINTER is not set
CONFIG_PPDEV=y
# CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_AMD=y
# CONFIG_HW_RANDOM_GEODE is not set
CONFIG_HW_RANDOM_VIA=y
# CONFIG_NVRAM is not set
CONFIG_DTLK=y
CONFIG_R3964=y
CONFIG_APPLICOM=y
CONFIG_SONYPI=y

#
# PCMCIA character devices
#
CONFIG_SYNCLINK_CS=y
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_IPWIRELESS is not set
CONFIG_MWAVE=y
# CONFIG_SCx200_GPIO is not set
# CONFIG_PC8736x_GPIO is not set
CONFIG_NSC_GPIO=y
CONFIG_CS5535_GPIO=y
CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=256
# CONFIG_HANGCHECK_TIMER is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_ALGOPCA=y

#
# I2C Hardware Bus support
#

#
# PC SMBus host controller drivers
#
CONFIG_I2C_ALI1535=y
CONFIG_I2C_ALI1563=y
CONFIG_I2C_ALI15X3=y
CONFIG_I2C_AMD756=y
# CONFIG_I2C_AMD756_S4882 is not set
CONFIG_I2C_AMD8111=y
# CONFIG_I2C_I801 is not set
CONFIG_I2C_ISCH=y
CONFIG_I2C_PIIX4=y
CONFIG_I2C_NFORCE2=y
# CONFIG_I2C_NFORCE2_S4985 is not set
CONFIG_I2C_SIS5595=y
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
CONFIG_I2C_VIA=y
# CONFIG_I2C_VIAPRO is not set

#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
CONFIG_I2C_GPIO=y
CONFIG_I2C_OCORES=y
CONFIG_I2C_SIMTEC=y

#
# External I2C/SMBus adapter drivers
#
CONFIG_I2C_PARPORT=y
CONFIG_I2C_PARPORT_LIGHT=y
CONFIG_I2C_TAOS_EVM=y
CONFIG_I2C_TINY_USB=y

#
# Graphics adapter I2C/DDC channel drivers
#
CONFIG_I2C_VOODOO3=y

#
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_PCA_ISA is not set
CONFIG_I2C_PCA_PLATFORM=y
CONFIG_SCx200_ACB=y

#
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
CONFIG_SENSORS_PCA9539=y
CONFIG_SENSORS_TSL2550=y
CONFIG_I2C_DEBUG_CORE=y
CONFIG_I2C_DEBUG_ALGO=y
CONFIG_I2C_DEBUG_BUS=y
CONFIG_I2C_DEBUG_CHIP=y
CONFIG_SPI=y
CONFIG_SPI_DEBUG=y
CONFIG_SPI_MASTER=y

#
# SPI Master Controller Drivers
#
CONFIG_SPI_BITBANG=y
CONFIG_SPI_BUTTERFLY=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_LM70_LLP=y

#
# SPI Protocol Masters
#
CONFIG_SPI_SPIDEV=y
CONFIG_SPI_TLE62X0=y

#
# PPS support
#
# CONFIG_PPS is not set
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y

#
# Memory mapped GPIO expanders:
#

#
# I2C GPIO expanders:
#
CONFIG_GPIO_MAX732X=y
# CONFIG_GPIO_PCA953X is not set
CONFIG_GPIO_PCF857X=y
CONFIG_GPIO_TWL4030=y

#
# PCI GPIO expanders:
#
CONFIG_GPIO_BT8XX=y

#
# SPI GPIO expanders:
#
CONFIG_GPIO_MAX7301=y
CONFIG_GPIO_MCP23S08=y
CONFIG_W1=y
CONFIG_W1_CON=y

#
# 1-wire Bus Masters
#
CONFIG_W1_MASTER_MATROX=y
# CONFIG_W1_MASTER_DS2490 is not set
# CONFIG_W1_MASTER_DS2482 is not set
CONFIG_W1_MASTER_GPIO=y

#
# 1-wire Slaves
#
CONFIG_W1_SLAVE_THERM=y
CONFIG_W1_SLAVE_SMEM=y
CONFIG_W1_SLAVE_DS2431=y
CONFIG_W1_SLAVE_DS2433=y
CONFIG_W1_SLAVE_DS2433_CRC=y
CONFIG_W1_SLAVE_DS2760=y
CONFIG_W1_SLAVE_BQ27000=y
CONFIG_POWER_SUPPLY=y
CONFIG_POWER_SUPPLY_DEBUG=y
# CONFIG_PDA_POWER is not set
CONFIG_BATTERY_DS2760=y
CONFIG_BATTERY_DS2782=y
# CONFIG_BATTERY_OLPC is not set
CONFIG_BATTERY_BQ27x00=y
CONFIG_BATTERY_DA9030=y
CONFIG_BATTERY_MAX17040=y
CONFIG_CHARGER_PCF50633=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=y
CONFIG_HWMON_DEBUG_CHIP=y

#
# Native drivers
#
# CONFIG_SENSORS_ABITUGURU is not set
CONFIG_SENSORS_ABITUGURU3=y
CONFIG_SENSORS_AD7414=y
CONFIG_SENSORS_AD7418=y
CONFIG_SENSORS_ADCXX=y
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1029 is not set
CONFIG_SENSORS_ADM1031=y
CONFIG_SENSORS_ADM9240=y
# CONFIG_SENSORS_ADT7462 is not set
# CONFIG_SENSORS_ADT7470 is not set
# CONFIG_SENSORS_ADT7473 is not set
CONFIG_SENSORS_ADT7475=y
CONFIG_SENSORS_K8TEMP=y
CONFIG_SENSORS_ASB100=y
CONFIG_SENSORS_ATXP1=y
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_F71805F is not set
CONFIG_SENSORS_F71882FG=y
CONFIG_SENSORS_F75375S=y
CONFIG_SENSORS_FSCHER=y
# CONFIG_SENSORS_FSCPOS is not set
CONFIG_SENSORS_FSCHMD=y
CONFIG_SENSORS_G760A=y
CONFIG_SENSORS_GL518SM=y
# CONFIG_SENSORS_GL520SM is not set
CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set
CONFIG_SENSORS_LM63=y
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_LM75 is not set
CONFIG_SENSORS_LM77=y
CONFIG_SENSORS_LM78=y
# CONFIG_SENSORS_LM80 is not set
# CONFIG_SENSORS_LM83 is not set
CONFIG_SENSORS_LM85=y
CONFIG_SENSORS_LM87=y
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_LM93 is not set
# CONFIG_SENSORS_LTC4215 is not set
# CONFIG_SENSORS_LTC4245 is not set
CONFIG_SENSORS_LM95241=y
CONFIG_SENSORS_MAX1111=y
CONFIG_SENSORS_MAX1619=y
# CONFIG_SENSORS_MAX6650 is not set
# CONFIG_SENSORS_PC87360 is not set
CONFIG_SENSORS_PC87427=y
# CONFIG_SENSORS_PCF8591 is not set
CONFIG_SENSORS_SHT15=y
CONFIG_SENSORS_SIS5595=y
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
CONFIG_SENSORS_SMSC47M192=y
CONFIG_SENSORS_SMSC47B397=y
CONFIG_SENSORS_ADS7828=y
CONFIG_SENSORS_THMC50=y
# CONFIG_SENSORS_TMP401 is not set
CONFIG_SENSORS_TMP421=y
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set
CONFIG_SENSORS_VT8231=y
# CONFIG_SENSORS_W83781D is not set
CONFIG_SENSORS_W83791D=y
CONFIG_SENSORS_W83792D=y
# CONFIG_SENSORS_W83793 is not set
CONFIG_SENSORS_W83L785TS=y
CONFIG_SENSORS_W83L786NG=y
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_APPLESMC is not set
CONFIG_THERMAL=y
# CONFIG_THERMAL_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y

#
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
CONFIG_TWL4030_WATCHDOG=y
CONFIG_ACQUIRE_WDT=y
CONFIG_ADVANTECH_WDT=y
CONFIG_ALIM1535_WDT=y
# CONFIG_ALIM7101_WDT is not set
CONFIG_SC520_WDT=y
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
CONFIG_IB700_WDT=y
CONFIG_IBMASR=y
CONFIG_WAFER_WDT=y
CONFIG_I6300ESB_WDT=y
CONFIG_ITCO_WDT=y
# CONFIG_ITCO_VENDOR_SUPPORT is not set
CONFIG_IT8712F_WDT=y
CONFIG_IT87_WDT=y
CONFIG_HP_WATCHDOG=y
# CONFIG_SC1200_WDT is not set
# CONFIG_SCx200_WDT is not set
# CONFIG_PC87413_WDT is not set
CONFIG_RDC321X_WDT=y
CONFIG_60XX_WDT=y
CONFIG_SBC8360_WDT=y
CONFIG_SBC7240_WDT=y
# CONFIG_CPU5_WDT is not set
CONFIG_SMSC_SCH311X_WDT=y
CONFIG_SMSC37B787_WDT=y
CONFIG_W83627HF_WDT=y
# CONFIG_W83697HF_WDT is not set
# CONFIG_W83697UG_WDT is not set
CONFIG_W83877F_WDT=y
CONFIG_W83977F_WDT=y
CONFIG_MACHZ_WDT=y
# CONFIG_SBC_EPX_C3_WATCHDOG is not set

#
# ISA-based Watchdog Cards
#
CONFIG_PCWATCHDOG=y
# CONFIG_MIXCOMWD is not set
# CONFIG_WDT is not set

#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_WDTPCI=y

#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y

#
# Sonics Silicon Backplane
#
CONFIG_SSB=y
CONFIG_SSB_SPROM=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
# CONFIG_SSB_B43_PCI_BRIDGE is not set
CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
# CONFIG_SSB_PCMCIAHOST is not set
CONFIG_SSB_SILENT=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
# CONFIG_SSB_DRIVER_PCICORE is not set

#
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
# CONFIG_MFD_SM501 is not set
CONFIG_HTC_PASIC3=y
# CONFIG_TPS65010 is not set
CONFIG_TWL4030_CORE=y
# CONFIG_MFD_TMIO is not set
CONFIG_PMIC_DA903X=y
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
CONFIG_MFD_PCF50633=y
CONFIG_MFD_MC13783=y
CONFIG_PCF50633_ADC=y
# CONFIG_PCF50633_GPIO is not set
# CONFIG_AB3100_CORE is not set
CONFIG_EZX_PCAP=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
CONFIG_REGULATOR_BQ24022=y
# CONFIG_REGULATOR_MAX1586 is not set
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_DA903X=y
CONFIG_REGULATOR_PCF50633=y
CONFIG_REGULATOR_LP3971=y
# CONFIG_REGULATOR_PCAP is not set
# CONFIG_REGULATOR_MC13783 is not set
# CONFIG_MEDIA_SUPPORT is not set

#
# Graphics support
#
CONFIG_AGP=y
CONFIG_AGP_ALI=y
# CONFIG_AGP_ATI is not set
# CONFIG_AGP_AMD is not set
CONFIG_AGP_AMD64=y
CONFIG_AGP_INTEL=y
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
CONFIG_AGP_SWORKS=y
CONFIG_AGP_VIA=y
CONFIG_AGP_EFFICEON=y
# CONFIG_VGA_ARB is not set
CONFIG_DRM=y
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_TTM=y
# CONFIG_DRM_TDFX is not set
CONFIG_DRM_R128=y
CONFIG_DRM_RADEON=y
CONFIG_DRM_I810=y
# CONFIG_DRM_I830 is not set
# CONFIG_DRM_I915 is not set
CONFIG_DRM_MGA=y
# CONFIG_DRM_SIS is not set
CONFIG_DRM_VIA=y
CONFIG_DRM_SAVAGE=y
CONFIG_VGASTATE=y
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FB_DDC=y
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_IMAGEBLIT=y
CONFIG_FB_FOREIGN_ENDIAN=y
CONFIG_FB_BOTH_ENDIAN=y
# CONFIG_FB_BIG_ENDIAN is not set
# CONFIG_FB_LITTLE_ENDIAN is not set
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
CONFIG_FB_HECUBA=y
CONFIG_FB_SVGALIB=y
# CONFIG_FB_MACMODES is not set
CONFIG_FB_BACKLIGHT=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y

#
# Frame buffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
CONFIG_FB_PM2=y
CONFIG_FB_PM2_FIFO_DISCONNECT=y
CONFIG_FB_CYBER2000=y
CONFIG_FB_ARC=y
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_IMSTT=y
# CONFIG_FB_VGA16 is not set
# CONFIG_FB_UVESA is not set
# CONFIG_FB_VESA is not set
CONFIG_FB_N411=y
CONFIG_FB_HGA=y
CONFIG_FB_HGA_ACCEL=y
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_NVIDIA=y
CONFIG_FB_NVIDIA_I2C=y
CONFIG_FB_NVIDIA_DEBUG=y
CONFIG_FB_NVIDIA_BACKLIGHT=y
CONFIG_FB_RIVA=y
CONFIG_FB_RIVA_I2C=y
CONFIG_FB_RIVA_DEBUG=y
CONFIG_FB_RIVA_BACKLIGHT=y
CONFIG_FB_I810=y
CONFIG_FB_I810_GTF=y
CONFIG_FB_I810_I2C=y
CONFIG_FB_LE80578=y
# CONFIG_FB_CARILLO_RANCH is not set
CONFIG_FB_INTEL=y
CONFIG_FB_INTEL_DEBUG=y
CONFIG_FB_INTEL_I2C=y
CONFIG_FB_MATROX=y
# CONFIG_FB_MATROX_MILLENIUM is not set
CONFIG_FB_MATROX_MYSTIQUE=y
# CONFIG_FB_MATROX_G is not set
CONFIG_FB_MATROX_I2C=y
CONFIG_FB_MATROX_MULTIHEAD=y
# CONFIG_FB_RADEON is not set
CONFIG_FB_ATY128=y
CONFIG_FB_ATY128_BACKLIGHT=y
# CONFIG_FB_ATY is not set
CONFIG_FB_S3=y
CONFIG_FB_SAVAGE=y
CONFIG_FB_SAVAGE_I2C=y
CONFIG_FB_SAVAGE_ACCEL=y
CONFIG_FB_SIS=y
CONFIG_FB_SIS_300=y
CONFIG_FB_SIS_315=y
CONFIG_FB_VIA=y
CONFIG_FB_NEOMAGIC=y
# CONFIG_FB_KYRO is not set
CONFIG_FB_3DFX=y
CONFIG_FB_3DFX_ACCEL=y
CONFIG_FB_3DFX_I2C=y
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
CONFIG_FB_TRIDENT=y
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
CONFIG_FB_GEODE=y
# CONFIG_FB_GEODE_LX is not set
CONFIG_FB_GEODE_GX=y
# CONFIG_FB_GEODE_GX1 is not set
CONFIG_FB_TMIO=y
# CONFIG_FB_TMIO_ACCELL is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FB_METRONOME=y
CONFIG_FB_MB862XX=y
CONFIG_FB_MB862XX_PCI_GDC=y
# CONFIG_FB_BROADSHEET is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_PROGEAR is not set
# CONFIG_BACKLIGHT_DA903X is not set
CONFIG_BACKLIGHT_MBP_NVIDIA=y
# CONFIG_BACKLIGHT_SAHARA is not set

#
# Display device support
#
# CONFIG_DISPLAY_SUPPORT is not set

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_SOUND is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
CONFIG_HIDRAW=y

#
# USB Input Devices
#
CONFIG_USB_HID=y
# CONFIG_HID_PID is not set
CONFIG_USB_HIDDEV=y

#
# Special HID drivers
#
CONFIG_HID_A4TECH=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
CONFIG_HID_CYPRESS=y
# CONFIG_HID_DRAGONRISE is not set
CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LOGITECH is not set
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MONTEREY is not set
CONFIG_HID_NTRIG=y
CONFIG_HID_PANTHERLORD=y
CONFIG_PANTHERLORD_FF=y
CONFIG_HID_PETALYNX=y
# CONFIG_HID_SAMSUNG is not set
# CONFIG_HID_SONY is not set
CONFIG_HID_SUNPLUS=y
CONFIG_HID_GREENASIA=y
CONFIG_GREENASIA_FF=y
# CONFIG_HID_SMARTJOYPLUS is not set
# CONFIG_HID_TOPSEED is not set
CONFIG_HID_THRUSTMASTER=y
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_ZEROPLUS=y
CONFIG_ZEROPLUS_FF=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
CONFIG_USB_OTG_WHITELIST=y
CONFIG_USB_OTG_BLACKLIST_HUB=y
CONFIG_USB_MON=y
CONFIG_USB_WUSB=y
CONFIG_USB_WUSB_CBAF=y
# CONFIG_USB_WUSB_CBAF_DEBUG is not set

#
# USB Host Controller Drivers
#
CONFIG_USB_C67X00_HCD=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_HCD_DEBUGGING=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_OXU210HP_HCD is not set
CONFIG_USB_ISP116X_HCD=y
CONFIG_USB_ISP1760_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_HCD_SSB=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_U132_HCD is not set
CONFIG_USB_SL811_HCD=y
CONFIG_USB_SL811_CS=y
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_WHCI_HCD is not set
CONFIG_USB_HWA_HCD=y

#
# USB Device Class drivers
#
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
# CONFIG_USB_TMC is not set

#
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
#

#
# also be needed; see USB_STORAGE Help for more info
#
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_STORAGE_ISD200=y
CONFIG_USB_STORAGE_USBAT=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_USB_STORAGE_ALAUDA=y
CONFIG_USB_STORAGE_ONETOUCH=y
# CONFIG_USB_STORAGE_KARMA is not set
CONFIG_USB_STORAGE_CYPRESS_ATACB=y
# CONFIG_USB_LIBUSUAL is not set

#
# USB Imaging devices
#
CONFIG_USB_MDC800=y
CONFIG_USB_MICROTEK=y

#
# USB port drivers
#
CONFIG_USB_USS720=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_CONSOLE=y
CONFIG_USB_EZUSB=y
# CONFIG_USB_SERIAL_GENERIC is not set
CONFIG_USB_SERIAL_AIRCABLE=y
# CONFIG_USB_SERIAL_ARK3116 is not set
CONFIG_USB_SERIAL_BELKIN=y
CONFIG_USB_SERIAL_CH341=y
CONFIG_USB_SERIAL_WHITEHEAT=y
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_CP210X is not set
CONFIG_USB_SERIAL_CYPRESS_M8=y
CONFIG_USB_SERIAL_EMPEG=y
# CONFIG_USB_SERIAL_FTDI_SIO is not set
CONFIG_USB_SERIAL_FUNSOFT=y
CONFIG_USB_SERIAL_VISOR=y
# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
CONFIG_USB_SERIAL_EDGEPORT=y
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
CONFIG_USB_SERIAL_GARMIN=y
# CONFIG_USB_SERIAL_IPW is not set
CONFIG_USB_SERIAL_IUU=y
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
CONFIG_USB_SERIAL_KEYSPAN=y
CONFIG_USB_SERIAL_KEYSPAN_MPR=y
CONFIG_USB_SERIAL_KEYSPAN_USA28=y
CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
CONFIG_USB_SERIAL_KEYSPAN_USA19=y
# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=y
CONFIG_USB_SERIAL_KOBIL_SCT=y
CONFIG_USB_SERIAL_MCT_U232=y
CONFIG_USB_SERIAL_MOS7720=y
CONFIG_USB_SERIAL_MOS7840=y
CONFIG_USB_SERIAL_MOTOROLA=y
# CONFIG_USB_SERIAL_NAVMAN is not set
CONFIG_USB_SERIAL_PL2303=y
CONFIG_USB_SERIAL_OTI6858=y
# CONFIG_USB_SERIAL_QUALCOMM is not set
# CONFIG_USB_SERIAL_SPCP8X5 is not set
# CONFIG_USB_SERIAL_HP4X is not set
CONFIG_USB_SERIAL_SAFE=y
CONFIG_USB_SERIAL_SAFE_PADDED=y
CONFIG_USB_SERIAL_SIEMENS_MPI=y
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
CONFIG_USB_SERIAL_SYMBOL=y
# CONFIG_USB_SERIAL_TI is not set
CONFIG_USB_SERIAL_CYBERJACK=y
CONFIG_USB_SERIAL_XIRCOM=y
CONFIG_USB_SERIAL_OPTION=y
CONFIG_USB_SERIAL_OMNINET=y
CONFIG_USB_SERIAL_OPTICON=y
CONFIG_USB_SERIAL_DEBUG=y

#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI62=y
# CONFIG_USB_EMI26 is not set
CONFIG_USB_ADUTUX=y
CONFIG_USB_SEVSEG=y
CONFIG_USB_RIO500=y
CONFIG_USB_LEGOTOWER=y
CONFIG_USB_LCD=y
CONFIG_USB_BERRY_CHARGE=y
CONFIG_USB_LED=y
CONFIG_USB_CYPRESS_CY7C63=y
# CONFIG_USB_CYTHERM is not set
CONFIG_USB_IDMOUSE=y
CONFIG_USB_FTDI_ELAN=y
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
CONFIG_USB_LD=y
CONFIG_USB_TRANCEVIBRATOR=y
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
CONFIG_USB_ISIGHTFW=y
CONFIG_USB_VST=y
# CONFIG_USB_ATM is not set
# CONFIG_USB_GADGET is not set

#
# OTG and related infrastructure
#
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_TWL4030_USB=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_UWB=y
CONFIG_UWB_HWA=y
CONFIG_UWB_WHCI=y
CONFIG_UWB_WLP=y
CONFIG_UWB_I1480U=y
# CONFIG_UWB_I1480U_WLP is not set
# CONFIG_MMC is not set
CONFIG_MEMSTICK=y
CONFIG_MEMSTICK_DEBUG=y

#
# MemoryStick drivers
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=y

#
# MemoryStick Host Controller Drivers
#
CONFIG_MEMSTICK_TIFM_MS=y
CONFIG_MEMSTICK_JMICRON_38X=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y

#
# LED drivers
#
CONFIG_LEDS_ALIX2=y
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=y
CONFIG_LEDS_PCA955X=y
# CONFIG_LEDS_DA903X is not set
# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=y

#
# LED Triggers
#
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

#
# iptables trigger is under Netfilter config (LED target)
#
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
CONFIG_INFINIBAND=y
# CONFIG_INFINIBAND_USER_MAD is not set
CONFIG_INFINIBAND_USER_ACCESS=y
CONFIG_INFINIBAND_USER_MEM=y
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_MTHCA=y
CONFIG_INFINIBAND_MTHCA_DEBUG=y
CONFIG_INFINIBAND_AMSO1100=y
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
# CONFIG_INFINIBAND_CXGB3 is not set
CONFIG_MLX4_INFINIBAND=y
CONFIG_INFINIBAND_NES=y
CONFIG_INFINIBAND_NES_DEBUG=y
# CONFIG_INFINIBAND_IPOIB is not set
CONFIG_INFINIBAND_SRP=y
CONFIG_INFINIBAND_ISER=y
CONFIG_EDAC=y

#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not set
# CONFIG_EDAC_MM_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_HCTOSYS is not set
CONFIG_RTC_DEBUG=y

#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
# CONFIG_RTC_DRV_TEST is not set

#
# I2C RTC drivers
#
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_DS1374=y
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
CONFIG_RTC_DRV_RS5C372=y
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_X1205 is not set
CONFIG_RTC_DRV_PCF8563=y
# CONFIG_RTC_DRV_PCF8583 is not set
CONFIG_RTC_DRV_M41T80=y
CONFIG_RTC_DRV_M41T80_WDT=y
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_S35390A=y
CONFIG_RTC_DRV_FM3130=y
CONFIG_RTC_DRV_RX8581=y
# CONFIG_RTC_DRV_RX8025 is not set

#
# SPI RTC drivers
#
# CONFIG_RTC_DRV_M41T94 is not set
CONFIG_RTC_DRV_DS1305=y
CONFIG_RTC_DRV_DS1390=y
CONFIG_RTC_DRV_MAX6902=y
# CONFIG_RTC_DRV_R9701 is not set
CONFIG_RTC_DRV_RS5C348=y
CONFIG_RTC_DRV_DS3234=y

#
# Platform RTC drivers
#
# CONFIG_RTC_DRV_CMOS is not set
CONFIG_RTC_DRV_DS1286=y
CONFIG_RTC_DRV_DS1511=y
# CONFIG_RTC_DRV_DS1553 is not set
CONFIG_RTC_DRV_DS1742=y
CONFIG_RTC_DRV_STK17TA8=y
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
CONFIG_RTC_DRV_M48T59=y
CONFIG_RTC_DRV_BQ4802=y
CONFIG_RTC_DRV_V3020=y
# CONFIG_RTC_DRV_PCF50633 is not set

#
# on-CPU RTC drivers
#
CONFIG_DMADEVICES=y

#
# DMA Devices
#
CONFIG_INTEL_IOATDMA=y
CONFIG_DMA_ENGINE=y

#
# DMA Clients
#
CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
CONFIG_DMATEST=y
CONFIG_DCA=y
# CONFIG_AUXDISPLAY is not set
CONFIG_UIO=y
CONFIG_UIO_CIF=y
# CONFIG_UIO_PDRV is not set
CONFIG_UIO_PDRV_GENIRQ=y
# CONFIG_UIO_SMX is not set
# CONFIG_UIO_AEC is not set
CONFIG_UIO_SERCOS3=y
CONFIG_UIO_PCI_GENERIC=y

#
# TI VLYNQ
#
# CONFIG_STAGING is not set
# CONFIG_X86_PLATFORM_DEVICES is not set

#
# Firmware Drivers
#
# CONFIG_EDD is not set
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_DELL_RBU=y
CONFIG_DCDBAS=y
# CONFIG_ISCSI_IBFT_FIND is not set

#
# File systems
#
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT2_FS_XIP=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
# CONFIG_EXT4_FS is not set
CONFIG_FS_XIP=y
CONFIG_JBD=y
CONFIG_JBD_DEBUG=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
CONFIG_JFS_FS=y
# CONFIG_JFS_POSIX_ACL is not set
CONFIG_JFS_SECURITY=y
CONFIG_JFS_DEBUG=y
CONFIG_JFS_STATISTICS=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
CONFIG_GFS2_FS=y
CONFIG_GFS2_FS_LOCKING_DLM=y
# CONFIG_OCFS2_FS is not set
CONFIG_BTRFS_FS=y
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_NILFS2_FS is not set
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
CONFIG_AUTOFS_FS=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set

#
# Caches
#
CONFIG_FSCACHE=y
CONFIG_FSCACHE_STATS=y
CONFIG_FSCACHE_HISTOGRAM=y
# CONFIG_FSCACHE_DEBUG is not set
# CONFIG_CACHEFILES is not set

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=y
# CONFIG_JOLIET is not set
CONFIG_ZISOFS=y
CONFIG_UDF_FS=y
CONFIG_UDF_NLS=y

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
# CONFIG_VFAT_FS is not set
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_NTFS_FS=y
CONFIG_NTFS_DEBUG=y
CONFIG_NTFS_RW=y

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
# CONFIG_PROC_KCORE is not set
# CONFIG_PROC_SYSCTL is not set
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
CONFIG_CONFIGFS_FS=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
CONFIG_NFS_V4_1=y
# CONFIG_ROOT_NFS is not set
CONFIG_NFS_FSCACHE=y
CONFIG_NFSD=y
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V4=y
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=y
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
CONFIG_SUNRPC_XPRT_RDMA=y
CONFIG_RPCSEC_GSS_KRB5=y
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=y
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp437"
# CONFIG_CIFS is not set
CONFIG_NCP_FS=y
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
CONFIG_NCPFS_STRONG=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
CONFIG_NCPFS_NLS=y
CONFIG_NCPFS_EXTRAS=y
# CONFIG_CODA_FS is not set
CONFIG_AFS_FS=y
# CONFIG_AFS_DEBUG is not set
CONFIG_AFS_FSCACHE=y

#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
CONFIG_ACORN_PARTITION=y
CONFIG_ACORN_PARTITION_CUMANA=y
# CONFIG_ACORN_PARTITION_EESOX is not set
# CONFIG_ACORN_PARTITION_ICS is not set
# CONFIG_ACORN_PARTITION_ADFS is not set
CONFIG_ACORN_PARTITION_POWERTEC=y
# CONFIG_ACORN_PARTITION_RISCIX is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
CONFIG_MINIX_SUBPARTITION=y
CONFIG_SOLARIS_X86_PARTITION=y
CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_LDM_PARTITION=y
CONFIG_LDM_DEBUG=y
CONFIG_SGI_PARTITION=y
CONFIG_ULTRIX_PARTITION=y
CONFIG_SUN_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SYSV68_PARTITION=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_437 is not set
CONFIG_NLS_CODEPAGE_737=y
CONFIG_NLS_CODEPAGE_775=y
CONFIG_NLS_CODEPAGE_850=y
# CONFIG_NLS_CODEPAGE_852 is not set
CONFIG_NLS_CODEPAGE_855=y
CONFIG_NLS_CODEPAGE_857=y
CONFIG_NLS_CODEPAGE_860=y
CONFIG_NLS_CODEPAGE_861=y
CONFIG_NLS_CODEPAGE_862=y
CONFIG_NLS_CODEPAGE_863=y
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
CONFIG_NLS_CODEPAGE_866=y
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
CONFIG_NLS_CODEPAGE_932=y
# CONFIG_NLS_CODEPAGE_949 is not set
CONFIG_NLS_CODEPAGE_874=y
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
CONFIG_NLS_CODEPAGE_1251=y
# CONFIG_NLS_ASCII is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
CONFIG_NLS_ISO8859_5=y
CONFIG_NLS_ISO8859_6=y
CONFIG_NLS_ISO8859_7=y
CONFIG_NLS_ISO8859_9=y
CONFIG_NLS_ISO8859_13=y
# CONFIG_NLS_ISO8859_14 is not set
CONFIG_NLS_ISO8859_15=y
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
CONFIG_DLM=y
CONFIG_DLM_DEBUG=y

#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
CONFIG_HEADERS_CHECK=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_SHIRQ=y
# CONFIG_DETECT_SOFTLOCKUP is not set
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
CONFIG_SLUB_DEBUG_ON=y
CONFIG_SLUB_STATS=y
CONFIG_DEBUG_KMEMLEAK=y
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=400
CONFIG_DEBUG_KMEMLEAK_TEST=y
# CONFIG_DEBUG_RT_MUTEXES is not set
CONFIG_RT_MUTEX_TESTER=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_LOCK_ALLOC=y
CONFIG_PROVE_LOCKING=y
CONFIG_LOCKDEP=y
CONFIG_LOCK_STAT=y
CONFIG_DEBUG_LOCKDEP=y
CONFIG_TRACE_IRQFLAGS=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_INFO is not set
CONFIG_DEBUG_VM=y
CONFIG_DEBUG_VIRTUAL=y
CONFIG_DEBUG_WRITECOUNT=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
# CONFIG_DEBUG_SG is not set
CONFIG_DEBUG_NOTIFIERS=y
CONFIG_DEBUG_CREDENTIALS=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
CONFIG_BOOT_PRINTK_DELAY=y
CONFIG_RCU_TORTURE_TEST=y
# CONFIG_RCU_TORTURE_TEST_RUNNABLE is not set
CONFIG_RCU_CPU_STALL_DETECTOR=y
CONFIG_BACKTRACE_SELF_TEST=y
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
# CONFIG_FAIL_IO_TIMEOUT is not set
CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
# CONFIG_LATENCYTOP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_DEBUG_PAGEALLOC=y
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING=y
CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_IRQSOFF_TRACER=y
CONFIG_SYSPROF_TRACER=y
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
# CONFIG_BOOT_TRACER is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_POWER_TRACER is not set
CONFIG_STACK_TRACER=y
# CONFIG_KMEMTRACE is not set
CONFIG_WORKQUEUE_TRACER=y
# CONFIG_BLK_DEV_IO_TRACE is not set
CONFIG_DYNAMIC_FTRACE=y
# CONFIG_FUNCTION_PROFILER is not set
CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_FTRACE_SELFTEST=y
CONFIG_FTRACE_STARTUP_TEST=y
CONFIG_EVENT_TRACE_TEST_SYSCALLS=y
CONFIG_MMIOTRACE=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_BUILD_DOCSRC is not set
# CONFIG_DYNAMIC_DEBUG is not set
CONFIG_DMA_API_DEBUG=y
CONFIG_SAMPLES=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KGDB=y
CONFIG_KGDB_SERIAL_CONSOLE=y
CONFIG_KGDB_TESTS=y
# CONFIG_KGDB_TESTS_ON_BOOT is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_DEBUG_STACK_USAGE=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_X86_PTDUMP is not set
# CONFIG_DEBUG_RODATA is not set
CONFIG_4KSTACKS=y
# CONFIG_DOUBLEFAULT is not set
CONFIG_IOMMU_STRESS=y
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
CONFIG_IO_DELAY_TYPE_NONE=3
# CONFIG_IO_DELAY_0X80 is not set
CONFIG_IO_DELAY_0XED=y
# CONFIG_IO_DELAY_UDELAY is not set
# CONFIG_IO_DELAY_NONE is not set
CONFIG_DEFAULT_IO_DELAY_TYPE=1
CONFIG_DEBUG_BOOT_PARAMS=y
CONFIG_CPA_DEBUG=y
# CONFIG_OPTIMIZE_INLINING is not set

#
# Security options
#
CONFIG_KEYS=y
CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_FILE_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
CONFIG_LSM_MMAP_MIN_ADDR=65536
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
# CONFIG_SECURITY_SELINUX_DISABLE is not set
# CONFIG_SECURITY_SELINUX_DEVELOP is not set
# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
# CONFIG_SECURITY_SMACK is not set
CONFIG_SECURITY_TOMOYO=y
CONFIG_CRYPTO=y

#
# Crypto core or helper
#
# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_PCOMP=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=y

#
# Authenticated Encryption with Associated Data
#
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_SEQIV=y

#
# Block modes
#
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=y
# CONFIG_CRYPTO_ECB is not set
# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_PCBC=y
CONFIG_CRYPTO_XTS=y

#
# Hash modes
#
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_VMAC=y

#
# Digest
#
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_GHASH=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=y
CONFIG_CRYPTO_RMD128=y
CONFIG_CRYPTO_RMD160=y
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not set
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_SHA512 is not set
CONFIG_CRYPTO_TGR192=y
CONFIG_CRYPTO_WP512=y

#
# Ciphers
#
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_ANUBIS=y
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_BLOWFISH=y
CONFIG_CRYPTO_CAMELLIA=y
# CONFIG_CRYPTO_CAST5 is not set
CONFIG_CRYPTO_CAST6=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=y
CONFIG_CRYPTO_KHAZAD=y
CONFIG_CRYPTO_SALSA20=y
CONFIG_CRYPTO_SALSA20_586=y
CONFIG_CRYPTO_SEED=y
# CONFIG_CRYPTO_SERPENT is not set
CONFIG_CRYPTO_TEA=y
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set

#
# Compression
#
CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_ZLIB is not set
CONFIG_CRYPTO_LZO=y

#
# Random Number Generation
#
CONFIG_CRYPTO_ANSI_CPRNG=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=y
# CONFIG_CRYPTO_DEV_PADLOCK_AES is not set
CONFIG_CRYPTO_DEV_PADLOCK_SHA=y
CONFIG_CRYPTO_DEV_GEODE=y
CONFIG_CRYPTO_DEV_HIFN_795X=y
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
CONFIG_HAVE_KVM=y
# CONFIG_VIRTUALIZATION is not set
CONFIG_BINARY_PRINTF=y

#
# Library routines
#
CONFIG_BITREVERSE=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_FIND_LAST_BIT=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=y
CONFIG_CRC32=y
CONFIG_CRC7=y
CONFIG_LIBCRC32C=y
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=y
CONFIG_TEXTSEARCH_BM=y
CONFIG_TEXTSEARCH_FSM=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_NLATTR=y

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH] drm: Fix build failure in radeon and i915 drivers
  2009-09-21 16:12 ` [origin tree build failure] [PATCH] " Ingo Molnar
@ 2009-09-21 16:50   ` Ingo Molnar
  2009-09-22  3:56   ` [origin tree build failure] [PATCH] Re: [git pull] drm tree Dave Airlie
  1 sibling, 0 replies; 16+ messages in thread
From: Ingo Molnar @ 2009-09-21 16:50 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, dri-devel, linux-kernel


* Ingo Molnar <mingo@elte.hu> wrote:

> 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.

i've looked some more and drm_irq.o depends on vga-arb too so the patch 
below is the more complete fix IMHO.

	Ingo

------------------>
>From 0186c202fefd70291ef3b29e34543083d24f026d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 21 Sep 2009 18:12:07 +0200
Subject: [PATCH] drm: Fix build failure in radeon and i915 drivers

this 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'

got 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.

drm_irq.o relies on it too - so the whole DRM facilities relies
on VGA_ARB. I've added a select to express this dependency.

VGA_ARB is not a simple option, it depends on PCI, so in theory
select is not safe - but this is a special case since DRM itself
depends on PCI too.

Cc: torvalds@linux-foundation.org
Cc: dri-devel@lists.sf.net
Cc: Dave Airlie <airlied@linux.ie>
LKML-Reference: <20090921161207.GA9741@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/gpu/drm/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index e4d971c..6c54422 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -9,6 +9,7 @@ menuconfig DRM
 	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
 	select I2C
 	select I2C_ALGOBIT
+	select VGA_ARB
 	help
 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
 	  introduced in XFree86 4.0. If you say Y here, you need to select

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [git pull] drm tree.
  2009-09-21 14:17   ` Alex Deucher
@ 2009-09-21 22:40     ` Ed Tomlinson
  0 siblings, 0 replies; 16+ messages in thread
From: Ed Tomlinson @ 2009-09-21 22:40 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Dave Airlie, linux-kernel, dri-devel

On Monday 21 September 2009 10:17:59 Alex Deucher wrote:
> On Mon, Sep 21, 2009 at 7:59 AM, Ed Tomlinson <edt@aei.ca> wrote:
> > On Monday 21 September 2009 01:12:54 Dave Airlie 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.
> >
> > Dave,
> >
> > What user space stuff (xorg/mesa) is required to use the R300 3D?
> >
> 
> r300 3D has been available for years.  If you mean r600 3D, you need
> xf86-video-ati 6.12.4 or newer and mesa from git master.

Alex

Thanks, I did mean R600.

Ed

> >
> >> 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
> >>
> >
> > ------------------------------------------------------------------------------
> > Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> > is the only developer event you need to attend this year. Jumpstart your
> > developing skills, take BlackBerry mobile applications to market and stay
> > ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
> > http://p.sf.net/sfu/devconf
> > --
> > _______________________________________________
> > Dri-devel mailing list
> > Dri-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/dri-devel
> >
> 
> 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-21 16:12 ` [origin tree build failure] [PATCH] " Ingo Molnar
  2009-09-21 16:50   ` [PATCH] drm: Fix build failure in radeon and i915 drivers Ingo Molnar
@ 2009-09-22  3:56   ` Dave Airlie
  2009-09-22  9:36     ` Ingo Molnar
  2009-09-22 10:27     ` Ingo Molnar
  1 sibling, 2 replies; 16+ messages in thread
From: Dave Airlie @ 2009-09-22  3:56 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: torvalds, linux-kernel, dri-devel


> 
> 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.

The way it should work is VGA ARB should be enabled on any platforms we
have PCI unless EMBEDDED turns it off, since arbitration of VGA isn't 
reliant on a drm device, I'm not sure what Kconfig magic this would 
require, and where it would need to be. This patch should at least allow
builds to work until I figure out any Kconfig magic.

>From 8a874578cbf8b07b988e666c15fa0ba767f3c1cb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 22 Sep 2009 13:53:00 +1000
Subject: [PATCH] vgaarb: wrap the client register API so we can disable VGA ARB.

This provides an dummy register function so everything builds
if VGA arb is turned off.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 include/linux/vgaarb.h |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index e81c64a..b0feb79 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -41,7 +41,7 @@
  *     interrupts at any time.
  */
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
-									unsigned int decodes);
+				    unsigned int decodes);
 
 /**
  *     vga_get         - acquire & locks VGA resources
@@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
  * They driver will get a callback when VGA arbitration is first used
  * by userspace since we some older X servers have issues.
  */
+#if defined(CONFIG_VGA_ARB)
 int vga_client_register(struct pci_dev *pdev, void *cookie,
 			void (*irq_set_state)(void *cookie, bool state),
 			unsigned int (*set_vga_decode)(void *cookie, bool state));
+#else
+static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
+				      void (*irq_set_state)(void *cookie, bool state),
+				      unsigned int (*set_vga_decode)(void *cookie, bool state));
+{
+	return 0;
+}
+#endif
 
 #endif /* LINUX_VGA_H */
-- 
1.6.0.6


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-22  3:56   ` [origin tree build failure] [PATCH] Re: [git pull] drm tree Dave Airlie
@ 2009-09-22  9:36     ` Ingo Molnar
  2009-09-22 10:27     ` Ingo Molnar
  1 sibling, 0 replies; 16+ messages in thread
From: Ingo Molnar @ 2009-09-22  9:36 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel


* Dave Airlie <airlied@linux.ie> wrote:

> > 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.
> 
> The way it should work is VGA ARB should be enabled on any platforms we
> have PCI unless EMBEDDED turns it off, since arbitration of VGA isn't 
> reliant on a drm device, I'm not sure what Kconfig magic this would 
> require, and where it would need to be. This patch should at least allow
> builds to work until I figure out any Kconfig magic.
> 
> >From 8a874578cbf8b07b988e666c15fa0ba767f3c1cb Mon Sep 17 00:00:00 2001
> From: Dave Airlie <airlied@redhat.com>
> Date: Tue, 22 Sep 2009 13:53:00 +1000
> Subject: [PATCH] vgaarb: wrap the client register API so we can disable VGA ARB.
> 
> This provides an dummy register function so everything builds
> if VGA arb is turned off.
> 
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  include/linux/vgaarb.h |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> index e81c64a..b0feb79 100644
> --- a/include/linux/vgaarb.h
> +++ b/include/linux/vgaarb.h
> @@ -41,7 +41,7 @@
>   *     interrupts at any time.
>   */
>  extern void vga_set_legacy_decoding(struct pci_dev *pdev,
> -									unsigned int decodes);
> +				    unsigned int decodes);
>  
>  /**
>   *     vga_get         - acquire & locks VGA resources
> @@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
>   * They driver will get a callback when VGA arbitration is first used
>   * by userspace since we some older X servers have issues.
>   */
> +#if defined(CONFIG_VGA_ARB)
>  int vga_client_register(struct pci_dev *pdev, void *cookie,
>  			void (*irq_set_state)(void *cookie, bool state),
>  			unsigned int (*set_vga_decode)(void *cookie, bool state));
> +#else
> +static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
> +				      void (*irq_set_state)(void *cookie, bool state),
> +				      unsigned int (*set_vga_decode)(void *cookie, bool state));
> +{
> +	return 0;
> +}
> +#endif

Yeah - making APIs config invariant is a good idea in any case, 
regardless of Kconfig magic.

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-22  3:56   ` [origin tree build failure] [PATCH] Re: [git pull] drm tree Dave Airlie
  2009-09-22  9:36     ` Ingo Molnar
@ 2009-09-22 10:27     ` Ingo Molnar
  2009-09-22 10:31       ` Dave Airlie
  2009-09-22 10:33       ` Ingo Molnar
  1 sibling, 2 replies; 16+ messages in thread
From: Ingo Molnar @ 2009-09-22 10:27 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel


* Dave Airlie <airlied@linux.ie> wrote:

> >From 8a874578cbf8b07b988e666c15fa0ba767f3c1cb Mon Sep 17 00:00:00 2001
> From: Dave Airlie <airlied@redhat.com>
> Date: Tue, 22 Sep 2009 13:53:00 +1000
> Subject: [PATCH] vgaarb: wrap the client register API so we can disable VGA ARB.
> 
> This provides an dummy register function so everything builds
> if VGA arb is turned off.
> 
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  include/linux/vgaarb.h |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)

btw., i hope you have not commited this yet, there's a trivial problem 
with this patch:

> diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> index e81c64a..b0feb79 100644
> --- a/include/linux/vgaarb.h
> +++ b/include/linux/vgaarb.h
> @@ -41,7 +41,7 @@
>   *     interrupts at any time.
>   */
>  extern void vga_set_legacy_decoding(struct pci_dev *pdev,
> -									unsigned int decodes);
> +				    unsigned int decodes);
>  
>  /**
>   *     vga_get         - acquire & locks VGA resources
> @@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
>   * They driver will get a callback when VGA arbitration is first used
>   * by userspace since we some older X servers have issues.
>   */
> +#if defined(CONFIG_VGA_ARB)
>  int vga_client_register(struct pci_dev *pdev, void *cookie,
>  			void (*irq_set_state)(void *cookie, bool state),
>  			unsigned int (*set_vga_decode)(void *cookie, bool state));
> +#else
> +static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
> +				      void (*irq_set_state)(void *cookie, bool state),
> +				      unsigned int (*set_vga_decode)(void *cookie, bool state));
> +{
> +	return 0;
> +}
> +#endif

that ';' in the inline prototype is bogus, this wont build.

	Ingo

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-22 10:27     ` Ingo Molnar
@ 2009-09-22 10:31       ` Dave Airlie
  2009-09-22 10:33       ` Ingo Molnar
  1 sibling, 0 replies; 16+ messages in thread
From: Dave Airlie @ 2009-09-22 10:31 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: torvalds, linux-kernel, dri-devel

> > Subject: [PATCH] vgaarb: wrap the client register API so we can disable VGA ARB.
> > 
> > This provides an dummy register function so everything builds
> > if VGA arb is turned off.
> > 
> > Signed-off-by: Dave Airlie <airlied@redhat.com>
> > ---
> >  include/linux/vgaarb.h |   11 ++++++++++-
> >  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> btw., i hope you have not commited this yet, there's a trivial problem 
> with this patch:

oops, i was going to push it to jbarnes after I had a chance to play with
it.

I'll clean it up and send it to jbarnes tomorrow.

Dave.

> 
> > diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> > index e81c64a..b0feb79 100644
> > --- a/include/linux/vgaarb.h
> > +++ b/include/linux/vgaarb.h
> > @@ -41,7 +41,7 @@
> >   *     interrupts at any time.
> >   */
> >  extern void vga_set_legacy_decoding(struct pci_dev *pdev,
> > -									unsigned int decodes);
> > +				    unsigned int decodes);
> >  
> >  /**
> >   *     vga_get         - acquire & locks VGA resources
> > @@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
> >   * They driver will get a callback when VGA arbitration is first used
> >   * by userspace since we some older X servers have issues.
> >   */
> > +#if defined(CONFIG_VGA_ARB)
> >  int vga_client_register(struct pci_dev *pdev, void *cookie,
> >  			void (*irq_set_state)(void *cookie, bool state),
> >  			unsigned int (*set_vga_decode)(void *cookie, bool state));
> > +#else
> > +static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
> > +				      void (*irq_set_state)(void *cookie, bool state),
> > +				      unsigned int (*set_vga_decode)(void *cookie, bool state));
> > +{
> > +	return 0;
> > +}
> > +#endif
> 
> that ';' in the inline prototype is bogus, this wont build.
> 
> 	Ingo
> 
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay 
> ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
> http://p.sf.net/sfu/devconf
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/dri-devel
> 
> 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.
  2009-09-22 10:27     ` Ingo Molnar
  2009-09-22 10:31       ` Dave Airlie
@ 2009-09-22 10:33       ` Ingo Molnar
  1 sibling, 0 replies; 16+ messages in thread
From: Ingo Molnar @ 2009-09-22 10:33 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel


here's a patch that works for me.

	Ingo

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 include/linux/vgaarb.h |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index e81c64a..923f904 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -41,7 +41,7 @@
  *     interrupts at any time.
  */
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
-									unsigned int decodes);
+				    unsigned int decodes);
 
 /**
  *     vga_get         - acquire & locks VGA resources
@@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
  * They driver will get a callback when VGA arbitration is first used
  * by userspace since we some older X servers have issues.
  */
+#if defined(CONFIG_VGA_ARB)
 int vga_client_register(struct pci_dev *pdev, void *cookie,
 			void (*irq_set_state)(void *cookie, bool state),
 			unsigned int (*set_vga_decode)(void *cookie, bool state));
+#else
+static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
+				      void (*irq_set_state)(void *cookie, bool state),
+				      unsigned int (*set_vga_decode)(void *cookie, bool state))
+{
+	return 0;
+}
+#endif
 
 #endif /* LINUX_VGA_H */

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [git pull] drm tree
@ 2010-08-05 10:48 Dave Airlie
  0 siblings, 0 replies; 16+ messages in thread
From: Dave Airlie @ 2010-08-05 10:48 UTC (permalink / raw)
  To: torvalds; +Cc: DRI mailing list, linux-kernel

[-- Attachment #1: Type: TEXT/PLAIN, Size: 27923 bytes --]


Hi Linus,

drm merge window pull,
highlights (or at least major movers)
core: BKL removal
      some whitespace misc cleanup
      non-pci drm layer support
      misc memory leak fixes
      vblank tracepoints

Intel: ongoing eDP support
       misc ickle patches all over
       pageflip and vblank tracepoints
       
Radeon: r600/700 tiling support
        r300/r500 hyper-z support
        r600 thermal sensors support
        r600 kernel blit state emission minimisation
	ioport accessors for BIOS scripts
	underscan support for HDMI TVs
        rs690 family HDMI audio support

Nouveau: improved nv10->nv40 suspend/resume support
	 sil164 i2c chip support
         improved nv50 DP support + hotplug support
	 EDID from ACPI support

Along with lots of fixes all over the place.

Dave.

The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:

  Linux 2.6.35 (2010-08-01 15:11:14 -0700)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-core-next

Adam Jackson (7):
      drm/i915/pch: Cosmetic fix to FDI link training
      drm/i915/dp: Rename has_edp to is_pch_edp to reflect its real meaning
      drm/i915/dp: Correctly report eDP in the core connector type
      drm/i915: Initialize LVDS and eDP outputs before anything else
      drm/i915/pch: Set transcoder sync polarity for DP based on actual mode
      drm/i915/hdmi: Set sync polarity based on actual mode
      drm/i915/sdvo: Set sync polarity based on actual mode

Albert Damen (1):
      drm/nouveau: set encoder for lvds

Alberto Milone (1):
      drm/radeon: Add support for the ATIF ACPI method to the radeon driver

Alex Deucher (28):
      drm/kms: add crtc disable function
      drm/radeon/kms/atom: add crtc disable function
      drm/radeon/kms: minor driver cleanups
      drm/radeon/kms/atom: bump atom loop timeout from 1 sec to 5 secs
      drm/radeon/kms: add support for internal thermal sensors (v3)
      drm/radeon/kms: Add crtc tiling setup support for r6xx/r7xx
      drm/radeon/kms: Add crtc tiling setup support for evergreen
      drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx
      drm/radeon/kms: fix CS alignment checking for tiling (v2)
      drm/radeon/kms/r6xx+: add query for tile config (v2)
      drm/radeon/kms: add ioport register access
      drm/radeon/kms: remove rs4xx gart limit
      drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush
      drm/radeon: add comments to r6xx/r7xx blit state
      drm/radeon: remove duplicate state emit in r6xx/r7xx blit
      drm/radeon: group r6xx/r7xx sequential blit state
      drm/radeon: r6xx/r7xx move vport clipping to a single packet
      drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential
      drm/radeon: group r6xx/r7xx newly sequential blit state
      drm/radeon: remove viewport transform from r6xx/r7xx blit emit
      drm/radeon/kms: make sure rio_mem is valid before unmapping it
      drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors
      drm/radeon/kms: handle the case of no active displays properly in the bandwidth code
      drm/radeon/kms/igp: sideport is AMD only
      drm/radeon/kms: fix calculation of h/v scaling factors
      drm/radeon/kms: enable underscan option for digital connectors
      drm/radeon: add new pci ids
      drm/radeon/kms: only expose underscan on avivo chips

Arnd Bergmann (1):
      drm: kill BKL from common code

Ben Skeggs (46):
      drm: disable encoder rather than dpms off in drm_crtc_prepare_encoders()
      drm/nouveau: place notifiers in system memory by default
      drm/nouveau: move LVDS detection back to connector detect() time
      drm/nouveau: use drm_mm in preference to custom code doing the same thing
      drm/nouveau: remove left-over !DRIVER_MODESET paths
      drm/nouveau: missed some braces
      drm/nv50: fix memory detection for cards with >=4GiB VRAM
      drm/nouveau: tidy connector/encoder creation a little
      drm/nouveau: downgrade severity of most init table parser errors
      drm/nv50: fix DP->DVI if output has been programmed for native DP previously
      drm/nv50: DCB quirk for Dell M6300
      drm/nv50: supply encoder disable() hook for SOR outputs
      drm/nv50: when debugging on, log which crtc we connect an encoder to
      drm/nv50: send evo "update" command after each disconnect
      drm/nv50: rewrite display irq handler
      drm/nouveau: move DP script invocation to nouveau_dp.c
      drm/nv50: set DP display power state during DPMS
      drm/nouveau: add scaler-only modes for eDP too
      drm/nouveau: remove dev_priv->init_state and friends
      drm/nv50: implement DAC disconnect fix missed in earlier commit
      drm/nouveau: add instmem flush() hook
      drm/nv50: move tlb flushing to a helper function
      drm/nouveau: remove ability to use external firmware
      drm/nouveau: allocate fixed amount of PRAMIN per channel on all chipsets
      drm/nouveau: remove unused fbdev_info
      drm/nv50: cleanup nv50_fifo.c
      drm/nv20-nv30: move context table object out of dev_priv
      drm/nv50: fix dp_set_tmds to work on the right OR
      drm/nouveau: fix mtrr cleanup path
      drm/nv50: move dp_set_tmds() function to happen in the last display irq
      drm/nouveau: initialise display before enabling interrupts
      drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch
      drm/nv50: fix RAMHT size
      drm/nouveau: reduce usage of fence spinlock to when absolutely necessary
      drm: add "auto" dithering method
      drm/nv50: use correct PRAMIN flush register on original nv50
      drm/nouveau: remove quirk to fabricate DVI-A output on DCB 1.5 boards
      drm/nouveau: support fetching LVDS EDID from ACPI
      drm/nv50: fix regression that break LVDS in some places
      drm/nouveau: fix build without CONFIG_ACPI
      drm/nouveau: add nv_mask register accessor
      drm/nv50: add function to control GPIO IRQ reporting
      drm/nouveau: disable hotplug detect around DP link training
      drm/nv50: correct wait condition for instmem flush
      drm/nouveau: introduce gpio engine
      drm/nv50: fix some not-error error messages

Chris Wilson (31):
      drm: Return EBUSY if the framebuffer is unbound when flipping.
      drm/vmgfx: operation on ‘par->dirty.y1’ may be undefined
      drm: Free the idr layers before calling idr_destroy()
      drm: Free devname along with master->unique
      drm/i915: Explosion following OOM in do_execbuffer.
      drm/i915: Propagate error from drm_install_irq() during EnterVT
      drm/i915: Propagate error from drm_vblank_get() during page-flipping.
      drm/i915: Propagate error from i915_gem_object_flush_gpu_write_domain()
      drm/i915: Silence sparse complaints over insufficient bitfield int types.
      drm/i915: Silence sparse over duplicate members in static initializer
      drm/i915: Silence sparse over non-static local structure.
      drm/i915: Sparse warns about the incorrect sign for storing bit17
      drm/i915: Sparse warning about invalid value for burst_ena in tv_modes
      drm/i915: Remove the WARN when failing to set tiling.
      drm/i915: Include instdone[1] in hangcheck
      drm/i915: Use 128k alignment for untiled display surface on i965 (v2)
      drm/i915: Include any alternate names by which the device is known.
      agp/intel: Destroy the scatterlist on allocation failure
      drm/i915: Remove the redundant check for a fixed_panel_mode
      drm/i915: Refactor panel fitting on the LVDS. (v2)
      drm/i915: Check overlay stride errata for i830 and i845
      drm/i915: Typo in (unused) register mask for overlay.
      drm/i915: Round up the watermark entries (v3)
      drm/i915: Warn if we run out of FIFO space for a mode
      drm/i915: Refactor i915_gem_retire_requests()
      drm/i915: Repeat unbinding during free if interrupted (v6)
      drm/i915: Attempt to uncouple object after catastrophic failure in unbind
      drm/i915: Unreference object not handle on creation
      drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
      drm: Cleanup after failing to create master->unique and dev->name
      drm,io-mapping: Specify slot to use for atomic mappings

Dan Carpenter (2):
      drm: radeon: fix sign bug
      drm/i915: cleanup: use ARRAY_SIZE()

Daniel Vetter (6):
      drm: use list_for_each_entry in drm_mm.c
      drm: kill drm_mm_node->private
      drm: kill dead code in drm_mm.c
      drm: sane naming for drm_mm.c
      drm_mm: extract check_free_mm_node
      drm: implement helper functions for scanning lru list

Dave Airlie (14):
      Merge tag 'v2.6.35-rc4' into drm-testing
      Merge branch 'drm-platform' into drm-testing
      Merge branch 'drm-intel-lru' into drm-testing
      Merge branch 'drm-tracepoints' into drm-testing
      drm: add PCI requirements to low-level drivers.
      drm/radeon/kms: check/restore sanity before doing anything else with GPU.
      Merge tag 'v2.6.35-rc6' into drm-radeon-next
      Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
      Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next
      drm/radeon/kms: move a bunch of modesetting debug to correct debug usage.
      drm/radeon: add basic zmask/hiz support (v4)
      drm: move ttm global code to core drm
      Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next
      drm/radeon: tone down overchatty acpi debug messages.

Eric Anholt (2):
      Merge remote branch 'origin/master' into drm-intel-next
      drm/i915: Clear the Ironlake dithering flags when the pipe doesn't want it.

Francisco Jerez (33):
      drm/nouveau: Put the dithering check back in nouveau_connector_create.
      drm/nouveau: Don't clear AGPCMD completely on INIT_RESET.
      drm/nouveau: Ignore broken legacy I2C entries.
      drm/nv17-nv40: Avoid using active CRTCs for load detection.
      drm/nv04-nv40: Prevent invalid DAC/TVDAC combinations.
      drm/nv04-nv40: Disable connector polling when there're no spare CRTCs left.
      drm/nouveau: Fix a couple of sparse warnings.
      drm/nouveau: INIT_CONFIGURE_PREINIT/CLK/MEM on newer BIOSes is not an error.
      drm/nv04-nv40: Drop redundant logging.
      drm/nouveau: Move the fence wait before migration resource clean-up.
      drm/nouveau: Workaround broken TV load detection on a "Zotac FX5200".
      drm/nouveau: Fix crashes during fbcon init on single head cards.
      drm/nouveau: Disable PROM access on init.
      drm/nv04: Enable context switching on PFIFO init.
      drm/i2c/ch7006: Fix up suspend/resume.
      drm/nouveau: Fix a sparse warning.
      drm/nouveau: Don't pick an interlaced mode as the panel native mode.
      drm/nouveau: Add another Zotac FX5200 TV-out quirk.
      drm/nouveau: Add some PFB register defines.
      drm/nv04-nv3x: Implement init-compute-mem.
      drm/i2c/ch7006: Don't assume that the specified config points to static memory.
      drm/nouveau: Add some generic I2C gadget detection code.
      drm/nouveau: Remove useless CRTC_OWNER logging.
      drm/nouveau: No need to lock/unlock the VGA CRTC regs all the time.
      drm/nouveau: Reset CRTC owner to 0 before BIOS init.
      drm/nv30: Init the PFB+0x3xx memory timing regs.
      drm/nouveau: Reset AGP before running the init scripts.
      drm/nouveau: Put back the old 2-messages I2C slave test.
      drm/nouveau: Move display init to a new nouveau_engine.
      drm/nouveau: Get rid of the remaining VGA CRTC locking.
      drm/nouveau: Fix TV-out detection on unposted cards lacking a usable DCB table.
      drm: Import driver for the sil164 I2C TMDS transmitter.
      drm/kms: Simplify setup of the initial I2C encoder config.

Jerome Glisse (1):
      drm: unify crtc,connector,encoder,fb debug printing

Jesse Barnes (8):
      drm: add vblank event trace point
      drm: add per-event vblank event trace points
      drm/i915: add tracepoints for flip requests & completions
      drm/i915: remove unused vblank_enable var from i915_driver_irq_handler
      drm/i915: remove duplicate PIPE*STAT bit definitions
      drm/i915: fix FDI frequency check
      drm/i915: apply DP bandwidth workaround for PCH eDP as well
      drm/agp/i915: trim stolen space to 32M

Jordan Crouse (4):
      drm: Remove drm_resource wrappers
      drm: Add support for platform devices to register as DRM devices
      drm: Add __arm defines to DRM
      drm: Make sure the DRM offset matches the CPU

Kulikov Vasiliy (3):
      drm/nouveau: set TASK_(UN)INTERRUPTIBLE before schedule_timeout()
      agp: efficeon-agp: do not use PCI resources before pci_enable_device()
      agp: intel-agp: do not use PCI resources before pci_enable_device()

Michel Dänzer (1):
      drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.

Nicolas Kaiser (7):
      drm/i810: fixed coding style issues
      drm/i830: fixed brace and spacing coding style issues
      drm/via: fixed coding style issues, simplified return
      drm/mga: fixed brace, macro and spacing coding style issues
      drm/r128: fixed brace and spacing coding style issues
      drm/sis: fixed brace and spacing coding style issues
      drm/i915: Typo in #define

Ondrej Zary (1):
      intel_agp: Don't oops with zero stolen memory

Rafał Miłecki (3):
      drm/radeon/kms: track audio engine state, do not use not setup timer
      drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740
      drm/radeon/kms: trivial code style fixes for audio

Thomas Bächler (1):
      gpu/drm/i915: Add a blacklist to omit modeset on LID open

Zhao Yakui (10):
      drm/i915: Add the support of eDP on DP-D for Ibex/CPT
      drm/i915: Fix watermark calculation in self-refresh mode
      drm/i915: Fix fifo size for self-refresh watermark on 965G
      drm/i915: Apply self-refresh watermark calculation for cursor plane
      drm/i915: Calculate cursor watermark under non-SR state for Ironlake
      drm/i915: Add frame buffer compression support on Ironlake mobile
      drm/i915: Add fixed panel mode parsed from EDID for eDP without fixed mode in VBT
      drm/i915: Enable panel fitting for eDP
      drm/i915: Always use the fixed panel timing for eDP
      drm/i915: Validate the mode for eDP by using fixed panel size

Zhenyu Wang (2):
      agp/intel: Support the extended physical addressing bits on Sandybridge.
      agp/intel: Add actual definitions of the Sandybridge PTE caching bits.

 drivers/char/agp/efficeon-agp.c                    |   22 +-
 drivers/char/agp/intel-agp.c                       |   26 +-
 drivers/char/agp/intel-agp.h                       |    6 +
 drivers/char/agp/intel-gtt.c                       |   83 ++-
 drivers/gpu/drm/Kconfig                            |   11 +-
 drivers/gpu/drm/Makefile                           |    7 +-
 drivers/gpu/drm/drm_bufs.c                         |   15 +-
 drivers/gpu/drm/drm_crtc.c                         |   30 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   71 +-
 drivers/gpu/drm/drm_drv.c                          |   43 +-
 drivers/gpu/drm/drm_edid.c                         |    4 +-
 drivers/gpu/drm/drm_encoder_slave.c                |    7 +
 drivers/gpu/drm/drm_fops.c                         |   23 +-
 drivers/gpu/drm/drm_gem.c                          |   11 +
 drivers/gpu/drm/{ttm/ttm_global.c => drm_global.c} |   30 +-
 drivers/gpu/drm/drm_info.c                         |   23 +-
 drivers/gpu/drm/drm_ioctl.c                        |  140 ++-
 drivers/gpu/drm/drm_irq.c                          |   26 +-
 drivers/gpu/drm/drm_mm.c                           |  359 ++++---
 drivers/gpu/drm/drm_pci.c                          |  143 +++
 drivers/gpu/drm/drm_platform.c                     |  122 +++
 drivers/gpu/drm/drm_stub.c                         |   92 +--
 drivers/gpu/drm/drm_sysfs.c                        |    3 +-
 drivers/gpu/drm/drm_trace.h                        |   66 ++
 drivers/gpu/drm/drm_trace_points.c                 |    4 +
 drivers/gpu/drm/drm_vm.c                           |   14 +-
 drivers/gpu/drm/i2c/Makefile                       |    3 +
 drivers/gpu/drm/i2c/ch7006_drv.c                   |   22 +-
 drivers/gpu/drm/i2c/ch7006_priv.h                  |    2 +-
 drivers/gpu/drm/i2c/sil164_drv.c                   |  462 ++++++++
 drivers/gpu/drm/i810/i810_dma.c                    |  125 ++-
 drivers/gpu/drm/i810/i810_drv.c                    |    2 +-
 drivers/gpu/drm/i810/i810_drv.h                    |   65 +-
 drivers/gpu/drm/i830/i830_dma.c                    |  137 ++--
 drivers/gpu/drm/i830/i830_drv.c                    |    2 +-
 drivers/gpu/drm/i830/i830_drv.h                    |   49 +-
 drivers/gpu/drm/i830/i830_irq.c                    |   10 +-
 drivers/gpu/drm/i915/i915_dma.c                    |   24 +-
 drivers/gpu/drm/i915/i915_drv.c                    |   66 +-
 drivers/gpu/drm/i915/i915_drv.h                    |   29 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  172 ++-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |    2 -
 drivers/gpu/drm/i915/i915_irq.c                    |   58 +-
 drivers/gpu/drm/i915/i915_reg.h                    |   56 +-
 drivers/gpu/drm/i915/i915_suspend.c                |    9 +-
 drivers/gpu/drm/i915/i915_trace.h                  |   36 +
 drivers/gpu/drm/i915/intel_display.c               |  586 ++++++++---
 drivers/gpu/drm/i915/intel_dp.c                    |  143 +++-
 drivers/gpu/drm/i915/intel_drv.h                   |   10 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |    9 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |  331 +++----
 drivers/gpu/drm/i915/intel_overlay.c               |   14 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |    8 +-
 drivers/gpu/drm/i915/intel_tv.c                    |   12 +-
 drivers/gpu/drm/mga/mga_dma.c                      |  103 +-
 drivers/gpu/drm/mga/mga_drv.c                      |    4 +-
 drivers/gpu/drm/mga/mga_drv.h                      |  187 ++--
 drivers/gpu/drm/mga/mga_irq.c                      |    9 +-
 drivers/gpu/drm/mga/mga_state.c                    |   47 +-
 drivers/gpu/drm/mga/mga_warp.c                     |    4 +-
 drivers/gpu/drm/nouveau/Kconfig                    |   11 +-
 drivers/gpu/drm/nouveau/Makefile                   |    6 +-
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |   38 +-
 drivers/gpu/drm/nouveau/nouveau_bios.c             |  636 +++++++++---
 drivers/gpu/drm/nouveau/nouveau_bios.h             |    4 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |   11 +-
 drivers/gpu/drm/nouveau/nouveau_calc.c             |    4 +-
 drivers/gpu/drm/nouveau/nouveau_channel.c          |    8 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |  404 ++++----
 drivers/gpu/drm/nouveau/nouveau_connector.h        |    7 +-
 drivers/gpu/drm/nouveau/nouveau_dma.c              |    8 +-
 drivers/gpu/drm/nouveau/nouveau_dp.c               |   41 +-
 drivers/gpu/drm/nouveau/nouveau_drv.c              |   41 +-
 drivers/gpu/drm/nouveau/nouveau_drv.h              |  137 ++--
 drivers/gpu/drm/nouveau/nouveau_encoder.h          |   10 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |   35 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |   11 +-
 drivers/gpu/drm/nouveau/nouveau_grctx.c            |  160 ---
 drivers/gpu/drm/nouveau/nouveau_i2c.c              |   42 +
 drivers/gpu/drm/nouveau/nouveau_i2c.h              |    3 +
 drivers/gpu/drm/nouveau/nouveau_mem.c              |  332 ++-----
 drivers/gpu/drm/nouveau/nouveau_notifier.c         |   30 +-
 drivers/gpu/drm/nouveau/nouveau_object.c           |  105 +--
 drivers/gpu/drm/nouveau/nouveau_reg.h              |   91 ++-
 drivers/gpu/drm/nouveau/nouveau_sgdma.c            |   46 +-
 drivers/gpu/drm/nouveau/nouveau_state.c            |  255 +++--
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |   20 +-
 drivers/gpu/drm/nouveau/nv04_crtc.c                |    5 +
 drivers/gpu/drm/nouveau/nv04_dac.c                 |   50 +-
 drivers/gpu/drm/nouveau/nv04_dfp.c                 |   12 +-
 drivers/gpu/drm/nouveau/nv04_display.c             |   90 +-
 drivers/gpu/drm/nouveau/nv04_fifo.c                |   20 +-
 drivers/gpu/drm/nouveau/nv04_graph.c               |    5 +-
 drivers/gpu/drm/nouveau/nv04_instmem.c             |   21 +-
 drivers/gpu/drm/nouveau/nv04_mc.c                  |    4 +
 drivers/gpu/drm/nouveau/nv04_tv.c                  |  125 +--
 drivers/gpu/drm/nouveau/nv10_fifo.c                |   10 -
 .../gpu/drm/nouveau/{nv17_gpio.c => nv10_gpio.c}   |    4 +-
 drivers/gpu/drm/nouveau/nv17_tv.c                  |   65 +-
 drivers/gpu/drm/nouveau/nv20_graph.c               |  100 +-
 drivers/gpu/drm/nouveau/nv30_fb.c                  |   87 ++
 drivers/gpu/drm/nouveau/nv40_fifo.c                |    8 -
 drivers/gpu/drm/nouveau/nv40_graph.c               |   60 +-
 drivers/gpu/drm/nouveau/nv40_mc.c                  |    2 +-
 drivers/gpu/drm/nouveau/nv50_crtc.c                |   42 +-
 drivers/gpu/drm/nouveau/nv50_dac.c                 |   43 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |  419 +++++---
 drivers/gpu/drm/nouveau/nv50_display.h             |    6 +-
 drivers/gpu/drm/nouveau/nv50_fifo.c                |  126 +--
 drivers/gpu/drm/nouveau/nv50_gpio.c                |   35 +
 drivers/gpu/drm/nouveau/nv50_graph.c               |   86 +-
 drivers/gpu/drm/nouveau/nv50_instmem.c             |   68 +-
 drivers/gpu/drm/nouveau/nv50_sor.c                 |  105 +-
 drivers/gpu/drm/nouveau/nvreg.h                    |   22 -
 drivers/gpu/drm/r128/r128_cce.c                    |   52 +-
 drivers/gpu/drm/r128/r128_drv.c                    |    2 +-
 drivers/gpu/drm/r128/r128_drv.h                    |  122 +--
 drivers/gpu/drm/r128/r128_irq.c                    |    4 +-
 drivers/gpu/drm/r128/r128_state.c                  |  121 +--
 drivers/gpu/drm/radeon/Makefile                    |    1 +
 drivers/gpu/drm/radeon/atom.c                      |    9 +-
 drivers/gpu/drm/radeon/atom.h                      |    2 +
 drivers/gpu/drm/radeon/atombios_crtc.c             |  212 +++--
 drivers/gpu/drm/radeon/atombios_dp.c               |   18 +-
 drivers/gpu/drm/radeon/evergreen.c                 |   22 +-
 drivers/gpu/drm/radeon/evergreen_reg.h             |    5 +
 drivers/gpu/drm/radeon/evergreend.h                |    5 +
 drivers/gpu/drm/radeon/r100.c                      |   55 +-
 drivers/gpu/drm/radeon/r100d.h                     |    2 +
 drivers/gpu/drm/radeon/r300.c                      |   46 +-
 drivers/gpu/drm/radeon/r300d.h                     |    2 +
 drivers/gpu/drm/radeon/r420.c                      |    2 +
 drivers/gpu/drm/radeon/r500_reg.h                  |    5 +
 drivers/gpu/drm/radeon/r520.c                      |    2 +
 drivers/gpu/drm/radeon/r600.c                      |   49 +-
 drivers/gpu/drm/radeon/r600_audio.c                |   22 +-
 drivers/gpu/drm/radeon/r600_blit_shaders.c         | 1115 +++++++-------------
 drivers/gpu/drm/radeon/r600_cs.c                   |  232 ++++-
 drivers/gpu/drm/radeon/r600_hdmi.c                 |    6 +-
 drivers/gpu/drm/radeon/r600d.h                     |   12 +
 drivers/gpu/drm/radeon/radeon.h                    |   53 +-
 drivers/gpu/drm/radeon/radeon_acpi.c               |   67 ++
 drivers/gpu/drm/radeon/radeon_asic.h               |    1 +
 drivers/gpu/drm/radeon/radeon_atombios.c           |   75 +-
 drivers/gpu/drm/radeon/radeon_bios.c               |    2 +-
 drivers/gpu/drm/radeon/radeon_combios.c            |   51 +-
 drivers/gpu/drm/radeon/radeon_connectors.c         |   48 +-
 drivers/gpu/drm/radeon/radeon_cp.c                 |    8 +-
 drivers/gpu/drm/radeon/radeon_device.c             |   45 +-
 drivers/gpu/drm/radeon/radeon_display.c            |   77 ++-
 drivers/gpu/drm/radeon/radeon_drv.c                |    5 +-
 drivers/gpu/drm/radeon/radeon_encoders.c           |   15 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |   37 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |   18 +-
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c    |   30 +-
 drivers/gpu/drm/radeon/radeon_legacy_tv.c          |    6 +-
 drivers/gpu/drm/radeon/radeon_mode.h               |   18 +-
 drivers/gpu/drm/radeon/radeon_object.c             |   27 +-
 drivers/gpu/drm/radeon/radeon_pm.c                 |  114 ++-
 drivers/gpu/drm/radeon/radeon_ttm.c                |   20 +-
 drivers/gpu/drm/radeon/reg_srcs/r300               |   13 -
 drivers/gpu/drm/radeon/reg_srcs/r420               |   14 +-
 drivers/gpu/drm/radeon/reg_srcs/rs600              |   13 -
 drivers/gpu/drm/radeon/reg_srcs/rv515              |   13 -
 drivers/gpu/drm/radeon/rs400.c                     |   10 +-
 drivers/gpu/drm/radeon/rs600.c                     |   16 +-
 drivers/gpu/drm/radeon/rs690.c                     |   44 +-
 drivers/gpu/drm/radeon/rv515.c                     |   25 +-
 drivers/gpu/drm/radeon/rv770.c                     |   27 +-
 drivers/gpu/drm/radeon/rv770d.h                    |    6 +
 drivers/gpu/drm/savage/savage_bci.c                |   24 +-
 drivers/gpu/drm/sis/sis_drv.c                      |    3 +-
 drivers/gpu/drm/sis/sis_mm.c                       |   14 +-
 drivers/gpu/drm/ttm/Makefile                       |    2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       |   10 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c                  |    2 -
 drivers/gpu/drm/ttm/ttm_module.c                   |    4 -
 drivers/gpu/drm/via/via_dma.c                      |  120 +--
 drivers/gpu/drm/via/via_dmablit.c                  |   71 +-
 drivers/gpu/drm/via/via_dmablit.h                  |    8 +-
 drivers/gpu/drm/via/via_drv.h                      |   22 +-
 drivers/gpu/drm/via/via_irq.c                      |   13 +-
 drivers/gpu/drm/via/via_map.c                      |    4 +-
 drivers/gpu/drm/via/via_mm.c                       |    7 +-
 drivers/gpu/drm/via/via_verifier.c                 |   47 +-
 drivers/gpu/drm/via/via_verifier.h                 |    4 +-
 drivers/gpu/drm/via/via_video.c                    |    6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c           |   20 +-
 include/drm/drm.h                                  |    2 +
 include/drm/drmP.h                                 |   62 +-
 include/drm/drm_crtc_helper.h                      |    3 +
 include/drm/drm_global.h                           |   53 +
 include/drm/drm_mm.h                               |   27 +-
 include/drm/drm_mode.h                             |    1 +
 include/drm/drm_pciids.h                           |    7 +
 include/drm/i2c/sil164.h                           |   63 ++
 include/drm/radeon_drm.h                           |    2 +
 include/drm/ttm/ttm_bo_driver.h                    |    7 +-
 include/drm/ttm/ttm_module.h                       |   20 -
 include/linux/io-mapping.h                         |   16 +-
 204 files changed, 6985 insertions(+), 4985 deletions(-)
 rename drivers/gpu/drm/{ttm/ttm_global.c => drm_global.c} (79%)
 create mode 100644 drivers/gpu/drm/drm_platform.c
 create mode 100644 drivers/gpu/drm/drm_trace.h
 create mode 100644 drivers/gpu/drm/drm_trace_points.c
 create mode 100644 drivers/gpu/drm/i2c/sil164_drv.c
 delete mode 100644 drivers/gpu/drm/nouveau/nouveau_grctx.c
 rename drivers/gpu/drm/nouveau/{nv17_gpio.c => nv10_gpio.c} (95%)
 create mode 100644 drivers/gpu/drm/nouveau/nv30_fb.c
 create mode 100644 drivers/gpu/drm/radeon/radeon_acpi.c
 create mode 100644 include/drm/drm_global.h
 create mode 100644 include/drm/i2c/sil164.h

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [git pull] drm tree
  2010-04-01  7:32 Dave Airlie
@ 2010-04-01  7:44 ` Rafał Miłecki
  2010-04-01  7:44 ` Rafał Miłecki
  1 sibling, 0 replies; 16+ messages in thread
From: Rafał Miłecki @ 2010-04-01  7:44 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel

W dniu 1 kwietnia 2010 09:32 użytkownik Dave Airlie <airlied@linux.ie> napisał:
> a pull from nouveau + minor drm core fixes,
>
> Lots of radeon fixes from Alex@AMD, main thing is turning off the use of
> the hw i2c engine by default again, it was causing problems for some
> people, we now have a module option. Lots of misc radeon fixes from Alex
> also, along with RV7xx HDMI audio enabling fixes. No GPU reset or
> placement patches. Hopefully this doesn't contain either an April Fools
> joke or an Easter Egg.

Hey, thanks :)

-- 
Rafał

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [git pull] drm tree
  2010-04-01  7:32 Dave Airlie
  2010-04-01  7:44 ` Rafał Miłecki
@ 2010-04-01  7:44 ` Rafał Miłecki
  1 sibling, 0 replies; 16+ messages in thread
From: Rafał Miłecki @ 2010-04-01  7:44 UTC (permalink / raw)
  To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel

W dniu 1 kwietnia 2010 09:32 użytkownik Dave Airlie <airlied@linux.ie> napisał:
> a pull from nouveau + minor drm core fixes,
>
> Lots of radeon fixes from Alex@AMD, main thing is turning off the use of
> the hw i2c engine by default again, it was causing problems for some
> people, we now have a module option. Lots of misc radeon fixes from Alex
> also, along with RV7xx HDMI audio enabling fixes. No GPU reset or
> placement patches. Hopefully this doesn't contain either an April Fools
> joke or an Easter Egg.

Hey, thanks :)

-- 
Rafał

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [git pull] drm tree
@ 2010-04-01  7:32 Dave Airlie
  2010-04-01  7:44 ` Rafał Miłecki
  2010-04-01  7:44 ` Rafał Miłecki
  0 siblings, 2 replies; 16+ messages in thread
From: Dave Airlie @ 2010-04-01  7:32 UTC (permalink / raw)
  To: torvalds; +Cc: dri-devel, linux-kernel

[-- Attachment #1: Type: TEXT/PLAIN, Size: 10212 bytes --]


a pull from nouveau + minor drm core fixes,

Lots of radeon fixes from Alex@AMD, main thing is turning off the use of 
the hw i2c engine by default again, it was causing problems for some 
people, we now have a module option. Lots of misc radeon fixes from Alex 
also, along with RV7xx HDMI audio enabling fixes. No GPU reset or 
placement patches. Hopefully this doesn't contain either an April Fools 
joke or an Easter Egg.

The following changes since commit 220bf991b0366cc50a94feede3d7341fa5710ee4:
  Linus Torvalds (1):
        Linux 2.6.34-rc2

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus

Alex Deucher (36):
      drm/radeon: add new RS880 pci id
      drm/radeon/kms/atom: spread spectrum fix
      drm/radeon/kms: use lcd pll limits when available
      drm/radeon/kms: further spread spectrum fixes
      drm/radeon/kms: fix pal tv-out support on legacy IGP chips
      drm/radeon/kms: fix for hw i2c
      drm/radeon/kms: fix i2c prescale calc on older radeons
      drm/radeon/kms/r1xx: enable hw i2c
      drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing
      drm/radeon/r600: add missing license and comments to r600_blit_shaders.c
      drm/radeon/kms: expose thermal/fan i2c buses
      drm/radeon/kms/pm: fix segfault in clock code
      drm/radeon/kms: gfx init fixes for r6xx/r7xx
      drm/radeon/kms/pm: fix typo in power table parsing
      drm/radeon/kms: init rdev->num_crtc at asic init
      drm/radeon/kms: display watermark fixes
      drm/radeon/kms: never treat rs4xx as AGP
      drm/radeon/kms: fix display bandwidth setup on rs4xx
      drm/radeon/kms: remove lvds quirks
      drm/radeon/kms/atom: make sure tables are valid (v2)
      drm/radeon/r600: remove some regs are not safe regs for command buffers
      drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
      drm/radeon/r6xx/r7xx: CS parser fixes
      drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
      drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
      drm/radeon/r6xx/r7xx: further safe reg clean up
      drm/radeon/kms: fix macbookpro connector quirk
      drm/radeon/kms/atom: minor fixes to transmitter setup
      drm/radeon/kms/dp: remove extraneous training complete call
      drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
      drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
      drm/radeon/kms: display watermark updates (v2)
      drm/radeon/kms: disable MSI on IGP chips
      drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
      drm/radeon/kms: add hw_i2c module option
      drm/radeon/kms/evergreen: get DP working

Ben Skeggs (5):
      drm/nouveau: add option to allow override of dcb connector table types
      drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI
      drm/nv50: fix connector table parsing for some cards
      drm/nouveau: add module option to disable TV detection
      drm/edid: allow certain bogus edids to hit a fixup path rather than fail

Chris Wilson (1):
      drm: Return ENODEV if the inode mapping changes

Daniel Vetter (5):
      drm/radeon: create radeon_asic.c
      drm/radeon: move asic structs to radeon_asic.c
      drm/radeon: unconfuse return value of radeon_asic->clear_surface_reg
      drm/radeon: include radeon_asic.h in the asic specific files
      drm/radeon: collect r100 asic related declarations in radeon_asic.h

Dave Airlie (8):
      drm/ttm: use drm calloc large and free large
      Merge remote branch 'nouveau/for-airlied' into drm-linus
      Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus
      drm/radeon/kms: don't print error on -ERESTARTSYS.
      Merge branch 'v2.6.34-rc2' into drm-linus
      drm/radeon/kms: add sanity check to wptr.
      drm/radeon/kms: rs400/480 should set common registers.
      drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.

Francisco Jerez (2):
      drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay.
      drm/nouveau: Never evict VRAM buffers to system.

Jerome Glisse (2):
      drm/radeon/kms: catch atombios infinite loop and break out of it
      drm/radeon/kms: avoid possible oops (call gart_fini before gart_disable)

Maarten Maathuis (2):
      drm/nouveau: print a message very early during suspend
      drm/nv50: add a memory barrier to pushbuf submission

Marcin Kościelnicki (4):
      drm/nv50: Remove redundant/incorrect ctxvals initialisation.
      drm/nouveau: Fix fbcon corruption with font width not divisible by 8
      drm/nv50: Make ctxprog wait until interrupt handler is done.
      drm/nv50: Improve PGRAPH interrupt handling.

Michel Dänzer (1):
      drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.

Pauli Nieminen (1):
      drm/radeon/kms: Fix NULL pointer dereference if memory allocation failed.

Rafał Miłecki (8):
      drm/radeon/kms: clean HDMI definitions
      drm/radeon/kms: clean assigning HDMI blocks to encoders
      drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs
      drm/radeon/kms: enable audio engine on DCE32
      drm/radeon/kms: remove dead audio/HDMI code
      drm/radeon/kms: improve coding style a little
      drm/radeon/kms: switch to condition waiting for reclocking
      drm/radeon/kms: prepare for more reclocking operations

Randy Dunlap (2):
      drm/vmwgfx: depends on FB
      drm: fix build error when SYSRQ is disabled

Robert P. J. Day (1):
      drm: "kobject_init/kobject_add" -> "kobject_init_and_add".

Zhao Yakui (1):
      drm: remove the EDID blob stored in the EDID property when it is disconnected

 drivers/gpu/drm/drm_crtc_helper.c           |    1 +
 drivers/gpu/drm/drm_edid.c                  |    9 -
 drivers/gpu/drm/drm_fb_helper.c             |    2 +
 drivers/gpu/drm/drm_fops.c                  |   16 +-
 drivers/gpu/drm/nouveau/Makefile            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_bios.c      |   28 +-
 drivers/gpu/drm/nouveau/nouveau_bios.h      |    3 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c        |    3 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c |    2 +-
 drivers/gpu/drm/nouveau/nouveau_dma.c       |    5 +
 drivers/gpu/drm/nouveau/nouveau_drv.c       |   10 +
 drivers/gpu/drm/nouveau/nouveau_drv.h       |    6 +
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  609 +++++++++++++++++++--
 drivers/gpu/drm/nouveau/nouveau_state.c     |    5 +-
 drivers/gpu/drm/nouveau/nv04_crtc.c         |    6 +-
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |    6 +-
 drivers/gpu/drm/nouveau/nv50_display.c      |    4 +-
 drivers/gpu/drm/nouveau/nv50_fb.c           |   32 ++
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |    2 +-
 drivers/gpu/drm/nouveau/nv50_graph.c        |   22 +-
 drivers/gpu/drm/nouveau/nv50_grctx.c        |   13 +-
 drivers/gpu/drm/radeon/Makefile             |    2 +-
 drivers/gpu/drm/radeon/atom.c               |   91 +++-
 drivers/gpu/drm/radeon/atom.h               |    8 +-
 drivers/gpu/drm/radeon/atombios_crtc.c      |   98 +++-
 drivers/gpu/drm/radeon/atombios_dp.c        |    6 +-
 drivers/gpu/drm/radeon/evergreen.c          |   11 +-
 drivers/gpu/drm/radeon/r100.c               |   25 +-
 drivers/gpu/drm/radeon/r200.c               |    1 +
 drivers/gpu/drm/radeon/r300.c               |    5 +-
 drivers/gpu/drm/radeon/r420.c               |    2 +
 drivers/gpu/drm/radeon/r520.c               |    9 +-
 drivers/gpu/drm/radeon/r600.c               |   30 +-
 drivers/gpu/drm/radeon/r600_audio.c         |   52 +--
 drivers/gpu/drm/radeon/r600_blit_shaders.c  |   35 ++
 drivers/gpu/drm/radeon/r600_cp.c            |    3 +
 drivers/gpu/drm/radeon/r600_cs.c            |   70 +++-
 drivers/gpu/drm/radeon/r600_hdmi.c          |  191 +++++---
 drivers/gpu/drm/radeon/r600_reg.h           |   10 +-
 drivers/gpu/drm/radeon/r600d.h              |   49 ++
 drivers/gpu/drm/radeon/radeon.h             |   66 +--
 drivers/gpu/drm/radeon/radeon_asic.c        |  772 +++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/radeon_asic.h        |  545 ++-----------------
 drivers/gpu/drm/radeon/radeon_atombios.c    |  461 +++++++++--------
 drivers/gpu/drm/radeon/radeon_combios.c     |    7 +-
 drivers/gpu/drm/radeon/radeon_connectors.c  |    2 +-
 drivers/gpu/drm/radeon/radeon_cs.c          |   11 +-
 drivers/gpu/drm/radeon/radeon_device.c      |  237 ++-------
 drivers/gpu/drm/radeon/radeon_display.c     |   68 ++-
 drivers/gpu/drm/radeon/radeon_drv.c         |   11 +-
 drivers/gpu/drm/radeon/radeon_drv.h         |    3 +-
 drivers/gpu/drm/radeon/radeon_encoders.c    |  121 +++--
 drivers/gpu/drm/radeon/radeon_i2c.c         |  153 +++---
 drivers/gpu/drm/radeon/radeon_irq_kms.c     |   22 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c |    8 +
 drivers/gpu/drm/radeon/radeon_legacy_tv.c   |   29 +-
 drivers/gpu/drm/radeon/radeon_mode.h        |   12 +-
 drivers/gpu/drm/radeon/radeon_object.c      |    6 +-
 drivers/gpu/drm/radeon/radeon_pm.c          |   46 ++-
 drivers/gpu/drm/radeon/radeon_reg.h         |    1 +
 drivers/gpu/drm/radeon/reg_srcs/r600        |   75 ---
 drivers/gpu/drm/radeon/rs400.c              |    7 +-
 drivers/gpu/drm/radeon/rs600.c              |   33 ++-
 drivers/gpu/drm/radeon/rs600d.h             |   53 ++
 drivers/gpu/drm/radeon/rs690.c              |  122 +++--
 drivers/gpu/drm/radeon/rs690d.h             |    3 +
 drivers/gpu/drm/radeon/rv515.c              |   45 +-
 drivers/gpu/drm/radeon/rv770.c              |   31 +-
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 +-
 drivers/gpu/drm/ttm/ttm_memory.c            |   18 +-
 drivers/gpu/drm/ttm/ttm_tt.c                |   23 +-
 drivers/gpu/drm/vmwgfx/Kconfig              |    2 +-
 include/drm/drmP.h                          |   34 +--
 include/drm/drm_mem_util.h                  |   65 +++
 include/drm/drm_pciids.h                    |    1 +
 include/drm/ttm/ttm_bo_driver.h             |    1 -
 76 files changed, 2902 insertions(+), 1680 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/nv50_fb.c
 create mode 100644 drivers/gpu/drm/radeon/radeon_asic.c
 create mode 100644 include/drm/drm_mem_util.h

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [git pull] drm tree
@ 2010-04-01  7:32 Dave Airlie
  0 siblings, 0 replies; 16+ messages in thread
From: Dave Airlie @ 2010-04-01  7:32 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, dri-devel

[-- Attachment #1: Type: TEXT/PLAIN, Size: 10418 bytes --]


a pull from nouveau + minor drm core fixes,

Lots of radeon fixes from Alex@AMD, main thing is turning off the use of 
the hw i2c engine by default again, it was causing problems for some 
people, we now have a module option. Lots of misc radeon fixes from Alex 
also, along with RV7xx HDMI audio enabling fixes. No GPU reset or 
placement patches. Hopefully this doesn't contain either an April Fools 
joke or an Easter Egg.

The following changes since commit 220bf991b0366cc50a94feede3d7341fa5710ee4:
  Linus Torvalds (1):
        Linux 2.6.34-rc2

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus

Alex Deucher (36):
      drm/radeon: add new RS880 pci id
      drm/radeon/kms/atom: spread spectrum fix
      drm/radeon/kms: use lcd pll limits when available
      drm/radeon/kms: further spread spectrum fixes
      drm/radeon/kms: fix pal tv-out support on legacy IGP chips
      drm/radeon/kms: fix for hw i2c
      drm/radeon/kms: fix i2c prescale calc on older radeons
      drm/radeon/kms/r1xx: enable hw i2c
      drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing
      drm/radeon/r600: add missing license and comments to r600_blit_shaders.c
      drm/radeon/kms: expose thermal/fan i2c buses
      drm/radeon/kms/pm: fix segfault in clock code
      drm/radeon/kms: gfx init fixes for r6xx/r7xx
      drm/radeon/kms/pm: fix typo in power table parsing
      drm/radeon/kms: init rdev->num_crtc at asic init
      drm/radeon/kms: display watermark fixes
      drm/radeon/kms: never treat rs4xx as AGP
      drm/radeon/kms: fix display bandwidth setup on rs4xx
      drm/radeon/kms: remove lvds quirks
      drm/radeon/kms/atom: make sure tables are valid (v2)
      drm/radeon/r600: remove some regs are not safe regs for command buffers
      drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
      drm/radeon/r6xx/r7xx: CS parser fixes
      drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
      drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
      drm/radeon/r6xx/r7xx: further safe reg clean up
      drm/radeon/kms: fix macbookpro connector quirk
      drm/radeon/kms/atom: minor fixes to transmitter setup
      drm/radeon/kms/dp: remove extraneous training complete call
      drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
      drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
      drm/radeon/kms: display watermark updates (v2)
      drm/radeon/kms: disable MSI on IGP chips
      drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
      drm/radeon/kms: add hw_i2c module option
      drm/radeon/kms/evergreen: get DP working

Ben Skeggs (5):
      drm/nouveau: add option to allow override of dcb connector table types
      drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI
      drm/nv50: fix connector table parsing for some cards
      drm/nouveau: add module option to disable TV detection
      drm/edid: allow certain bogus edids to hit a fixup path rather than fail

Chris Wilson (1):
      drm: Return ENODEV if the inode mapping changes

Daniel Vetter (5):
      drm/radeon: create radeon_asic.c
      drm/radeon: move asic structs to radeon_asic.c
      drm/radeon: unconfuse return value of radeon_asic->clear_surface_reg
      drm/radeon: include radeon_asic.h in the asic specific files
      drm/radeon: collect r100 asic related declarations in radeon_asic.h

Dave Airlie (8):
      drm/ttm: use drm calloc large and free large
      Merge remote branch 'nouveau/for-airlied' into drm-linus
      Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus
      drm/radeon/kms: don't print error on -ERESTARTSYS.
      Merge branch 'v2.6.34-rc2' into drm-linus
      drm/radeon/kms: add sanity check to wptr.
      drm/radeon/kms: rs400/480 should set common registers.
      drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.

Francisco Jerez (2):
      drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay.
      drm/nouveau: Never evict VRAM buffers to system.

Jerome Glisse (2):
      drm/radeon/kms: catch atombios infinite loop and break out of it
      drm/radeon/kms: avoid possible oops (call gart_fini before gart_disable)

Maarten Maathuis (2):
      drm/nouveau: print a message very early during suspend
      drm/nv50: add a memory barrier to pushbuf submission

Marcin Kościelnicki (4):
      drm/nv50: Remove redundant/incorrect ctxvals initialisation.
      drm/nouveau: Fix fbcon corruption with font width not divisible by 8
      drm/nv50: Make ctxprog wait until interrupt handler is done.
      drm/nv50: Improve PGRAPH interrupt handling.

Michel Dänzer (1):
      drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.

Pauli Nieminen (1):
      drm/radeon/kms: Fix NULL pointer dereference if memory allocation failed.

Rafał Miłecki (8):
      drm/radeon/kms: clean HDMI definitions
      drm/radeon/kms: clean assigning HDMI blocks to encoders
      drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs
      drm/radeon/kms: enable audio engine on DCE32
      drm/radeon/kms: remove dead audio/HDMI code
      drm/radeon/kms: improve coding style a little
      drm/radeon/kms: switch to condition waiting for reclocking
      drm/radeon/kms: prepare for more reclocking operations

Randy Dunlap (2):
      drm/vmwgfx: depends on FB
      drm: fix build error when SYSRQ is disabled

Robert P. J. Day (1):
      drm: "kobject_init/kobject_add" -> "kobject_init_and_add".

Zhao Yakui (1):
      drm: remove the EDID blob stored in the EDID property when it is disconnected

 drivers/gpu/drm/drm_crtc_helper.c           |    1 +
 drivers/gpu/drm/drm_edid.c                  |    9 -
 drivers/gpu/drm/drm_fb_helper.c             |    2 +
 drivers/gpu/drm/drm_fops.c                  |   16 +-
 drivers/gpu/drm/nouveau/Makefile            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_bios.c      |   28 +-
 drivers/gpu/drm/nouveau/nouveau_bios.h      |    3 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c        |    3 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c |    2 +-
 drivers/gpu/drm/nouveau/nouveau_dma.c       |    5 +
 drivers/gpu/drm/nouveau/nouveau_drv.c       |   10 +
 drivers/gpu/drm/nouveau/nouveau_drv.h       |    6 +
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  609 +++++++++++++++++++--
 drivers/gpu/drm/nouveau/nouveau_state.c     |    5 +-
 drivers/gpu/drm/nouveau/nv04_crtc.c         |    6 +-
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |    6 +-
 drivers/gpu/drm/nouveau/nv50_display.c      |    4 +-
 drivers/gpu/drm/nouveau/nv50_fb.c           |   32 ++
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |    2 +-
 drivers/gpu/drm/nouveau/nv50_graph.c        |   22 +-
 drivers/gpu/drm/nouveau/nv50_grctx.c        |   13 +-
 drivers/gpu/drm/radeon/Makefile             |    2 +-
 drivers/gpu/drm/radeon/atom.c               |   91 +++-
 drivers/gpu/drm/radeon/atom.h               |    8 +-
 drivers/gpu/drm/radeon/atombios_crtc.c      |   98 +++-
 drivers/gpu/drm/radeon/atombios_dp.c        |    6 +-
 drivers/gpu/drm/radeon/evergreen.c          |   11 +-
 drivers/gpu/drm/radeon/r100.c               |   25 +-
 drivers/gpu/drm/radeon/r200.c               |    1 +
 drivers/gpu/drm/radeon/r300.c               |    5 +-
 drivers/gpu/drm/radeon/r420.c               |    2 +
 drivers/gpu/drm/radeon/r520.c               |    9 +-
 drivers/gpu/drm/radeon/r600.c               |   30 +-
 drivers/gpu/drm/radeon/r600_audio.c         |   52 +--
 drivers/gpu/drm/radeon/r600_blit_shaders.c  |   35 ++
 drivers/gpu/drm/radeon/r600_cp.c            |    3 +
 drivers/gpu/drm/radeon/r600_cs.c            |   70 +++-
 drivers/gpu/drm/radeon/r600_hdmi.c          |  191 +++++---
 drivers/gpu/drm/radeon/r600_reg.h           |   10 +-
 drivers/gpu/drm/radeon/r600d.h              |   49 ++
 drivers/gpu/drm/radeon/radeon.h             |   66 +--
 drivers/gpu/drm/radeon/radeon_asic.c        |  772 +++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/radeon_asic.h        |  545 ++-----------------
 drivers/gpu/drm/radeon/radeon_atombios.c    |  461 +++++++++--------
 drivers/gpu/drm/radeon/radeon_combios.c     |    7 +-
 drivers/gpu/drm/radeon/radeon_connectors.c  |    2 +-
 drivers/gpu/drm/radeon/radeon_cs.c          |   11 +-
 drivers/gpu/drm/radeon/radeon_device.c      |  237 ++-------
 drivers/gpu/drm/radeon/radeon_display.c     |   68 ++-
 drivers/gpu/drm/radeon/radeon_drv.c         |   11 +-
 drivers/gpu/drm/radeon/radeon_drv.h         |    3 +-
 drivers/gpu/drm/radeon/radeon_encoders.c    |  121 +++--
 drivers/gpu/drm/radeon/radeon_i2c.c         |  153 +++---
 drivers/gpu/drm/radeon/radeon_irq_kms.c     |   22 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c |    8 +
 drivers/gpu/drm/radeon/radeon_legacy_tv.c   |   29 +-
 drivers/gpu/drm/radeon/radeon_mode.h        |   12 +-
 drivers/gpu/drm/radeon/radeon_object.c      |    6 +-
 drivers/gpu/drm/radeon/radeon_pm.c          |   46 ++-
 drivers/gpu/drm/radeon/radeon_reg.h         |    1 +
 drivers/gpu/drm/radeon/reg_srcs/r600        |   75 ---
 drivers/gpu/drm/radeon/rs400.c              |    7 +-
 drivers/gpu/drm/radeon/rs600.c              |   33 ++-
 drivers/gpu/drm/radeon/rs600d.h             |   53 ++
 drivers/gpu/drm/radeon/rs690.c              |  122 +++--
 drivers/gpu/drm/radeon/rs690d.h             |    3 +
 drivers/gpu/drm/radeon/rv515.c              |   45 +-
 drivers/gpu/drm/radeon/rv770.c              |   31 +-
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 +-
 drivers/gpu/drm/ttm/ttm_memory.c            |   18 +-
 drivers/gpu/drm/ttm/ttm_tt.c                |   23 +-
 drivers/gpu/drm/vmwgfx/Kconfig              |    2 +-
 include/drm/drmP.h                          |   34 +--
 include/drm/drm_mem_util.h                  |   65 +++
 include/drm/drm_pciids.h                    |    1 +
 include/drm/ttm/ttm_bo_driver.h             |    1 -
 76 files changed, 2902 insertions(+), 1680 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/nv50_fb.c
 create mode 100644 drivers/gpu/drm/radeon/radeon_asic.c
 create mode 100644 include/drm/drm_mem_util.h

[-- Attachment #2: Type: text/plain, Size: 345 bytes --]

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev

[-- Attachment #3: Type: text/plain, Size: 161 bytes --]

--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-08-05 10:48 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-21  5:12 [git pull] drm tree Dave Airlie
2009-09-21 11:59 ` Ed Tomlinson
2009-09-21 14:17   ` Alex Deucher
2009-09-21 22:40     ` Ed Tomlinson
2009-09-21 16:12 ` [origin tree build failure] [PATCH] " Ingo Molnar
2009-09-21 16:50   ` [PATCH] drm: Fix build failure in radeon and i915 drivers Ingo Molnar
2009-09-22  3:56   ` [origin tree build failure] [PATCH] Re: [git pull] drm tree Dave Airlie
2009-09-22  9:36     ` Ingo Molnar
2009-09-22 10:27     ` Ingo Molnar
2009-09-22 10:31       ` Dave Airlie
2009-09-22 10:33       ` Ingo Molnar
2010-04-01  7:32 Dave Airlie
2010-04-01  7:44 ` Rafał Miłecki
2010-04-01  7:44 ` Rafał Miłecki
2010-04-01  7:32 Dave Airlie
2010-08-05 10:48 Dave Airlie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.