aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-22drm: add plane propertiesRob Clark2-0/+26
The omapdrm driver uses this for setting per-overlay rotation. It is likely also useful for setting YUV->RGB colorspace conversion matrix, etc. Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Paulo Zanoni <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm: add bitmask property typeRob Clark3-3/+49
A bitmask property is similar to an enum. The enum value is a bit position (0-63), and valid property values consist of a mask of zero or more of (1 << enum_val[n]). [airlied: 1LL -> 1ULL] Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Paulo Zanoni <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22Merge branch 'exynos-drm-next' of ↵Dave Airlie20-439/+2066
git://git.infradead.org/users/kmpark/linux-samsung into drm-core-next * 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: drm/exynos: add G2D driver drm/exynos: added vp scaling feature for hdmi drm/exynos: added source size to overlay structure drm/exynos: add additional display mode for hdmi drm/exynos: enable dvi mode for dvi monitor drm/exynos: fixed wrong pageflip finish event for interlace mode drm/exynos: add PM functions for hdmi and mixer drm/exynos: add dpms for hdmi drm/exynos: use threaded irq for hdmi hotplug drm/exynos: use platform_get_irq_byname for hdmi drm/exynos: cleanup for hdmi platform data drm/exynos: added a feature to get gem buffer information. drm/exynos: added drm prime feature. drm/exynos: added cache attribute support for gem. vgaarb: Provide dummy default device functions
2012-05-22drm: Make the CRTC gamma_set operation optionalLaurent Pinchart3-7/+8
Drivers for hardware without gamma support should not be forced to implement a no-op gamma set operation. Signed-off-by: Laurent Pinchart <[email protected]> Cc: Rob Clark <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linusJiri Kosina11-148/+461
Conflicts: drivers/hid/hid-core.c
2012-05-22drm: Constify drm_mode_config_funcs pointerLaurent Pinchart9-9/+9
The DRM mode config functions structure declared by drivers and pointed to by the drm_mode_config funcs field is never modified. Make it a const pointer. Signed-off-by: Laurent Pinchart <[email protected]> Cc: Inki Dae <[email protected]> Cc: Alan Cox <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Ben Skeggs <[email protected]> Cc: Thomas Hellstrom <[email protected]> Cc: Rob Clark <[email protected]> Reviwed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm: Constify gem_vm_ops pointerLaurent Pinchart7-7/+7
The GEM vm operations structure is passed to the VM core that stores it in a const field. There vm operations structures can thus be const in DRM as well. Signed-off-by: Laurent Pinchart <[email protected]> Cc: Inki Dae <[email protected]> Cc: Alan Cox <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Rob Clark <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm: Miscellaneous typo fixes and documentation updatesLaurent Pinchart5-24/+38
Signed-off-by: Laurent Pinchart <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm: Don't initialize local ret variable when not neededLaurent Pinchart9-32/+24
Signed-off-by: Laurent Pinchart <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22Merge branch 'upstream' into for-linusJiri Kosina13-32/+307
Conflicts: drivers/hid/hid-core.c
2012-05-22drm: Delete the vblank timer synchronously at cleanup timeLaurent Pinchart1-1/+1
A race condition exists in drm_vblank_cleanup() if the vblank disable timer callback runs after freeing the memory that its callback function tries to access. Fix this by deleting the timer synchronously. Signed-off-by: Laurent Pinchart <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/backlight: initialize struct backlight_properties properlyCorentin Chary2-0/+2
The power field was never correctly initialized. [airlied: just took the two drm specific bits] Signed-off-by: Corentin Chary <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linusJiri Kosina4-89/+287
2012-05-22drm/nouveau/dp: Probe branch/sink OUIs (v2)Adam Jackson1-0/+21
(airlied: v2: fix missing struct - fixes compile) Signed-off-by: Adam Jackson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/radeon/dp: Probe branch/sink OUIsAdam Jackson1-0/+20
Signed-off-by: Adam Jackson <[email protected]> Acked-by: Alex Deucher <[email protected]> Reviewed-by: Jerome Glisse <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/i915/dp: Probe branch/sink OUIsAdam Jackson1-0/+19
Signed-off-by: Adam Jackson <[email protected]> Acked-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/dp: Add DPCD defines for register 0x007Adam Jackson1-0/+4
Low four bits are downstream port count. High bit indicates peer OUI support. OUI matching will allow us to do additional per-sink handling for things like DP->VGA bandwidth limits or (hopefully) the iMac-as- display hack. Signed-off-by: Adam Jackson <[email protected]> Reviewed-by: Jerome Glisse <[email protected]> Acked-by: Daniel Vetter <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/dp: Add DPCD OUI register definesAdam Jackson1-0/+4
DisplayPort has an escape hatch by which sources and sinks can identify each other. We would prefer not to notice this, but I suspect we're going to need to. Signed-off-by: Adam Jackson <[email protected]> Reviewed-by: Jerome Glisse <[email protected]> Acked-by: Daniel Vetter <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22gma500: Fix Poulsbo suspend/resume crash on devices with SDVO portsAlan Cox1-2/+4
Reported-by: Guillaume Clément <[email protected]> Signed-off-by: Alan Cox <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-05-22gma500: handle poulsbo cursor restrictionPatrik Jakobsson7-12/+61
Poulsbo needs a physical address in the cursor base register. We allocate a stolen memory buffer and copy the cursor image provided by userspace into it. When/If we get our own userspace driver we can map this stolen memory directly. The patch also adds a mark in chip ops so we can identify devices that has this requirement. Signed-off-by: Patrik Jakobsson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22gma500: Prevent endless loop in panel power up sequenceAlan Cox1-3/+9
Some devices don't have a panel connected to LVDS and thus will never power up. This patch checks the power sequence progress bits in PP_STATUS to prevent an endless loop on such devices. Signed-off-by: Patrik Jakobsson <[email protected]> Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22drm/radeon/hdmi: compile audio status in 1 functionRafał Miłecki4-104/+73
This optmizes calls, registers reads and assignments. Signed-off-by: Rafał Miłecki <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-05-22nouveau: nouveau_set_bo_placement takes TTM flagsDave Airlie1-1/+1
This seems to be wrong to me, spotted while thinking about dma-buf. Reviewed-by: Ben Skeggs <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-05-22edac, mips: don't change code that has been removed in edac/mips treeJiri Kosina3-3/+3
This is a partial revert of 15ed103a9800 ("edac: Fix spelling errors") 6997991ab0db ("mips: Fix printk typos in arc/mips") which change code that doesn't exist any more in edac/mips trees. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-05-22Merge branch 'fortglx/3.5/time' of git://git.linaro.org/people/jstultz/linux ↵Thomas Gleixner3-9/+4
into timers/core
2012-05-22Merge branch 'for-next-arm-dma' into for-linusMarek Szyprowski9-461/+1123
Conflicts: arch/arm/Kconfig arch/arm/mm/dma-mapping.c Signed-off-by: Marek Szyprowski <[email protected]>
2012-05-22powerpc: Fix irq distributionKim Phillips1-1/+1
setting CONFIG_IRQ_ALL_CPUS distributes IRQs to CPUs only when the number of online CPUs equals NR_CPUS. See commit 280ff97494e0fef4124bee5c52e39b23a18dd283 "sparc64: fix and optimize irq distribution" for more details. Using the online mask fixes IRQ-to-CPU distribution on systems that boot with less than NR_CPUS. Signed-off-by: Kim Phillips <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-05-22Revert "powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new ↵Benjamin Herrenschmidt2-87/+6
PPC ptrace flags" This reverts commit 1b788400bbcbfe25280dc0b8000d2142bfe3be3b. It causes oopses when passed incorrect arguments and has a design fault using IPIs with interrupts disabled. Signed-off-by: Benjamin Herrenschmidt <[email protected]> ---
2012-05-22powerpc: Fixing a cputhread code documentationAnshuman Khandual1-1/+1
-- Signed-off-by: Anshuman Khandual <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-05-22ktest: Add README to explain what is in the examples directorySteven Rostedt1-0/+32
Add a README that explains what the different example configs in the ktest example directory are about. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22ktest: Add the snowball.conf example configSteven Rostedt1-0/+53
I used the snowball.conf in a live demo that demonstrated how to use ktest.pl with a snowball ARM board. I've been asked to included that config in the ktest repository. Here it is. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22ktest: Add an example config that does cross compiling of several archsSteven Rostedt1-0/+260
Add the config that I use to test several archs. I downloaded several cross compilers from: http://kernel.org/pub/tools/crosstool/files/bin/x86_64/ and this config is an example to crosscompile several archs to make sure that your changes do not break archs that you are not working on. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22ktest: Add kvm.conf example configSteven Rostedt1-0/+88
Add an example config that explains how to use ktest with a virtual guest as the target. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22ktest: Add useful example configsSteven Rostedt6-0/+517
I've been asked several times to provide more useful example configs for ktest.pl, as the sample.conf is too complex (because it explains all configs). This adds configs broken up by use case, and these configs are based on actual configs that I use on a daily basis. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22ktest: Add USE_OUTPUT_MIN_CONFIG to avoid prompt on make_min_configSteven Rostedt2-1/+16
If the file that OUTPUT_MIN_CONFIG exists then ktest.pl will prompt the user and ask them if the OUTPUT_MIN_CONFIG should be used as the starting point for make_min_config instead of MIN_CONFIG. This is usually the case, and to allow the user to do so, which is helpful if the user is creating different min configs based on tests, and they know one is a superset of another test, they can set USE_OUTPUT_MIN_CONFIG to one, which will prevent kest.pl from prompting to use the OUTPUT_MIN_CONFIG and it will just use it. If USE_OUTPUT_MIN_CONIFG is set to zero, then ktest.pl will continue to use MIN_CONFIG instead. The default is that USE_OUTPUT_MIN_CONFIG is undefined. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-22unicore32: if there's no handler we need to restore sigmask, syscall or no ↵Al Viro1-8/+5
syscall Signed-off-by: Al Viro <[email protected]>
2012-05-21xtensa: add handling of TIF_NOTIFY_RESUMEAl Viro3-6/+20
Signed-off-by: Al Viro <[email protected]>
2012-05-21microblaze: drop 'oldset' argument of do_notify_resume()Al Viro3-19/+11
never used... Signed-off-by: Al Viro <[email protected]>
2012-05-21microblaze: handle TIF_NOTIFY_RESUMEAl Viro3-26/+38
Signed-off-by: Al Viro <[email protected]>
2012-05-21score: add handling of NOTIFY_RESUME to do_notify_resume()Al Viro1-1/+8
It's already called if TIF_NOTIFY_RESUME is set, so we only need to add the actual work. Note that checking for RESTORE_SIGMASK was not needed - set_restore_sigmask() also sets SIGPENDING, so we never RESTORE_SIGMASK without SIGPENDING. Signed-off-by: Al Viro <[email protected]>
2012-05-21m68k: add TIF_NOTIFY_RESUME and handle it.Al Viro6-7/+21
TIF_NOTIFY_RESUME added (as bit 5). That way nommu glue needs no changes at all; mmu one needs just to replace jmi do_signal_return to jne do_signal_return There we have flags shifted up, until bit 6 (SIGPENDING) is in MSBit; instead of checking that MSBit is set (jmi) we check that MSBit or something below it is set (jne); bits 0..4 are never set, so that's precisely "bit 6 or bit 5 is set". Usual handling of NOTIFY_RESUME/SIGPENDING is done in do_notify_resume(); glue calls it instead of do_signal(). Signed-off-by: Al Viro <[email protected]>
2012-05-21fbdev: sh_mobile_lcdc: Don't confuse line size with pitchLaurent Pinchart2-2/+4
When using the MERAM the LCDC line size needs to be programmed with a MERAM-specific value different than the real frame buffer pitch. Fix it. Reported-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Florian Tobias Schandinat <[email protected]> Cc: [email protected] # for 3.4 Signed-off-by: Linus Torvalds <[email protected]>
2012-05-21sparc: kill ancient comment in sparc_sigaction()Al Viro1-5/+0
It used to be true, until 2.1.78 (14 years ago) when we switched to do_sigaction()... Signed-off-by: Al Viro <[email protected]>
2012-05-21h8300: missing checks of __get_user()/__put_user() return valuesAl Viro1-6/+6
Signed-off-by: Al Viro <[email protected]>
2012-05-21frv: missing checks of __get_user()/__put_user() return valuesAl Viro1-6/+6
Signed-off-by: Al Viro <[email protected]>
2012-05-21cris: missing checks of __get_user()/__put_user() return valuesAl Viro2-12/+12
Signed-off-by: Al Viro <[email protected]>
2012-05-21powerpc: missing checks of __get_user()/__put_user() return valuesAl Viro1-3/+3
Signed-off-by: Al Viro <[email protected]>
2012-05-21sh: missing checks of __get_user()/__put_user() return valuesAl Viro2-22/+27
Signed-off-by: Al Viro <[email protected]>
2012-05-21sparc: missing checks of __get_user()/__put_user() return valuesAl Viro2-10/+12
Signed-off-by: Al Viro <[email protected]>
2012-05-21avr32: struct old_sigaction is never usedAl Viro1-7/+0
Signed-off-by: Al Viro <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.