aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-01drm/nvc3/gr: update initial register/context valuesBen Skeggs6-12/+112
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvc0/gr: update initial register/context valuesBen Skeggs6-544/+1042
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvd9/gr: update initial register/context valuesBen Skeggs6-74/+482
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve4/gr: update initial register/context valuesBen Skeggs4-157/+31
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvc0-/gr: bump maximum gpc/tpc limitsBen Skeggs1-2/+4
Needed for GK110, separate commit to catch any unexpected breaks to other parts of the code. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvf0/gr: initial register/context setupBen Skeggs6-482/+1057
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve7/gr: update initial register/context valuesBen Skeggs4-3/+12
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve6/gr: update initial register/context valuesBen Skeggs4-113/+383
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau: delay busy bo vma removal until fence signalsBen Skeggs4-15/+108
As opposed to an explicit wait. Allows userspace to not stall waiting on buffer deletion. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/vm: make each vma take a reference on its parent vmBen Skeggs1-1/+4
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/core: remove nouveau_mm.mutex, no more usersBen Skeggs3-5/+2
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/vm: take subdev mutex, not the mm, protects against race with ↵Ben Skeggs1-16/+17
vm/nvc0 nvc0_vm_flush() accesses the pgd list, which will soon be able to race with vm_unlink() during channel destruction. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvc0/vm: handle bar tlb flushes internallyBen Skeggs3-34/+28
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nv50-/vm: take mutex rather than irqsave spinlockBen Skeggs2-10/+4
These operations can take quite some time, and we really don't want to have to hold a spinlock for too long. Now that the lock ordering for vm and the gr/nv84 hw bug workaround has been reversed, it's possible to use a mutex here. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nv50/vm: remove explicit vm knowledge from enginesBen Skeggs9-66/+31
This reverses the lock ordering between VM and gr/nv84:nvc0. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nv50/vm: handle bar tlb flushes internallyBen Skeggs3-5/+13
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nvc0/gr: port mp trap handling from calim's kepler codeBen Skeggs1-6/+38
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/gr: attempt to resume after sm trapsBen Skeggs1-16/+6
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/gr: s/tp/tpc/Ben Skeggs1-26/+27
NVIDIA's name... Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/fifo: create our playlists up-front, at startupBen Skeggs1-14/+14
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nva3/clk: minor improvements to fractional N calculationBen Skeggs1-3/+11
Helps us to get identical numbers to the binary driver for (at least) Kepler memory PLLs, and fixes a rounding error. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/fb: initialise vram controller as pfb sub-objectBen Skeggs45-733/+1313
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/clk: change init ordering, no longer needed by devinitBen Skeggs1-2/+2
And, will depend on FB/VOLT/DAEMON being ready when it gets initialised so that it can set/restore clocks. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau/devinit: move simple pll setting routines to devinitBen Skeggs24-487/+628
These are pretty much useless for reclocking purposes. Lets make it clearer what they're for and move them to DEVINIT to signify they're for the very simple PLL setting requirements of running the init tables. Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau: pass generic subdev to calculation routinesBen Skeggs7-18/+17
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/ce: stub interrupt handlerBen Skeggs2-0/+17
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/ce: link ce2 to its engine, rather than from graphicsBen Skeggs2-2/+2
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/fifo: copy engine context stored in ramfc, not externallyBen Skeggs1-8/+14
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nve0/ce: create engine object for ce2Ben Skeggs4-0/+36
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01drm/nouveau: pull in latest ucode builds from external treeBen Skeggs5-48/+51
Signed-off-by: Ben Skeggs <[email protected]>
2013-07-01Merge branch 'exynos-drm-next' of ↵Dave Airlie32-838/+450
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next Feature summary: Add S3C64XX SoC series support - S3C64XX SoC series are previous version chips of Exynos SoC series. With this patch set, KMS driver of Exynos drm supports those chips also. Update device tree support - This patch set corrects compatible strings, and adds Exynos5420 SoC support for hdmi subsystem. Consider CCF (Common Clock Framework) support - With reference to CCF support, it uses clock_prepare_enable/clock_disable_unprepare instead of clk_enable/clk_disable for hdmi subsystem. Big cleanups - This patch just removes unnecessary all debug logs. * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (22 commits) ARM: dts: change compatible strings for EXYNOS5250 hdmi subsystem drm/exynos: add support for exynos5420 mixer drm/exynos: add new compatible strings for hdmi subsystem drm/exynos: fix interlace resolutions for exynos5420 drm/exynos: use of_get_named_gpio to get hdmi hpd gpio drm/exynos: make sure to handle an error case to vm_mmap call drm/exynos: exynos_drm_ipp: Remove redundant break statement drm/exynos: add mout_hdmi clock in hdmi driver to change parent drm/exynos: Prepare/Unprepare HDMI subsystem clocks drm/exynos: Clean up logs for DRM_ERROR / DRM_DEBUG_KMS drm/exynos: Remove tracking log functions drm/exynos: hdmi: use drm_display_mode to check the supported modes drm/exynos: fimd: Add support for S3C64xx SoCs drm/exynos: fimd: Add support for FIMD variants with clock selection drm/exynos: fimd: Add support for FIMD versions without SHADOWCON register drm/exynos: fimd: Hold pointer to driver data in context struct drm/exynos: do not use mode_set_base function directly drm/exynos: Remove redundant use of of_match_ptr macro drm/exynos: remove ignoring return value warning in hdmi drm/exynos: fix WINDOWS_NR checking to vidi driver ...
2013-06-28ARM: dts: change compatible strings for EXYNOS5250 hdmi subsystemRahul Sharma3-6/+6
This patch renames the combatible strings for hdmi, mixer, ddc and hdmiphy. It follows the convention of using compatible string which represent the SoC in which the IP was added for the first time. Signed-off-by: Rahul Sharma <[email protected]> Acked-by: Kukjin Kim <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: add support for exynos5420 mixerRahul Sharma3-12/+45
Add support for exynos5420 mixer IP in the drm mixer driver. Signed-off-by: Rahul Sharma <[email protected]> Acked-by: Seung-Woo Kim <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: add new compatible strings for hdmi subsystemRahul Sharma8-13/+38
This patch adds new combatible strings for hdmi, mixer, ddc and hdmiphy. It follows the convention of using compatible string which represent the SoC in which the IP was added for the first time. Drivers continue to support the previous compatible strings but further addition of these compatible strings in device tree is deprecated. Signed-off-by: Rahul Sharma <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: fix interlace resolutions for exynos5420Rahul Sharma1-6/+8
Modified code for calculating hdmi IP register values from drm timing values. The modification is based on the inputs from hw team and specifically proposed for 1440x576i and 1440x480i. But same changes holds good for other interlaced resolutions also. Signed-off-by: Rahul Sharma <[email protected]> Acked-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: use of_get_named_gpio to get hdmi hpd gpioRahul Sharma1-2/+1
Cleanup by removing flags variable from drm_hdmi_dt_parse_pdata which is not used anywhere. Swtiching to of_get_named_gpio instead of of_get_named_gpio_flags solved this. Signed-off-by: Rahul Sharma <[email protected]> Acked-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: make sure to handle an error case to vm_mmap callInki Dae1-3/+3
vm_mmap function returns unsigned long so addr type should be unsigned long. a pointer or address variable is required to use unsigned long or uint64_t type for 64bits address support. So this patch makes sure that addr has unsigned long type and also exynos_drm_gem_mmap_ioctl returns correct error type. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2013-06-28drm/exynos: exynos_drm_ipp: Remove redundant break statementSachin Kamat1-1/+0
'break' after goto statement is redundant. Silences the following message: drivers/gpu/drm/exynos/exynos_drm_ipp.c:1067 exynos_drm_ipp_check_valid() info: ignoring unreachable code. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: add mout_hdmi clock in hdmi driver to change parentRahul Sharma1-4/+10
HDMI driver needs to configure the mout_hdmi mux clock to change the parent between sclk_hdmiphy and sclk_pixel. Signed-off-by: Rahul Sharma <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: Prepare/Unprepare HDMI subsystem clocksSean Paul2-18/+18
Change the clk_enable/clk_disable calls in mixer and hdmi drivers into clk_prepare_enable/clk_disable_unprepare, respectively. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Rahul Sharma <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: Clean up logs for DRM_ERROR / DRM_DEBUG_KMSYoungJun Cho6-224/+187
This patch cleans up logs for DRM_ERROR / DRM_DEBUG_KMS to avoid logging duplicated function name because the macros already contain __func__. Signed-off-by: YoungJun Cho <[email protected]> Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: Remove tracking log functionsYoungJun Cho20-437/+4
This patch removes tracking log functions which were used to debug in the early development stage and are not so important as were. So remove them for code clean up. Signed-off-by: YoungJun Cho <[email protected]> Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: hdmi: use drm_display_mode to check the supported modesRahul Sharma8-76/+41
This patch renames check_timing to check_mode and removes the unnecessary conversion of drm_display_mode to/from fb_videomode in the hdmi driver. v4: 1) Changed the commit message to add information related to renaming the callbacks to check_mode. 2) Changed debug message to print 1/0 for interlace mode. v3: 1) Replaced check_timing callbacks with check_mode. 2) Change the type of second parameter of check_mode callback from void pointer paramenter to struct drm_display_mode pointer. v2: 1) Removed convert_to_video_timing(). 2) Corrected DRM_DEBUG_KMS to print the resolution properly. Signed-off-by: Rahul Sharma <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: fimd: Add support for S3C64xx SoCsTomasz Figa1-0/+10
The FIMD block present on S3C6400/S3C6410 SoCs is compatible with this driver, so it can be supported by it as well. This patch adds appropriate device IDs and driver data to enable this driver for S3C64xx SoCs. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Joonyoung Shim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: fimd: Add support for FIMD variants with clock selectionTomasz Figa1-0/+6
Some platforms that can be supported this driver has additional clock source selection bits in VIDCON0 register that allows to select which clock should be used to drive the pixel clock: bus clock or special clock. Since this driver assumes that special clock always drives the pixel clock, this patch sets the selection bitfield to use the special clock. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Joonyoung Shim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: fimd: Add support for FIMD versions without SHADOWCON registerTomasz Figa1-20/+49
Some platforms that can be supported with this driver have PRTCON register instead of SHADOWCON, which requires slightly different handling. This patch factors out all register shadow control code from the driver and adds a function to control register shadowing appropriately, depending on driver data. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Joonyoung Shim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: fimd: Hold pointer to driver data in context structTomasz Figa1-2/+3
This patch adds pointer to driver data to fimd_context structure, to remove the need to call drm_fimd_get_driver_data() each time access to driver data is necessary. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Joonyoung Shim <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: do not use mode_set_base function directlyInki Dae1-2/+8
This patch adds exynos_drm_crtc_mode_set_commit function to update mode data and it makes page flip call this function instead of calling exynos_drm_crtc_mode_set_base function directly. exynos_drm_crtc_mode_set_base function is called by drm subsystem as a callback so we don't have to call this function directly. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2013-06-28drm/exynos: Remove redundant use of of_match_ptr macroSachin Kamat1-2/+1
'mixer_match_types' is always compiled in. Hence of_match_ptr is not necessary. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2013-06-28drm/exynos: remove ignoring return value warning in hdmiSeung-Woo Kim1-1/+3
The definition of regulator_bulk_enable is fixed with __must_check and this causes following build warning. warning: ignoring return value of 'regulator_bulk_enable', declared with attribute warn_unused_result This patch fixes to check return value of the function. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]>