summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-06drm/i915: Add the support of memory self-refresh on IronlakeHEADencoder-reworkZhenyu Wang2-3/+201
Update the self-refresh watermark for display plane/cursor and enable the memory self-refresh on Ironlake. The watermark is also updated for the active display plane. More than 1W idle power is saved on one Ironlake laptop after enabling memory self-refresh. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: Add pineview_update_wm callback to update watermark for pineviewZhao Yakui2-74/+88
Now we don't define the update_wm callback function explicitly for pineview platform. But as it also belongs to mobile platform, we will use the function of i9xx_update_wm function to update its watermark again after we configure the watermark. This is incorrect. So we will add a update_wm callback function for pineview to update watermark. BTW: We will disable the self-refresh and never enable it any more if we can't find the appropriate the latency on pineview plaftorm. In such case the update_wm callback will be NULL. The bitmask macro is also defined to access the corresponding fifo watermark register. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: Only save/restore FBC on the platform that supports FBCZhao Yakui1-19/+22
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: Fix the incorrect argument for SDVO SET_TV_format commandZhao Yakui1-1/+1
Otherwise it will cause that S-video output becomes black/white when switching to other TV format. http://bugs.freedesktop.org/show_bug.cgi?id=23916 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Tested-by: Arnold <arnold.erbsloeh@web.de> Tested-by: Bazin <bazin.cz@gmail.com> Tested-by: Nigel <nigel_tuck@eircom.net> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: Add support of SDVO on Ibexpeak PCHZhao Yakui3-16/+36
SDVO on Ibexpeak PCH with Ironlake is multiplexed with HDMIB port, and only has SDVOB port. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06Revert "drm/i915: Use a dmi quirk to skip a broken SDVO TV output."Zhenyu Wang1-21/+1
This reverts commit 6070a4a928f8c92b9fae7d6717ebbb05f425d6b2. The quirk for this SDVO device on IBM specific board is just a hack in old code which showed the broken multifunction SDVO support in the driver. Multifunction SDVO patch provided the right fix for it. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: implement multifunction SDVO device supportZhenyu Wang1-236/+375
With new intel_encoder/intel_connector structure change, each supported connector type on SDVO device will be created as a new 'intel_connector', and all attached to one 'intel_encoder' for its SDVO port. The SDVO encoder will handle SDVO protocol stuff, and each connector does its own part of work now, like detection is only to check if current active output is itself, etc. Update since last submit: - Fixed SDVO TV property creation failure by incorrect set target output call Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: remove unused intel_pipe_get_connector()Zhenyu Wang1-17/+0
Added by original eDP support patch, not used any more. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: remove connector object in old output structureZhenyu Wang2-14/+0
As all display drivers have been converted, remove the left reference for connector object in old structure. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert TV driver to new encoder/connector structureZhenyu Wang1-14/+26
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert SDVO driver to new encoder/connector structureZhenyu Wang1-66/+94
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert DVO driver to new encoder/connector structureZhenyu Wang1-36/+36
Also remove old UMS copied code for get_crtc. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert DP/eDP driver to new encoder/connector structureZhenyu Wang2-31/+45
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert HDMI driver to new encoder/connector structureZhenyu Wang1-12/+24
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert LVDS driver to new encoder/connector structureZhenyu Wang1-11/+23
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-06drm/i915: convert VGA driver to new encoder/connector structureZhenyu Wang1-13/+22
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2010-04-02drm/i915: Remove dead KMS encoder save/restore code.Eric Anholt12-581/+4
This was brought over from UMS, and used for a while until we decided that drm_helper_resume_force_mode was easier and more reliable, since it didn't require duplicating all the code deleted here. We just forgot to delete all that junk for a while.
2010-04-02drm/i915: change intel_ddc_get_modes() function parametersZhenyu Wang8-35/+26
This one replaces original param for intel_ddc_get_modes() with DRM connector and i2c bus adapter instead. With explicit params, we won't require that a single driver structure must hold connector and DDC bus reference, which ease the conversion to splitted encoder/ connector model. It also clears up for some cases that we would steal other DDC bus for mode probe, like VGA analog DDC probe for DVI-I. Also it fixed a bug in old DVI-I probe handling, that failed to restore origin analog GPIO port. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: passing drm connector param for load detectionZhenyu Wang4-7/+14
In load detection, connector's encoder assignment must be kept consistent for proper mode setting, and this makes connector as explicit parameter for load detect function to not require single data structure to hold both encoder and connector reference, ease the transition for splitted encoder/connector model. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: Add new helper to return current attached encoder for connectorZhenyu Wang2-0/+26
For introducing splitted encoder/connector structure, this helper will return connector's attached encoder when needed. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: Add new 'intel_connector' structureZhenyu Wang1-0/+6
This adds new structure of intel_connector to present drm's connector object, which is used to convert from origin single output into encoder/connector model. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: more conversion from connector_list walk to encoder_listZhenyu Wang1-18/+18
What we really want is encoder info instead of connector, so change some more list walk in pipeline setup functions from connector_list to encoder_list. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: use encoder_list for hotplug callbackZhenyu Wang1-4/+4
Instead of walking through drm connector_list uses encoder_list for calling hotplug functions which is consistent with intel display hotplug reporting. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: Convert some trace events to DEFINE_TRACELi Zefan1-61/+25
Use DECLARE_EVENT_CLASS to remove duplicate code: text data bss dec hex filename 14655 2732 15 17402 43fa i915_trace_points.o.orig 11625 2732 10 14367 381f i915_trace_points.o 8 events are converted: i915_gem_object: i915_gem_object_{unbind, destroy} i915_gem_request: i915_gem_request_{complete, retire, wait_begin, wait_end} i915_ring: i915_ring_{wait_begin, wait_end} No functional change. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: Allow LVDS on pipe A on gen4+Adam Jackson2-1/+5
The gen4 docs say it works, so why not. Tested on Ironlake. Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-04-02drm/i915: Add no_lvds entry for the Clientron U800Stefan Bader1-0/+8
BugLink: http://bugs.launchpad.net/ubuntu/bugs/544671 This system claims to have a LVDS but has not. Signed-off-by: Stephane Graber <stgraber@ubuntu.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> CC: stable@kernel.org Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-25drm/i915: Rename many remaining uses of "output" to encoder or connector.Eric Anholt2-98/+103
Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-25drm/i915: Rename intel_output to intel_encoder.Eric Anholt11-663/+663
The intel_output naming is inherited from the UMS code, which had a structure of screen -> CRTC -> output. The DRM code has an additional notion of encoder/connector, so the structure is screen -> CRTC -> encoder -> connector. This is a useful structure for SDVO encoders which can support multiple connectors (each of which requires different programming in the one encoder and could be connected to different CRTCs), or for DVI-I, where multiple encoders feed into the connector for whether it's used for digital or analog. Most of our code is encoder-related, so transition it to talking about encoders before we start trying to distinguish connectors. This patch is produced by sed s/intel_output/intel_encoder/ over the driver. Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-25agp/intel: intel_845_driver is an agp driver!Daniel Vetter1-3/+0
... not a GTT driver. So the additional chipset flush introduced in commit 2162e6a2b0cd5acbb9bd8a3c94e1c1269b078295 Author: Dave Airlie <airlied@redhat.com> Date: Wed Nov 21 16:36:31 2007 +1000 agp/intel: Add chipset flushing support for i8xx chipsets. to fix a GTT problem makes absolutely no sense. If this would really be needed for AGP chipsets, too, we should add it to all i8xx agp drivers, not just one. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-25drm/i915: introduce to_intel_bo helperDaniel Vetter10-94/+96
This is a purely cosmetic change to make changes in this area easier. And hey, it's not only clearer and typechecked, but actually shorter, too! [anholt: To clarify, this is a change to let us later make drm_i915_gem_object subclass drm_gem_object, instead of having drm_gem_object have a pointer to i915's private data] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-25drm/i915: Disable FBC on 915GM and 945GM.Robert Hooker2-3/+3
It is causing hangs after a suspend/resume cycle with the default powersave=1 module option on these chipsets since 2.6.32-rc. BugLink: http://bugs.launchpad.net/bugs/492392 Signed-off-by: Robert Hooker <sarvatt@ubuntu.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Eric Anholt <eric@anholt.net>
2010-03-24Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds3-5/+31
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: OMAP: DSS2: panel-generic: re-implement mode changing OMAP: DSS2: initialize dss clk sources properly OMAP: DSS2: VRAM: Fix early_param for vram
2010-03-24Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds12-32/+103
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON [ARM] Kirkwood: WPS button keycode mapping pxa168fb: fix incorrect resource calculation [ARM] pxa/raumfeld: fix button name [ARM] pxa/raumfeld: remove duplicated #include [ARM] locomo: fix unpaired spin_lock_irqsave [ARM] locomo: fix SPI register offset [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms [ARM] pxa: remove spi cs gpio direction to avoid clash with driver [ARM] mmp: fix for variables in uncompress.h being discarded [ARM] pxa: fix for variables in uncompress.h being discarded ARM: Update mach-types ARM: Fix IXP23xx build error in mach/memory.h
2010-03-24Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds9-36/+22
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: don't try to decode GETATTR if DELEGRETURN returned error sunrpc: handle allocation errors from __rpc_lookup_create() SUNRPC: Fix the return value of rpc_run_bc_task() SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel SUNRPC: Fix a potential memory leak in auth_gss NFS: Prevent another deadlock in nfs_release_page()
2010-03-24Merge branch 'upstream-linus' of ↵Linus Torvalds2-7/+37
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata-sff: fix spurious IRQ handling pata_via: Add VIA VX900 support
2010-03-24Merge branch 'sh/for-2.6.34' of ↵Linus Torvalds13-30/+69
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Silence unintialized variable warnings in dwarf unwinder. sh: Tidy up a couple of section mismatches. sh: Fix build after dynamic PMB rework sh: Replace unsafe manipulation of MMUCR sh: Flush ITLB too in PTEAEX's flush_tlb_page() sh64: Remove long unused mid_sched macro SH: remove superfluous warning from the serial driver SH: fix SCIFA SCASCR register bit definitions serial: sh-sci: fix SH-Mobile SH breakage sh: Add watch-dog register address for SH7722/SH7723/SH7724 sh: ms7724: Add tiny-document for sound sh: mach-ecovec24: Add i2c_put_adapter on sh_eth_init
2010-03-24fscache: add missing unlockDan Carpenter1-0/+1
Sparse complained about this missing spin_unlock() Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24Merge branch 'for-linus' of ↵Linus Torvalds6-7/+17
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix dangling pointers lp3971: Fix BUCK_VOL_CHANGE_SHIFT logic lp3971: Fix setting val for LDO2 and LDO4 regulator: Get rid of lockdep warning regulator: handle kcalloc() failure Regulators: max8925-regulator - clean up driver data after removal
2010-03-24do_sync_read/write() should set kiocb.ki_nbytes to be consistentDavid Howells1-0/+2
do_sync_read/write() should set kiocb.ki_nbytes to be consistent with do_sync_readv_writev(). Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24FDPIC: For-loop in elf_core_vma_data_size() is incorrectDavid Howells1-1/+1
Fix an incorrect for-loop in elf_core_vma_data_size(). The advance-pointer statement lacks an assignment: CC fs/binfmt_elf_fdpic.o fs/binfmt_elf_fdpic.c: In function 'elf_core_vma_data_size': fs/binfmt_elf_fdpic.c:1593: warning: statement with no effect Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24Merge branch 'for-linus' of ↵Linus Torvalds11-105/+121
git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Stop trying to use ACPI lid status to determine LVDS connection. drm/intel: fix up set_tiling for untiled->tiled transition drm/i915: Set up the documented clock gating on Sandybridge and Ironlake. agp/intel: Don't do the chipset flush on Sandybridge. agp/intel: Respect the GTT size on Sandybridge for scratch page setup. drm/i915: fix small leak on overlay error path drm/i915: Avoid NULL deref in get_pages() unwind after error. drm/i915: Fix check with IS_GEN6 drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats drm/i915: Enable VS timer dispatch. drm/i915: Rename FBC_C3_IDLE to FBC_CTL_C3_IDLE to match other registers drm/i915: remove an unnecessary wait_request() drm/i915: Don't bother with the BKL for GEM ioctls.
2010-03-24Merge branch 'i2c-for-linus' of ↵Linus Torvalds3-8/+64
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-scmi: Provide module aliases for automatic loading i2c-scmi: Support IBM SMBus CMI devices acpi: Support IBM SMBus CMI devices
2010-03-24Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds12-56/+59
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix boot failures with compressed kernels [S390] fix broken proc interface for sclp_async [S390] sclp: avoid 64 bit division [S390] dasd: check tsb validity [S390] dasd: fix alignment of transport mode recovery TCW [S390] system.h: Fix compile error for 1 and 2 byte cmpxchg [S390] smp: fix lowcore allocation [S390] zcore: CPU registers are not saved under LPAR
2010-03-24Merge branch 'for-linus' of ↵Linus Torvalds11-22/+49
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: cmipci: work around invalid PCM pointer ASoC: Remove BROKEN from i.MX audio after dependencies merged ALSA: hda - Fix access-after-free in patch_realtek.c ALSA: hda - Sort codec entry list of Nvidia HDMI ALSA: hda - Add support of Nvidia GT220 HDMI ALSA: hda: Fix 0 dB offset for HP laptops using CX20551 (Waikiki) ALSA: hda - Add PCI quirk for HP dv6-1110ax. sound/oss/vidc.c: change the field used with DMA_ACTIVE ASoC: pxa-pcm-lib: initialize DMA channel to -1 ASoC: Bail out of wm_hubs DC servo if calibration fails ASoC: tlv320dac33: Internal clocking changes ASoC: tlv320dac33: Fix DSP modes ASoC: SIU driver shall select FW_LOADER
2010-03-24Document Linux's circular buffering capabilitiesDavid Howells3-0/+258
Document the circular buffering capabilities available in Linux. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Randy Dunlap <rdunlap@xenotime.net> Reviewed-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24fs/partition/msdos: fix unusable extended partition for > 512B sectorOGAWA Hirofumi1-3/+10
Smaller size than a minimum blocksize can't be used, after all it's handled like 0 size. For extended partition itself, this makes sure to use bigger size than one logical sector size at least. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Daniel Taylor <Daniel.Taylor@wdc.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24fs/partitions/msdos: add support for large disksDaniel Taylor1-34/+38
In order to use disks larger than 2TiB on Windows XP, it is necessary to use 4096-byte logical sectors in an MBR. Although the kernel storage and functions called from msdos.c used "sector_t" internally, msdos.c still used u32 variables, which results in the ability to handle XP-compatible large disks. This patch changes the internal variables to "sector_t". Daniel said: "In the near future, WD will be releasing products that need this patch". [hirofumi@mail.parknet.co.jp: tweaks and fix] Signed-off-by: Daniel Taylor <daniel.taylor@wdc.com> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24lxfb: set the H- and V-SYNC polarity of the flatpanel outputMichael Grzeschik2-1/+11
Fixup for the flatpanel output. The geode_modedb attribute flags are used to set the SYNC polarity of the flatpanel. Without this patch our flatpanel registers stayed unconfigured, so we just saw garbage output. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Cc: Andres Salomon <dilinger@collabora.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24kcore: fix test for end of listDan Carpenter1-1/+1
"m" is never NULL here. We need a different test for the end of list condition. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-24mempolicy: fix get_mempolicy() for relative and static nodesLee Schermerhorn1-3/+7
Discovered while testing other mempolicy changes: get_mempolicy() does not handle static/relative mode flags correctly. Return the value that the user specified so that it can be restored via set_mempolicy() if desired. Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Cc: Ravikiran Thirumalai <kiran@scalex86.org> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 15:42:42 +0000