aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-04-30drm: Kill user_modes list and the associated ioctlsVille Syrjälä4-209/+4
There is no way to use modes added to the user_modes list. We never look at the contents of said list in the kernel, and the only operations userspace can do are attach and detach. So the only "benefit" of this interface is wasting kernel memory. Fortunately it seems no real user space application ever used these ioctls. So just kill them. Also remove the prototypes for the non-existing drm_mode_addmode_ioctl() and drm_mode_rmmode_ioctl() functions. v2: Use drm_noop instead of completely removing the ioctls Signed-off-by: Ville Syrjälä <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30drm: Silence some sparse warningsVille Syrjälä3-9/+9
drivers/gpu/drm/drm_pci.c:155:5: warning: symbol 'drm_pci_set_busid' was not declared. Should it be static? drivers/gpu/drm/drm_pci.c:197:5: warning: symbol 'drm_pci_set_unique' was not declared. Should it be static? drivers/gpu/drm/drm_pci.c:269:5: warning: symbol 'drm_pci_agp_init' was not declared. Should it be static? drivers/gpu/drm/drm_crtc.c:181:1: warning: symbol 'drm_get_dirty_info_name' was not declared. Should it be static? drivers/gpu/drm/drm_crtc.c:1123:5: warning: symbol 'drm_mode_group_init' was not declared. Should it be static? drivers/gpu/drm/drm_modes.c:918:6: warning: symbol 'drm_mode_validate_clocks' was not declared. Should it be static? Signed-off-by: Ville Syrjälä <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30drm: Make drm_ioctls constVille Syrjälä1-2/+2
We never modify the contents of drm_ioctls, so make it const. Signed-off-by: Ville Syrjälä <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30drivers, drm: fix qxl build error when debugfs is disabledDavid Rientjes1-0/+6
Fix build error when CONFIG_DEBUG_FS is disabled: drivers/gpu/drm/qxl/qxl_debugfs.c: In function 'qxl_debugfs_init': drivers/gpu/drm/qxl/qxl_debugfs.c:76:2: error: implicit declaration of function 'drm_debugfs_create_files' drivers/gpu/drm/qxl/qxl_debugfs.c: In function 'qxl_debugfs_takedown': drivers/gpu/drm/qxl/qxl_debugfs.c:84:2: error: implicit declaration of function 'drm_debugfs_remove_files' Signed-off-by: David Rientjes <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30Merge branch 'drm-intel-fixes' of ↵Dave Airlie8-20/+60
git://people.freedesktop.org/~danvet/drm-intel into drm-next Just a few important fixes for 3.10. 3 regression fixes, plus rectified Haswell overclock support (the old code was correct, only docs confusing) and improved DP data m/n selection. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: correct the calculation of first_pd_entry_in_global_pt Revert "drm/i915: Don't overclock on Haswell" drm/i915: Make data/link N value power of two drm/i915: avoid full modeset when changing the color range properties drm/i915: Fall back to bit banging mode for DVO transmitter detection
2013-04-30Merge branch 'exynos-drm-next' of ↵Dave Airlie11-160/+230
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next This is final pull request for Exynos next and includes device tree support for fimc device, one revert, some code cleanups and fixup. The revert replaces wrong one[1] with correct one[2]. This was my mistake and sorry for this. * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: drm/exynos: Don't blend mixer layer 0 drm/exynos: Remove unnecessary braces in exynos_hdmi.c drm/exynos: Select VIDEOMODE_HELPERS for FIMD drm/exynos: do not use generic flags to dumb drm/exynos: added ipp device registration to drm driver exynos/drm: hdmi: cleanup for hdmi common device registration drm/exynos: fix wrong return check for platform_device_register_simple drm/exynos: add device tree support for fimc ipp driver drm/exynos: rework fimc clocks handling drm/exynos: remove redundant devm_kfree() drm/exynos: enable FIMD clocks Revert "drm/exynos: prepare FIMD clocks"
2013-04-30drm/mgag200: Remove extra variable assignsChristopher Harvey1-2/+0
These two variables are set again immediately in 'mgag200_modeset_init' Signed-off-by: Christopher Harvey <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30drm/mgag200: Pass driver specific mga_device in driver functionsChristopher Harvey1-4/+3
Signed-off-by: Christopher Harvey <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-30drm/mgag200: Remove pointless call to drm_fb_get_bpp_depthChristopher Harvey1-3/+0
Signed-off-by: Christopher Harvey <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2013-04-29drm/exynos: Don't blend mixer layer 0Sean Paul1-3/+5
This patch disables blending the mixer's layer 0 onto the background (solid color). It doesn't make sense to blend this layer by default, and causes color distortion if the layer is used for arbitrary content. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: Remove unnecessary braces in exynos_hdmi.cSachin Kamat1-6/+4
Silences the following checkpatch warning: WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: Select VIDEOMODE_HELPERS for FIMDSachin Kamat1-1/+1
FIMD also requires video mode helper APIs. Without this patch we get the following build error: drivers/gpu/drm/exynos/exynos_drm_fimd.c:895: undefined reference to `of_get_fb_videomode' make: *** [vmlinux] Error 1 Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: do not use generic flags to dumbInki Dae1-1/+2
This patch removes the use of dumb flags from driver. As Dave pointed out, the dumb flags are not driver specific so this should be removed from driver. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2013-04-29drm/exynos: added ipp device registration to drm driverSeung-Woo Kim3-0/+44
This patch added exynos-drm-ipp platform device registration to the exynos drm driver. When DT is enabled, platform devices need to be registered within the driver code. This patch fits the requirement of both DT and Non DT based drm drivers. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Donghwa Lee <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29exynos/drm: hdmi: cleanup for hdmi common device registrationSeung-Woo Kim2-5/+11
The hdmi common device registration function does not need extern definition and for error case and unregister case, exynos_drm_hdmi_pdev should be cleared. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: fix wrong return check for platform_device_register_simpleSeung-Woo Kim2-2/+2
platform_device_register_simple() never returns NULL, but IS_ERR_OR_NULL macro is used for checking return value in exynos drm driver. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: add device tree support for fimc ipp driverSylwester Nawrocki3-57/+62
This patch adds OF initialization support for the FIMC driver. The binding documentation can be found at Documentation/devicetree/ bindings/media/samsung-fimc.txt. The syscon regmap interface is used to serialize access to the shared CAMBLK registers from within the V4L2 FIMC-IS and the DRM FIMC drivers. The DRM driver uses this interface for setting up the FIFO data link between FIMD and FIMC IP blocks, while the V4L2 one for setting up a data link between the camera ISP and FIMC for camera capture. The CAMBLK registers are not accessed any more through a statically mapped IO. Synchronized access to these registers is required for simultaneous operation of the camera ISP and the DRM IPP on Exynos4x12. The driver data and driver_ids static data structures are removed since Exynos4 is going to be a dt-only platform and there is currently no board file in mainline that defines platform data for the FIMC IPP, i.e. uses it. Camera input signal polarities are not currently parsed from the device tree. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: rework fimc clocks handlingSylwester Nawrocki1-70/+99
The clocks handling is refactored and a "mux" clock handling is added to account for changes in the clocks driver. After switching to the common clock framework the sclk_fimc clock is now split into two clocks: a gate and a mux clock. In order to retain the exisiting functionality two additional consumer clocks are passed to the driver from device tree: "mux" and "parent". Then the driver sets "parent" clock as a parent clock of the "mux" clock. These two additional clocks are optional, and should go away when there is a standard way of setting up parent clocks on DT platforms. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: remove redundant devm_kfree()Sylwester Nawrocki1-2/+0
There is no need for explicit calls of devm_kfree(), as the allocated memory will be freed during driver's detach. Remove the redundant devm_kfree() calls from probe() and remove() callbacks. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29drm/exynos: enable FIMD clocksVikas Sajjan1-8/+5
Common Clock Framework introduced the need to prepare clocks before enabling them, otherwise clk_enable() fails. This patch adds clk_prepare_enable and clk_disable_unprepare() calls to the driver. This patch also removes clk_disable() from fimd_remove() as it will be done by pm_runtime_put_sync. Signed-off-by: Vikas Sajjan <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-04-29Revert "drm/exynos: prepare FIMD clocks"Inki Dae1-12/+2
This reverts commit b4e3a3e844a0e33cf106a1c9f27ff93340c37640.
2013-04-27drm/i915: correct the calculation of first_pd_entry_in_global_ptZhang, Xiong Y1-2/+1
When ppgtt is enabled, dev_priv->gtt.total has excluded the gtt space occupied by ppgtt table in i915_gem_init_global_gtt() function. So the calculation of first_pd_entry_in_global_pt doesn't need to subtract I915_PPGTT_PD_ENTRIES again. Or else PPGTT directory table will be destroyed by global gtt allocation. This regression has been introduced in commit a54c0c279f3864171fe53c66e769d5a137c5c651 Author: Ben Widawsky <[email protected]> Date: Thu Jan 24 14:45:00 2013 -0800 drm/i915: remove intel_gtt structure The breakage is pretty subtile since the old gtt_total_entries included the pde range, whereas the new on did not. Cc: [email protected] Signed-off-by: Xiong Zhang<[email protected]> [danvet: Add regression citation and cc: stable. Thanks to Chris for correcting my wrong guess about which commit broke things.] Signed-off-by: Daniel Vetter <[email protected]>
2013-04-26Merge branch 'drm-nouveau-next' of ↵Dave Airlie105-644/+1316
git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next "Nothing overly exciting here aside from calim's fermi/kepler vram compression patches. The rest is misc fixes I gathered from the list. Most of the stuff from me is fixing issues that have come up from the work on kepler PM, as well as a commit moving all the old-school modesetting out of the way (no code changes here). There's other patches to go on top of that, but, it'll have to wait until I can rip out the old PM code, it's a bit tangled." * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (38 commits) drm/nouveau/fifo: implement channel creation event generation drm/nouveau/core: allow non-maskable events drm/nouveau/timer: allow alarms to be cancelled drm/nouveau/device: tweak the device/subdev relationship a little drm/nouveau/device: enable proper constructor/destructor drm/nouveau/device: have engine object initialised before creation drm/nouveau/device: convert to engine, rather than subdev drm/nv50-/disp: use self as parent for subobjects drm/nv50-/fifo: use parent as self for subobjects drm/nv20-nv30/gr: use parent as self for subobjects drm/nvc0-/gr: use self as parent for subobjects drm/nv04-nv40/instmem: use self as parent for subobjects drm/nv04-nv40/vm: use self as parent for subobjects drm/nv50-/bar: use self as parent for subobjects drm/nv04-nv40/instmem: remove parent deref hack drm/nouveau/i2c: remove parent deref hack drm/nouveau/core: rebase object ref/use counts after ctor/init/fini events drm/nv50/disp: inform core when we're not creating a new context drm/nouveau/therm: send some messages to debug level drm/nve0/gr: add handling for a bunch of PGRAPH traps ...
2013-04-26drm/nouveau/fifo: implement channel creation event generationBen Skeggs2-1/+9
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/core: allow non-maskable eventsBen Skeggs1-4/+8
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/timer: allow alarms to be cancelledBen Skeggs1-4/+9
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/device: tweak the device/subdev relationship a littleBen Skeggs2-88/+71
Fixes not-in-use engines not having their reset() method called on resume. Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/device: enable proper constructor/destructorBen Skeggs1-1/+16
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/device: have engine object initialised before creationBen Skeggs4-5/+12
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/device: convert to engine, rather than subdevBen Skeggs15-32/+32
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv50-/disp: use self as parent for subobjectsBen Skeggs2-2/+4
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv50-/fifo: use parent as self for subobjectsBen Skeggs4-25/+31
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv20-nv30/gr: use parent as self for subobjectsBen Skeggs6-6/+6
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nvc0-/gr: use self as parent for subobjectsBen Skeggs3-9/+13
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv04-nv40/instmem: use self as parent for subobjectsBen Skeggs2-8/+13
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv04-nv40/vm: use self as parent for subobjectsBen Skeggs3-3/+3
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv50-/bar: use self as parent for subobjectsBen Skeggs2-15/+21
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv04-nv40/instmem: remove parent deref hackBen Skeggs3-12/+0
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/i2c: remove parent deref hackBen Skeggs1-5/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/core: rebase object ref/use counts after ctor/init/fini eventsBen Skeggs1-6/+13
This is intended to support named (with a handle, etc) objects having children that don't have an outside reference. This will replace the various hacks around the place where subdev objects have children, and have to manually drop the self-refs so that they can be destroyed etc when all the outside refs have gone. Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv50/disp: inform core when we're not creating a new contextBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/therm: send some messages to debug levelBen Skeggs2-14/+14
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nve0/gr: add handling for a bunch of PGRAPH trapsChristoph Bumiller1-0/+222
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/mc: handle irq-related setup ourselvesBen Skeggs12-127/+75
We need to be able to process interrupts before the DRM code is able to actually enable them, set it up ourselves. Also, it's less convoluted to *not* use the DRM wrappers it appears... Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nv04/disp: hide all the cruft away in its own little holeBen Skeggs24-28/+33
It'd be pretty awesome if someone would care enough to port this all properly to a class interface, perhaps submitting a command stream to the core via a sw object on PFIFO (emulating how EVO works basically, and also what nvidia have done forever..).. But, this seems unlikely given how old this hardware is now, so, lets just hide it away. There's a heap of other bits and pieces laying around that are still tangled. I'll (re)move them in pieces. Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/bios: add missing newline on IO*_OR opcode debuggingBen Skeggs1-2/+2
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/bios: suppress some parser errors when dry-running scriptsBen Skeggs1-19/+33
Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nve0: magic up some support for GF117Ben Skeggs6-25/+63
Seen in the wild, don't have the hardware but this hacks things up to treat it the same as GF119 for now. Should be relatively safe, I'd be very surprised if anything major changed outside of PGRAPH. PGRAPH (3D etc) is disabled by default however until it's confirmed working. Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nvc0-/ltcg: Fix build on 32-bit platforms (v2)Roy Spliet1-1/+1
v2: read, don't assume.. *puts on brown paper bag* Signed-off-by: Roy Spliet <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-04-26drm/nouveau/drm: adding support for backlight control of GT525M (NVC0)Florian Scholz1-0/+3
This patch adds support for the backlight control of the NVIDIA GT 525M, which identifies itself as a member of the NVC0 family. v2. Extended to handle Kepler too Signed-off-by: Ben Skeggs <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.