Mauro (mdrjr) Ribeiro
90a697c7db
Merge tag 'v4.9.180' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.180 stable release
2020-04-07 15:18:33 -03:00
Mauro (mdrjr) Ribeiro
cf3b5c0a88
Merge tag 'v4.9.177' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.177 stable release
2020-04-07 15:14:07 -03:00
Mauro (mdrjr) Ribeiro
d1b261b0e1
Merge tag 'v4.9.175' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.175 stable release
2020-04-07 15:09:06 -03:00
Mauro (mdrjr) Ribeiro
bf2f047532
Merge tag 'v4.9.172' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.172 stable release
2020-04-07 15:05:26 -03:00
Mauro (mdrjr) Ribeiro
572be8936c
Merge tag 'v4.9.168' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.168 stable release
2020-04-07 14:57:08 -03:00
Mauro (mdrjr) Ribeiro
512eae8f62
Merge tag 'v4.9.166' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.166 stable release
2020-04-07 14:56:56 -03:00
Mauro (mdrjr) Ribeiro
fae8d03d01
Merge tag 'v4.9.165' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.165 stable release
2020-04-07 14:56:52 -03:00
Mauro (mdrjr) Ribeiro
e62b889e63
Merge tag 'v4.9.163' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.163 stable release
2020-04-07 14:56:15 -03:00
Mauro (mdrjr) Ribeiro
5be05e092c
Merge tag 'v4.9.162' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.162 stable release
2020-04-07 14:56:11 -03:00
Mauro (mdrjr) Ribeiro
a210829d46
Merge tag 'v4.9.161' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.161 stable release
2020-04-07 14:55:59 -03:00
Mauro (mdrjr) Ribeiro
be8dfa4717
Merge tag 'v4.9.159' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.159 stable release
2020-04-07 14:47:05 -03:00
Mauro (mdrjr) Ribeiro
df02b06c45
Merge tag 'v4.9.157' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.157 stable release
2020-04-07 14:46:56 -03:00
Mauro (mdrjr) Ribeiro
1c35b80986
Merge tag 'v4.9.156' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.156 stable release
2020-04-07 14:46:51 -03:00
Mauro (mdrjr) Ribeiro
027a9d7211
Merge tag 'v4.9.152' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.152 stable release
2020-04-07 14:46:28 -03:00
Mauro (mdrjr) Ribeiro
d517c9d0f4
Merge tag 'v4.9.150' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.150 stable release
2020-04-07 14:43:00 -03:00
Mauro (mdrjr) Ribeiro
f95d762cbe
Merge tag 'v4.9.148' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.148 stable release
2020-04-07 14:42:47 -03:00
Mauro (mdrjr) Ribeiro
9972746c92
Merge tag 'v4.9.147' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.147 stable release
2020-04-07 14:40:34 -03:00
Mauro (mdrjr) Ribeiro
05afab09b5
Merge tag 'v4.9.146' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.146 stable release
2020-04-07 14:40:29 -03:00
Mauro (mdrjr) Ribeiro
60bf0e0c88
Merge tag 'v4.9.144' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.144 stable release
2020-04-07 14:38:25 -03:00
Mauro (mdrjr) Ribeiro
0f8e3e6e58
Merge tag 'v4.9.142' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.142 stable release
2020-04-07 13:55:22 -03:00
Mauro (mdrjr) Ribeiro
0eca5a3f15
Merge tag 'v4.9.141' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.141 stable release
2020-04-07 13:52:14 -03:00
Mauro (mdrjr) Ribeiro
6191fe3e16
Merge tag 'v4.9.138' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.138 stable release
2020-04-07 13:40:31 -03:00
Mauro (mdrjr) Ribeiro
846bf292bf
Merge tag 'v4.9.136' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.136 stable release
2020-04-07 13:40:17 -03:00
Mauro (mdrjr) Ribeiro
d58d3f14f0
Merge tag 'v4.9.135' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.135 stable release
2020-04-07 13:40:04 -03:00
Mauro (mdrjr) Ribeiro
89fbbd2ef0
Merge tag 'v4.9.134' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.134 stable release
2020-04-07 13:34:58 -03:00
Mauro (mdrjr) Ribeiro
bb28e4bf23
Merge tag 'v4.9.132' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.132 stable release
2020-04-07 13:29:55 -03:00
Mauro (mdrjr) Ribeiro
e70755fb49
Merge tag 'v4.9.131' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.131 stable release
2020-04-07 13:29:46 -03:00
Mauro (mdrjr) Ribeiro
5da875f73c
Merge tag 'v4.9.130' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.130 stable release
2020-04-07 13:26:22 -03:00
Mauro (mdrjr) Ribeiro
e75ef2c8ca
Merge tag 'v4.9.129' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.129 stable release
2020-04-07 13:26:16 -03:00
Mauro (mdrjr) Ribeiro
a4e561af29
Merge tag 'v4.9.127' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.127 stable release
2020-04-07 13:21:25 -03:00
Mauro (mdrjr) Ribeiro
22a70830a5
Merge tag 'v4.9.126' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.126 stable release
2020-04-07 13:20:23 -03:00
Mauro (mdrjr) Ribeiro
bcd0914f11
Merge tag 'v4.9.125' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.125 stable release
2020-04-07 13:20:06 -03:00
Mauro (mdrjr) Ribeiro
7e341d6e4a
Merge tag 'v4.9.124' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.124 stable release
2020-04-07 11:15:39 -03:00
Mauro (mdrjr) Ribeiro
9af539029b
Merge tag 'v4.9.118' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.118 stable release
2020-04-07 10:31:24 -03:00
Mauro (mdrjr) Ribeiro
8cc5b2adad
Merge tag 'v4.9.117' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.117 stable release
2020-04-06 22:43:27 -03:00
Mauro (mdrjr) Ribeiro
e5a0a1f8cd
Merge tag 'v4.9.115' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
...
This is the 4.9.115 stable release
2020-04-06 22:31:40 -03:00
Dongjin Kim
6d2dea5f37
ODROID-N2: drm: add DRM featured kernel configuration
...
Change-Id: Ic2741f017a509543ba6f0e98e8f4bb18b28975d7
Signed-off-by: Dongjin Kim <tobetter@gmail.com >
2020-03-13 18:08:44 +09:00
Dongjin Kim
4d6388e99d
ODORID-N2: gpu/drm: add ARM Mali Bifrost r16p0 kernel driver
...
Change-Id: Id32615f989570499c970d98713f8066504a348ec
Signed-off-by: Dongjin Kim <tobetter@gmail.com >
2020-03-13 18:08:44 +09:00
Mauro (mdrjr) Ribeiro
d85899658b
ODROID-N2: gpu/arm: MALI: don't use trace_printk
...
Change-Id: I802c61c126484c07ac2a28356bdd4c96f35bbe98
Singed-off-by: Mauro (mdrjr) Ribeiro <mauro.ribeiro@hardkernel.com >
2020-03-13 18:08:44 +09:00
Mauro (mdrjr) Ribeiro
3aa94c86bf
ODROID-COMMON: lock gpu frequency to its maximum
...
Change-Id: Ic967f79a1bff001336a5e41a2bc644d5108ecb6a
2020-03-13 18:08:44 +09:00
Mauro (mdrjr) Ribeiro
ba1f45e2a4
ODROID-N2: slipstream Mali Dvalin Kernel Driver
2020-03-13 18:08:44 +09:00
Maarten Lankhorst
40327f9cf0
drm/vblank: Pass crtc_id to page_flip_ioctl.
...
PD#SWPL-4863
We added crtc_id to the atomic ioctl, but forgot to add it for vblank
and page flip events. Commit bd386e5180 ("drm: Reorganize
drm_pending_event to support future event types [v2]") added it to
the vblank event, but page flip event was still missing.
Correct this and add a test for making sure we always set crtc_id correctly.
Change-Id: Idd1070005d88529500a8be868f714c8bb345ddee
Fixes: bd386e5180 ("drm: Reorganize drm_pending_event to support future event types [v2]")
Fixes: 5db06a8a98 ("drm: Pass CRTC ID in userspace vblank events")
Cc: Daniel Stone <daniels@collabora.com >
Cc: Daniel Vetter <daniel.vetter@intel.com >
Cc: Gustavo Padovan <gustavo@padovan.org >
Cc: Sean Paul <seanpaul@chromium.org >
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org > # v4.12+
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch > #irc
Testcase: igt/kms_vblank/crtc_id
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20171123103737.47138-1-maarten.lankhorst@linux.intel.com
Signed-off-by: Ao Xu <ao.xu@amlogic.com >
2019-07-30 14:58:34 +08:00
Keith Packard
9c779fb7d5
drm: Reorganize drm_pending_event to support future event types [v2]
...
PD#SWPL-4863
Place drm_event_vblank in a new union that includes that and a bare
drm_event structure. This will allow new members of that union to be
added in the future without changing code related to the existing vbl
event type.
Assignments to the crtc_id field are now done when the event is
allocated, rather than when delievered. This way, delivery doesn't
need to have the crtc ID available.
v2:
* Remove 'dev' argument from create_vblank_event
It wasn't being used anyways, and if we need it in the future,
we can always get it from crtc->dev.
* Check for MODESETTING before looking for crtc in queue_vblank_event
UMS drivers will oops if we try to get a crtc, so make sure
we're modesetting before we try to find a crtc_id to fill into
the event.
(cherry picked from commit dc695b85fde88eca3ef3b03fcd82f15b6bc6e462)
Change-Id: I6f0feabcba9373fcc434b148752d9cd28bea67e6
Signed-off-by: Keith Packard <keithp@keithp.com >
Reviewed-by: Sean Paul <seanpaul@chromium.org >
Signed-off-by: Dave Airlie <airlied@redhat.com >
Signed-off-by: Ao Xu <ao.xu@amlogic.com >
2019-07-29 18:52:54 -07:00
Ao Xu
37c98ae778
drm: Pass CRTC ID in userspace vblank events
...
PD#SWPL-4863
With the atomic API, it is possible that a single commit affects
multiple crtcs. If the user requests an event with that commit, one
event will be sent for each CRTC, but it is not possible to distinguish
which crtc an event is for in user space. To solve this, the reserved
field in struct drm_vblank_event is repurposed to include the crtc_id
which the event is for.
The DRM_CAP_CRTC_IN_VBLANK_EVENT is added to allow userspace to query if
the crtc field will be set properly.
[daniels: Rebased, using Maarten's forward-port.]
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com >
Signed-off-by: Daniel Stone <daniels@collabora.com >
Cc: Maarten Lankhorst <maarten.lankhorst@intel.com >
Link: http://patchwork.freedesktop.org/patch/msgid/20170404165221.28240-2-daniels@collabora.com
Change-Id: Ide7657bdc38563d2de91edc2d649b53262002c39
Signed-off-by: Ao Xu <ao.xu@amlogic.com >
2019-07-29 03:46:57 -07:00
Ville Syrjälä
c7245fe462
drm/atomic: Make private objs proper objects
...
Make the atomic private object stuff less special by introducing proper
base classes for the object and its state. Drivers can embed these in
their own appropriate objects, after which these things will work
exactly like the plane/crtc/connector states during atomic operations.
v2: Reorder to not depend on drm_dynarray (Daniel)
Change-Id: I475f3c46440934b8d6f461935b6413624b7d34c7
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com >
Cc: Daniel Vetter <daniel.vetter@ffwll.ch >
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch > #v1
Signed-off-by: Ville Syrj?l? <ville.syrjala@linux.intel.com >
Link: http://patchwork.freedesktop.org/patch/msgid/20170712155102.26276-3-ville.syrjala@linux.intel.com
Signed-off-by: Ao Xu <ao.xu@amlogic.com >
2019-07-09 19:27:50 +08:00
Pandiyan, Dhinakaran
90f028c3da
drm: Add driver-private objects to atomic state
...
It is necessary to track states for objects other than connector, crtc
and plane for atomic modesets. But adding objects like DP MST link
bandwidth to drm_atomic_state would mean that a non-core object will be
modified by the core helper functions for swapping and clearing
it's state. So, lets add void * objects and helper functions that operate
on void * types to keep these objects and states private to the core.
Drivers can then implement specific functions to swap and clear states.
The other advantage having just void * for these objects in
drm_atomic_state is that objects of different types can be managed in the
same state array.
v7: Use __for_each_private_obj to define for_each_private_obj (Maarten)
v6: More kernel-doc to keep 0-day happy
v5: Remove more NULL checks (Maarten)
v4: Avoid redundant NULL checks when private_objs array is empty (Maarten)
v3: Macro alignment (Chris)
v2: Added docs and new iterator to filter private objects (Daniel)
Cc: Daniel Vetter <daniel.vetter@ffwll.ch >
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com >
Cc: Archit Taneja <architt@codeaurora.org >
Cc: Chris Wilson <chris@chris-wilson.co.uk >
Cc: Harry Wentland <Harry.wentland@amd.com >
Change-Id: I1d906ca120167b8b25a5e959b332c5bea55a97b7
Acked-by: Harry Wentland <harry.wentland@amd.com >
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch >
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com >
Reviewed-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com >
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com >
Link: http://patchwork.freedesktop.org/patch/msgid/1492753893-3748-2-git-send-email-dhinakaran.pandiyan@intel.com
Signed-off-by: Ao Xu <ao.xu@amlogic.com >
2019-07-09 19:27:36 +08:00
Chris Wilson
e658aba58f
drm: Wake up next in drm_read() chain if we are forced to putback the event
...
[ Upstream commit 60b801999c ]
After an event is sent, we try to copy it into the user buffer of the
first waiter in drm_read() and if the user buffer doesn't have enough
room we put it back onto the list. However, we didn't wake up any
subsequent waiter, so that event may sit on the list until either a new
vblank event is sent or a new waiter appears. Rare, but in the worst
case may lead to a stuck process.
Testcase: igt/drm_read/short-buffer-wakeup
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk >
Cc: Daniel Vetter <daniel.vetter@ffwll.ch >
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20170804082328.17173-1-chris@chris-wilson.co.uk
Signed-off-by: Sasha Levin <sashal@kernel.org >
2019-05-31 06:48:31 -07:00
Lucas Stach
952ef05cf6
gpu: ipu-v3: dp: fix CSC handling
...
[ Upstream commit d4fad0a426 ]
Initialize the flow input colorspaces to unknown and reset to that value
when the channel gets disabled. This avoids the state getting mixed up
with a previous mode.
Also keep the CSC settings for the background flow intact when disabling
the foreground flow.
Root-caused-by: Jonathan Marek <jonathan@marek.ca >
Signed-off-by: Lucas Stach <l.stach@pengutronix.de >
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de >
Signed-off-by: Sasha Levin <sashal@kernel.org >
2019-05-16 19:43:43 +02:00
Paul Kocialkowski
cd7e3fd25e
drm/sun4i: Set device driver data at bind time for use in unbind
...
[ Upstream commit 02b92adbe3 ]
Our sun4i_drv_unbind gets the drm device using dev_get_drvdata.
However, that driver data is never set in sun4i_drv_bind.
Set it there to avoid getting a NULL pointer at unbind time.
Fixes: 9026e0d122 ("drm: Add Allwinner A10 Display Engine support")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com >
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20190418132727.5128-3-paul.kocialkowski@bootlin.com
Signed-off-by: Sasha Levin <sashal@kernel.org >
2019-05-16 19:43:43 +02:00
Wen Yang
684a9e97ba
drm/mediatek: fix possible object reference leak
...
[ Upstream commit 2ae2c3316f ]
The call to of_parse_phandle returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/mediatek/mtk_hdmi.c:1521:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function.
drivers/gpu/drm/mediatek/mtk_hdmi.c:1524:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1509, but without a corresponding object release within this function.
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn >
Cc: CK Hu <ck.hu@mediatek.com >
Cc: Philipp Zabel <p.zabel@pengutronix.de >
Cc: David Airlie <airlied@linux.ie >
Cc: Daniel Vetter <daniel@ffwll.ch >
Cc: Matthias Brugger <matthias.bgg@gmail.com >
Cc: dri-devel@lists.freedesktop.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: CK Hu <ck.hu@mediatek.com >
Signed-off-by: Sasha Levin <sashal@kernel.org >
2019-05-10 17:52:09 +02:00