27 Jul, 2011
1 commit
-
so replace it with mdelay(20).
Fixes build error:
ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
Signed-off-by: Stephen Rothwell
Signed-off-by: Linus Torvalds
26 Jul, 2011
1 commit
-
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
staging:iio:kfifo_buf fix double initialization of the ring device structure.
staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
staging:iio:imu fix missing register table index for some channels
spectra: enable device before poking it
staging: rts_pstor: Fix a miswriting
staging/lirc_bt829: Return -ENODEV when no hardware is found.
staging/lirc_parallel: remove pointless prototypes.
staging/lirc_parallel: fix panic on rmmod
staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
Staging: zram: Fix kunmapping order
Revert "gma500: Fix dependencies"
gma500: Add medfield header
gma500: wire up the mrst i2c bus from chip_info
gma500: Fix DPU build
gma500: Clean up the DPU config and make it runtime
gma500: resync with Medfield progress
gma500: Use the mrst helpers and power control for mode commit
gma500@ Fix backlight range error
gma500: More Moorestown muddle meddling means MM maybe might modeset
...Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
- Documentation/feature-removal-schedule.txt
- drivers/staging/bcm/headers.h
- drivers/staging/brcm80211/brcmfmac/dhd_linux.c
- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
- drivers/staging/brcm80211/brcmfmac/wl_iw.c
- drivers/staging/et131x/et131x_netdev.c
- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
- drivers/staging/rtl8192e/r8192E.h
- drivers/staging/usbip/userspace/src/utils.h
25 Jul, 2011
1 commit
-
So use mdelay(20) instead. Fixes this build error:
ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
Signed-off-by: Stephen Rothwell
Signed-off-by: Linus Torvalds
17 Jul, 2011
1 commit
-
This reverts commit 66dca5178c70b7bb5ae1761e175569eac8708e1e. It caused
build errors on some platforms:drivers/video/Kconfig:36:error: recursive dependency detected!
drivers/video/Kconfig:36: symbol FB is selected by DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:22: symbol DRM_KMS_HELPER is selected by DRM_PSB
drivers/staging/gma500/Kconfig:1: symbol DRM_PSB depends on ACPI_VIDEOReported-by: Stephen Rothwell
Acked-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
16 Jul, 2011
22 commits
-
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We did the groundwork earlier now we can use it
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Fix up the merge build
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We really don't want this all done by ifdeffery - and this isn't any need
as it's fairly easy to sort out.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We want to hit the MM panel backlight when appropriate
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
If we go out of range we break the pm counts on the error path
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
There are a least three different species we need to deal with and right
now it seems the only way to sort them out is via DMI. Encapsulate the
entire pile somewhere private and out of the way.Hopefully a saner method will emerge later.
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
This differs enough from the Cedarview HDMI sufficiently to want to keep
them separated.We need to sort out the power management for Oaktrail/Moorestown in order
to plumb this lot into the register handling logic.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Moorestown does not have a DDC bus, skip getting modes via DDC. This
fixes the following bug:BUG: unable to handle kernel NULL pointer dereference at 00000010
IP: [] i2c_transfer+0x17/0xb0
*pde = 00000000
Oops: 0000 [#1]Call Trace:
[] drm_do_probe_ddc_edid+0x59/0x90
[] drm_get_edid+0x24/0x250
[] psb_intel_ddc_get_modes+0x22/0x60
[] psb_intel_lvds_get_modes+0x21/0x80Signed-off-by: Octavian Purdila
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Octavian Purdila
[Fixed up for other changes, and tidied some existing variable names]
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Octavian Purdila posted a patch that sets num_crtc to 1 for Moorestown, but
Oaktrail has 2 so we need to split Oaktrail/Moorestown more sensibly, and
also cope with some other differences later on.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
PCI core only prefer one of legacy PM and new PM. And since runtime pm
is implemented, which requires the new PM method, we should remove the
legacy PM method.Signed-off-by: Octavian Purdila
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
For things like cursors and many kinds of framebuffer set up we are actually
best using the stolen memory when possible.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
This does the same as the dumb mmap but we want them separated in the ABI
in case a future extension to the dumb interface means we can't treat them
the same way.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We currently have a test hack framebuffer mode ioctl, turn that into a DRM
interface.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We need to provide an interface to create additional buffers for the cursor
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
ACPI Video is used by GMA500 so we need to depend upon it
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Ubuntu users reported that dithering was not being set on Poulsbo, and they
have a point as we set one variable and check another which is never set.Signed-off-by: Alan Cox
Tested-by: Luca Forina
Signed-off-by: Greg Kroah-Hartman -
It's part of the psb_device so just make it part of the struct not a
pointer. This does cause a bit of noise shuffling indirections.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
This completes the clean up all the non Medfield C files to the point where
checkpatch approves of them barring some silly 80 column whining.The Medfield stuff is still in a lot of flux but the rest is now ready for
general tidy and review.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
09 Jul, 2011
12 commits
-
The list cursor is never NULL in a list_for_each_entry() loop.
Signed-off-by: Dan Carpenter
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We should only cleanup "dsr_info" if it's non-NULL obviously and not
the other way around.Signed-off-by: Dan Carpenter
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
There is a comma missing here between the strings so they were
concatenated by mistake.Signed-off-by: Dan Carpenter
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We are close to having PSB and CDV ready for moving from staging so it's
time to get the polish out.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Otherwise we can't ioremap the gtt and the screen gets garbled.
Signed-off-by: Patrik Jakobsson
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Randy Dunlap reports:
| when both CONFIG_DRM_I915=y and CONFIG_DRM_PSB=y:
| drivers/staging/built-in.o: In function `intel_opregion_init':
| (.text+0x47943): multiple definition of `intel_opregion_init'
| drivers/gpu/built-in.o:(.text+0x17277a): first defined hereSigned-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Fixed some stylistic uglies noticed while fixing the previous bug
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Dan Carpenter reports:
Smatch complains about 6a7afe3acc4b "gma500: continue abstracting
platform specific code"drivers/staging/gma500/psb_intel_lvds.c +579 psb_intel_lvds_set_property(7)
warn: variable dereferenced before check 'encoder'--- a/drivers/staging/gma500/psb_intel_lvds.c
+++ b/drivers/staging/gma500/psb_intel_lvds.c
@@ -575,11 +575,12 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
struct drm_property *property,
uint64_t value)
{
- struct drm_encoder *pEncoder = connector->encoder;
+ struct drm_encoder *encoder = connector->encoder;
+ struct drm_psb_private *dev_priv = encoder->dev->dev_private;
^^^^^^^^^^^^
dereference encoder here.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Remove unneeded version.h includes from drivers/staging/gma500/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/gma500/.
This patch removes them.Signed-off-by: Jesper Juhl
[updated for all th file cleanup and movement]
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
06 Jul, 2011
2 commits
-
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
This is now horribly out of date
Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman