31 Jul, 2012
1 commit
-
Pull Exynos DRM changes from Dave Airlie:
"So I totally missed Inki's pull request for -next, its fully exynos
self contained."(I took just the actual commits, not Dave's two extraneous merges)
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (30 commits)
drm/exynos: fixed exception to page allocation failure
drm/exynos: use __free_page() to deallocate memory
drm/exynos: fixed a comment to gem size.
drm/exynos: removed unnecessary variable
drm/exynos: do not release memory region from exporter.
drm/exynos: set buffer type from exporter.
drm/exynos: use alloc_page() to allocate pages.
drm/exynos: fixed build warning.
drm/exynos: fixed edid data setting at vidi connection request
drm/exynos: check if raw edid data is fake or not for test
drm/exynos: set edid fake data only for test.
drm/exynos: removed unnecessary declaration.
drm/exynos: fix buffer pitch calculation
drm/exynos: check for null in return value of dma_buf_map_attachment()
drm/exynos: return NULL if exynos_pages_to_sg fails
drm/exynos: Use devm_* functions in exynos_mixer.c
drm/exynos: Use devm_* functions in exynos_hdmi.c
drm/exynos: Use devm_* functions in exynos_drm_fimd.c
drm/exynos: Add missing static storage class specifier
drm/exynos: add property for crtc mode
...
27 Jul, 2012
31 commits
-
this patch corrects to deallocate the pages allocated already
at alloc_page failure.Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
this patch uses __free_page() to deallocate the pages allocated
by alloc_page() and the pages doesn't need set_parge_dirty()
and mark_page_accessed() because they aren't from page cache so
removes them.this patch has a pair with previous patch below,
http://www.spinics.net/lists/dri-devel/msg24382.htmlChangelog v2:
remove unnecessary arguments.Changelog v3:
fix npages type.
- npages can have negative value.Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
the region should be released by exporter once dmabuf's refcount becomes 0.
Signed-off-by: Inki Dae
Signed-off-by: Seung-Woo Kim
Signed-off-by: Kyungmin Park -
when fd is imported to gem, whether the memory type from exporter
is contigous or not should be set to gem flag so that drm-based
driver can aware of the memory type.Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
shmem_read_mapping_page_gfp() first tries to allocate pages from page cache
so if pages are allocated from page cache then these pages could have
valid cache line. after that cpu may read garbage data from cache
once gpu operation is completed with allocated pages. so with this patch,
Non-contiguous memory allocation request allocates pages from highmem
through alloc_page() with GFP_HIGHUSER_MOVABLE.Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
edid data from user should be allocated and copied into vidi context and also
freed with disconnection.Signed-off-by: Inki Dae
Signed-off-by: Seung-Woo Kim
Signed-off-by: Kyungmin Park -
if raw edid data isn't same as fake data then it can't be tested.
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Signed-off-by: Cooper Yuan
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
dma_buf_map_attachment() can return NULL and valid sg as return
value. Hence the check for the returned scatter-gather must be using
the inline function IS_ERR_OR_NULL() in place of IS_ERR()Signed-off-by: Subash Patel
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
exynos_pages_to_sg() internally calls sg_kmalloc() which can return
no pages when the system is under high memory crunch. One such instance
is chromeos-install in the chromeos. This patch adds check for the return
value of the function in subject to return NULL on failure.Signed-off-by: Subash Patel
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
devm_* functions are device managed functions and make error handling
and cleanup cleaner and simpler.Signed-off-by: Sachin Kamat
Signed-off-by: Sachin Kamat
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
devm_* functions are device managed functions and make error handling
and cleanup cleaner and simpler.Signed-off-by: Sachin Kamat
Signed-off-by: Sachin Kamat
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
devm_* functions are device managed functions and make error handling
and cleanup cleaner and simpler.Signed-off-by: Sachin Kamat
Signed-off-by: Sachin Kamat
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
Fixes the following sparse warning:
drivers/gpu/drm/exynos/exynos_drm_connector.c:199:20:
warning: symbol 'exynos_drm_best_encoder' was not declared. Should it be static?Signed-off-by: Sachin Kamat
Signed-off-by: Inki Dae
Signed-off-by: Kyungmin Park -
This patch adds exynos specific property for crtc mode. The crtc mode
property has tow modes - normal and blank. The normal mode is default
mode and can use crtc normally. The blank mode turns off the private
plane of crtc, so we don't see crtc screen but can see other plane
screens.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
The crtc disable is used to turn off private plane for crtc.
Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
The plane enable/disable can control only a power of plane, so they will
be helpful to handle planes with dpms.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
The connector dpms should be controlled only by DPMS property and mode
set.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
When we do mode set, the dpms mode should be ON. Don't control dpms in
crtc commit function.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
The exynos drm driver used a specific ioctl - DRM_EXYNOS_PLANE_SET_ZPOS
to set zpos of plane. It can be substitute to property of plane. This
patch adds a property for plane zpos and removes
DRM_EXYNOS_PLANE_SET_ZPOS ioctl.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
There is no any reason to update overlay at crtc directly because the
crtc uses plane. Move its code to plane and call proper functions of
plane from crtc.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
The crtc can use private plane instead it has overlay struct. It will be
helpful use plane feature from crtc later.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
Add macro to get struct exynos_plane from struct drm_plane pointer.
Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
It is enough to set pipe of crtc to manager only when do mode_set of
crtc.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
Call overlay->mode_set from crtc->mode_set instead of encoder->mode_set,
it makes codes clearly.Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Signed-off-by: Inki Dae -
Pull drm updates from Dave Airlie:
"One of the smaller drm -next pulls in ages!Ben (nouveau) has a rewrite in progress but we decided to leave it
stew for another cycle, so just some fixes from him.- radeon: lots of documentation work, fixes, more ring and locking
changes, pcie gen2, more dp fixes.
- i915: haswell features, gpu reset fixes, /dev/agpgart removal on
machines that we never used it on, more VGA/HDP fix., more DP fixes
- drm core: cleanups from Daniel, sis 64-bit fixes, range allocator
colouring.but yeah fairly quiet merge this time, probably because I missed half
of it!"Trivial add-add conflict in include/linux/pci_regs.h
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (255 commits)
drm/nouveau: init vblank requests list
drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
drm/nouveau: move current gpuobj code out of nouveau_object.c
drm/nouveau/gem: fix object reference leak in a failure path
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
drm/nv84: decode PCRYPT errors
drm/nouveau: dcb table quirk for fdo#50830
nouveau: Fix alignment requirements on src and dst addresses
drm/i915: unbreak lastclose for failed driver init
drm/i915: Set the context before setting up regs for the context.
drm/i915: constify mode in crtc_mode_fixup
drm/i915/lvds: ditch ->prepare special case
drm/i915: dereferencing an error pointer
drm/i915: fix invalid reference handling of the default ctx obj
drm/i915: Add -EIO to the list of known errors for __wait_seqno
drm/i915: Flush the context object from the CPU caches upon switching
drm/radeon: fix dpms on/off on trinity/aruba v2
drm/radeon: on hotplug force link training to happen (v2)
drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)
...
26 Jul, 2012
8 commits
-
Daniel writes: (this pull is the one with the bad patch dropped)
First pile of fixes for 3.6 already, and I'm afraid it's a bit larger than
what I'd wish for. But I've moved all the feature-y stuff to -next, so
this really is all -fixes. Most of it is handling fallout from the hw
context stuff, discovered now that mesa git has started using them for
real. Otherwise all just small fixes:
- unbreak modeset=0 on gen6+ (regressed in next)
- const mismatch fix for ->mode_fixup
- simplify overly clever lvds modeset code (current code can totally
confuse backlights, resulting in broken panels until a full power draw
restores them).
- fix some fallout from the flushing_list disabling (regression only
introduced in -next)
- DP link train improvements (this also kills the last 3.2 dp regression
afaik)
- bugfix for the new ddc VGA detection on newer platforms
- minor backlight fixes (one of them a -next regression)
- only enable the required PM interrupts (to avoid waking up the cpu
unnecessarily)
- some really minor bits (workaround clarification, make coverty happy,
hsw init fix)
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (23 commits)
drm/i915: unbreak lastclose for failed driver init
drm/i915: Set the context before setting up regs for the context.
drm/i915: constify mode in crtc_mode_fixup
drm/i915/lvds: ditch ->prepare special case
drm/i915: dereferencing an error pointer
drm/i915: fix invalid reference handling of the default ctx obj
drm/i915: Add -EIO to the list of known errors for __wait_seqno
drm/i915: Flush the context object from the CPU caches upon switching
drm/i915: Make the lock for pageflips interruptible
drm/i915: don't forget the PCH backlight registers
drm/i915: Insert a flush between batches if the breadcrumb was dropped
drm/i915: missing error case in init status page
drm/i915: mask tiled bit when updating ILK sprites
drm/i915: try to train DP even harder
drm/i915: kill intel_ddc_probe
drm/i915: check whether we actually received an edid in detect_ddc
drm/i915: fix up PCH backlight #define mixup
drm/i915: Add comments to explain the BSD tail write workaround
drm/i915: Disable the BLT on pre-production SNB hardware
drm/i915: initialize power wells in modeset_init_hw
... -
…nux-2.6 into drm-next
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: init vblank requests list
drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
drm/nouveau: move current gpuobj code out of nouveau_object.c
drm/nouveau/gem: fix object reference leak in a failure path
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
drm/nv84: decode PCRYPT errors
drm/nouveau: dcb table quirk for fdo#50830
nouveau: Fix alignment requirements on src and dst addresses -
Fixes kernel panic when vblank interrupt triggers before first sync to
vblank request.(Besides init, remove some relevant leftovers from vblank rework)
Reported-by: Ortwin Glück
Signed-off-by: Marcin Slusarz
Cc: stable@vger.kernel.org [3.5]
Signed-off-by: Ben Skeggs -
Signed-off-by: Ben Skeggs
-
These will be replaced in the near future, the code isn't yet stable enough
for this merge window however.Signed-off-by: Ben Skeggs
-
I want this file for the new interfaces...
Signed-off-by: Ben Skeggs
-
Reported-by: Maarten Lankhorst
Signed-off-by: Ben Skeggs
Signed-off-by: Maarten Lankhorst -
Current name is misleading, because this error can be triggered by other
conditions, like changing STRMOUT parameter without disabling STRMOUT first.Signed-off-by: Marcin Slusarz
Signed-off-by: Ben Skeggs
