* [PATCH v5 0/5] Adding driver-private objects to atomic state
@ 2017-03-30 8:42 Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 1/5] drm: Add " Dhinakaran Pandiyan
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Dhinakaran Pandiyan,
Harry Wentland
Changes in this version:
Included the 5 left over patches. Patches 1 and 5 have changed, so
I have removed Maarten's R-B for patch 5.
1/5: Added NULL checks
5/5: Fixed vcpi slot accounting when atomic_release() is called multiple
times within an atomic_check()
This series introduces void * type driver-private objects in core and adds
helper functions that operate on these private objects. Drivers need to
implement object-specific functions to swap and clear object states. The
advantage of having void * for these objects in the core is objects of different
types can be managed in the same atomic state array. The series implements
DP-MST link bw tracking using the driver-private object infrastructure.
Pandiyan, Dhinakaran (5):
drm: Add driver-private objects to atomic state
drm/dp: Introduce MST topology state to track available link bandwidth
drm/dp: Add DP MST helpers to atomically find and release vcpi slots
drm: Connector helper function to release resources
drm/dp: Track MST link bandwidth
drivers/gpu/drm/drm_atomic.c | 65 ++++++++++++++
drivers/gpu/drm/drm_atomic_helper.c | 24 +++++
drivers/gpu/drm/drm_dp_mst_topology.c | 150 +++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_dp_mst.c | 48 ++++++++--
include/drm/drm_atomic.h | 92 +++++++++++++++++++
include/drm/drm_dp_mst_helper.h | 26 ++++++
include/drm/drm_modeset_helper_vtables.h | 16 ++++
7 files changed, 414 insertions(+), 7 deletions(-)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v5 1/5] drm: Add driver-private objects to atomic state
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
@ 2017-03-30 8:42 ` Dhinakaran Pandiyan
2017-04-01 5:46 ` kbuild test robot
2017-03-30 8:42 ` [PATCH v5 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
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.
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>
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>
---
drivers/gpu/drm/drm_atomic.c | 65 ++++++++++++++++++++++++++
drivers/gpu/drm/drm_atomic_helper.c | 5 ++
include/drm/drm_atomic.h | 92 +++++++++++++++++++++++++++++++++++++
3 files changed, 162 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 9b892af..4d37019 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -57,6 +57,7 @@ void drm_atomic_state_default_release(struct drm_atomic_state *state)
kfree(state->connectors);
kfree(state->crtcs);
kfree(state->planes);
+ kfree(state->private_objs);
}
EXPORT_SYMBOL(drm_atomic_state_default_release);
@@ -184,6 +185,17 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
state->planes[i].ptr = NULL;
state->planes[i].state = NULL;
}
+
+ for (i = 0; i < state->num_private_objs; i++) {
+ void *obj_state = state->private_objs[i].obj_state;
+
+ state->private_objs[i].funcs->destroy_state(obj_state);
+ state->private_objs[i].obj = NULL;
+ state->private_objs[i].obj_state = NULL;
+ state->private_objs[i].funcs = NULL;
+ }
+ state->num_private_objs = 0;
+
}
EXPORT_SYMBOL(drm_atomic_state_default_clear);
@@ -978,6 +990,59 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
}
/**
+ * drm_atomic_get_private_obj_state - get private object state
+ * @state: global atomic state
+ * @obj: private object to get the state for
+ * @funcs: pointer to the struct of function pointers that identify the object
+ * type
+ *
+ * This function returns the private object state for the given private object,
+ * allocating the state if needed. It does not grab any locks as the caller is
+ * expected to care of any required locking.
+ *
+ * RETURNS:
+ *
+ * Either the allocated state or the error code encoded into a pointer.
+ */
+void *
+drm_atomic_get_private_obj_state(struct drm_atomic_state *state, void *obj,
+ const struct drm_private_state_funcs *funcs)
+{
+ int index, num_objs, i;
+ size_t size;
+ struct __drm_private_objs_state *arr;
+
+ for (i = 0; i < state->num_private_objs; i++)
+ if (obj == state->private_objs[i].obj &&
+ state->private_objs[i].obj_state)
+ return state->private_objs[i].obj_state;
+
+ num_objs = state->num_private_objs + 1;
+ size = sizeof(*state->private_objs) * num_objs;
+ arr = krealloc(state->private_objs, size, GFP_KERNEL);
+ if (!arr)
+ return ERR_PTR(-ENOMEM);
+
+ state->private_objs = arr;
+ index = state->num_private_objs;
+ memset(&state->private_objs[index], 0, sizeof(*state->private_objs));
+
+ state->private_objs[index].obj_state = funcs->duplicate_state(state, obj);
+ if (!state->private_objs[index].obj_state)
+ return ERR_PTR(-ENOMEM);
+
+ state->private_objs[index].obj = obj;
+ state->private_objs[index].funcs = funcs;
+ state->num_private_objs = num_objs;
+
+ DRM_DEBUG_ATOMIC("Added new private object state %p to %p\n",
+ state->private_objs[index].obj_state, state);
+
+ return state->private_objs[index].obj_state;
+}
+EXPORT_SYMBOL(drm_atomic_get_private_obj_state);
+
+/**
* drm_atomic_get_connector_state - get connector state
* @state: global atomic state object
* @connector: connector to get state object for
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index c4538c5..d14094d 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2001,6 +2001,8 @@ void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
struct drm_plane *plane;
struct drm_plane_state *old_plane_state, *new_plane_state;
struct drm_crtc_commit *commit;
+ void *obj, *obj_state;
+ const struct drm_private_state_funcs *funcs;
if (stall) {
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
@@ -2061,6 +2063,9 @@ void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
state->planes[i].state = old_plane_state;
plane->state = new_plane_state;
}
+
+ __for_each_private_obj(state, obj, obj_state, i, funcs)
+ funcs->swap_state(obj, &state->private_objs[i].obj_state);
}
EXPORT_SYMBOL(drm_atomic_helper_swap_state);
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index fd33ed5..54a9207 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -155,6 +155,53 @@ struct __drm_connnectors_state {
};
/**
+ * struct drm_private_state_funcs - atomic state functions for private objects
+ *
+ * These hooks are used by atomic helpers to create, swap and destroy states of
+ * private objects. The structure itself is used as a vtable to identify the
+ * associated private object type. Each private object type that needs to be
+ * added to the atomic states is expected to have an implementation of these
+ * hooks and pass a pointer to it's drm_private_state_funcs struct to
+ * drm_atomic_get_private_obj_state().
+ */
+struct drm_private_state_funcs {
+ /**
+ * @duplicate_state:
+ *
+ * Duplicate the current state of the private object and return it. It
+ * is an error to call this before obj->state has been initialized.
+ *
+ * RETURNS:
+ *
+ * Duplicated atomic state or NULL when obj->state is not
+ * initialized or allocation failed.
+ */
+ void *(*duplicate_state)(struct drm_atomic_state *state, void *obj);
+
+ /**
+ * @swap_state:
+ *
+ * This function swaps the existing state of a private object @obj with
+ * it's newly created state, the pointer to which is passed as
+ * @obj_state_ptr.
+ */
+ void (*swap_state)(void *obj, void **obj_state_ptr);
+
+ /**
+ * @destroy_state:
+ *
+ * Frees the private object state created with @duplicate_state.
+ */
+ void (*destroy_state)(void *obj_state);
+};
+
+struct __drm_private_objs_state {
+ void *obj;
+ void *obj_state;
+ const struct drm_private_state_funcs *funcs;
+};
+
+/**
* struct drm_atomic_state - the global state object for atomic updates
* @ref: count of all references to this state (will not be freed until zero)
* @dev: parent DRM device
@@ -165,6 +212,8 @@ struct __drm_connnectors_state {
* @crtcs: pointer to array of CRTC pointers
* @num_connector: size of the @connectors and @connector_states arrays
* @connectors: pointer to array of structures with per-connector data
+ * @num_private_objs: size of the @private_objs array
+ * @private_objs: pointer to array of private object pointers
* @acquire_ctx: acquire context for this atomic modeset state update
*/
struct drm_atomic_state {
@@ -178,6 +227,8 @@ struct drm_atomic_state {
struct __drm_crtcs_state *crtcs;
int num_connector;
struct __drm_connnectors_state *connectors;
+ int num_private_objs;
+ struct __drm_private_objs_state *private_objs;
struct drm_modeset_acquire_ctx *acquire_ctx;
@@ -270,6 +321,11 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
struct drm_connector_state *state, struct drm_property *property,
uint64_t val);
+void * __must_check
+drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
+ void *obj,
+ const struct drm_private_state_funcs *funcs);
+
/**
* drm_atomic_get_existing_crtc_state - get crtc state, if it exists
* @state: global atomic state object
@@ -755,6 +811,42 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
for_each_if (plane)
/**
+ * __for_each_private_obj - iterate over all private objects
+ * @__state: the atomic state
+ *
+ * This macro iterates over the array containing private object data in atomic
+ * state
+ */
+#define __for_each_private_obj(__state, obj, obj_state, __i, __funcs) \
+ for ((__i) = 0; \
+ (__i) < (__state)->num_private_objs && \
+ ((obj) = (__state)->private_objs[__i].obj, \
+ (__funcs) = (__state)->private_objs[__i].funcs, \
+ (obj_state) = (__state)->private_objs[__i].obj_state, \
+ 1); \
+ (__i)++) \
+
+/**
+ * for_each_private_obj - iterate over a specify type of private object
+ * @__state: the atomic state
+ * @obj_funcs: function table to filter the private objects
+ *
+ * This macro iterates over the private objects state array while filtering the
+ * objects based on the vfunc table that is passed as @obj_funcs. New macros
+ * can be created by passing in the vfunc table associated with a specific
+ * private object.
+ */
+#define for_each_private_obj(__state, obj_funcs, obj, obj_state, __i, __funcs) \
+ for ((__i) = 0; \
+ (__i) < (__state)->num_private_objs && \
+ ((obj) = (__state)->private_objs[__i].obj, \
+ (__funcs) = (__state)->private_objs[__i].funcs, \
+ (obj_state) = (__state)->private_objs[__i].obj_state, \
+ 1); \
+ (__i)++) \
+ for_each_if (__funcs == obj_funcs)
+
+/**
* drm_atomic_crtc_needs_modeset - compute combined modeset need
* @state: &drm_crtc_state for the CRTC
*
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v5 2/5] drm/dp: Introduce MST topology state to track available link bandwidth
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 1/5] drm: Add " Dhinakaran Pandiyan
@ 2017-03-30 8:42 ` Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
` (4 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Link bandwidth is shared between multiple display streams in DP MST
configurations. The DP MST topology manager structure maintains the
shared link bandwidth for a primary link directly connected to the GPU. For
atomic modesetting drivers, checking if there is sufficient link bandwidth
for a mode needs to be done during the atomic_check phase to avoid failed
modesets. Let's encapsulate the available link bw information in a
private state structure so that bw can be allocated and released atomically
for each of the ports sharing the primary link.
v3: WARN_ON() if connection_mutex is not held (Archit)
v2: Included kernel doc, moved state initialization and switched to
kmemdup() for allocation (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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 75 +++++++++++++++++++++++++++++++++++
include/drm/drm_dp_mst_helper.h | 20 ++++++++++
2 files changed, 95 insertions(+)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index d3fc7e4..0ad0baa 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2936,6 +2936,69 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
(*mgr->cbs->hotplug)(mgr);
}
+void *drm_dp_mst_duplicate_state(struct drm_atomic_state *state, void *obj)
+{
+ struct drm_dp_mst_topology_mgr *mgr = obj;
+ struct drm_dp_mst_topology_state *new_mst_state;
+
+ if (WARN_ON(!mgr->state))
+ return NULL;
+
+ new_mst_state = kmemdup(mgr->state, sizeof(*new_mst_state), GFP_KERNEL);
+ if (new_mst_state)
+ new_mst_state->state = state;
+ return new_mst_state;
+}
+
+void drm_dp_mst_swap_state(void *obj, void **obj_state_ptr)
+{
+ struct drm_dp_mst_topology_mgr *mgr = obj;
+ struct drm_dp_mst_topology_state **topology_state_ptr;
+
+ topology_state_ptr = (struct drm_dp_mst_topology_state **)obj_state_ptr;
+
+ mgr->state->state = (*topology_state_ptr)->state;
+ swap(*topology_state_ptr, mgr->state);
+ mgr->state->state = NULL;
+}
+
+void drm_dp_mst_destroy_state(void *obj_state)
+{
+ kfree(obj_state);
+}
+
+static const struct drm_private_state_funcs mst_state_funcs = {
+ .duplicate_state = drm_dp_mst_duplicate_state,
+ .swap_state = drm_dp_mst_swap_state,
+ .destroy_state = drm_dp_mst_destroy_state,
+};
+
+/**
+ * drm_atomic_get_mst_topology_state: get MST topology state
+ *
+ * @state: global atomic state
+ * @mgr: MST topology manager, also the private object in this case
+ *
+ * This function wraps drm_atomic_get_priv_obj_state() passing in the MST atomic
+ * state vtable so that the private object state returned is that of a MST
+ * topology object. Also, drm_atomic_get_private_obj_state() expects the caller
+ * to care of the locking, so warn if don't hold the connection_mutex.
+ *
+ * RETURNS:
+ *
+ * The MST topology state or error pointer.
+ */
+struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr)
+{
+ struct drm_device *dev = mgr->dev;
+
+ WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+ return drm_atomic_get_private_obj_state(state, mgr,
+ &mst_state_funcs);
+}
+EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
+
/**
* drm_dp_mst_topology_mgr_init - initialise a topology manager
* @mgr: manager struct to initialise
@@ -2980,6 +3043,15 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
if (test_calc_pbn_mode() < 0)
DRM_ERROR("MST PBN self-test failed\n");
+ mgr->state = kzalloc(sizeof(*mgr->state), GFP_KERNEL);
+ if (mgr->state == NULL)
+ return -ENOMEM;
+ mgr->state->mgr = mgr;
+
+ /* max. time slots - one slot for MTP header */
+ mgr->state->avail_slots = 63;
+ mgr->funcs = &mst_state_funcs;
+
return 0;
}
EXPORT_SYMBOL(drm_dp_mst_topology_mgr_init);
@@ -3000,6 +3072,9 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
mutex_unlock(&mgr->payload_lock);
mgr->dev = NULL;
mgr->aux = NULL;
+ kfree(mgr->state);
+ mgr->state = NULL;
+ mgr->funcs = NULL;
}
EXPORT_SYMBOL(drm_dp_mst_topology_mgr_destroy);
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 5b02476..0b371df 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -24,6 +24,7 @@
#include <linux/types.h>
#include <drm/drm_dp_helper.h>
+#include <drm/drm_atomic.h>
struct drm_dp_mst_branch;
@@ -403,6 +404,12 @@ struct drm_dp_payload {
int vcpi;
};
+struct drm_dp_mst_topology_state {
+ int avail_slots;
+ struct drm_atomic_state *state;
+ struct drm_dp_mst_topology_mgr *mgr;
+};
+
/**
* struct drm_dp_mst_topology_mgr - DisplayPort MST manager
*
@@ -481,6 +488,16 @@ struct drm_dp_mst_topology_mgr {
int pbn_div;
/**
+ * @state: State information for topology manager
+ */
+ struct drm_dp_mst_topology_state *state;
+
+ /**
+ * @funcs: Atomic helper callbacks
+ */
+ const struct drm_private_state_funcs *funcs;
+
+ /**
* @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and
* &drm_dp_sideband_msg_tx.state once they are queued
*/
@@ -596,4 +613,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
+struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr);
+
#endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 1/5] drm: Add " Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
@ 2017-03-30 8:42 ` Dhinakaran Pandiyan
2017-04-04 1:46 ` Pandiyan, Dhinakaran
2017-03-30 8:42 ` [PATCH v5 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
` (3 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
drm_dp_atomic_find_vcpi_slots() should be called from ->atomic_check() to
check there are sufficient vcpi slots for a mode and to add that to the
state. This should be followed by a call to drm_dp_mst_allocate_vcpi()
in ->atomic_commit() to initialize a struct vcpi for the port.
drm_dp_atomic_release_vcpi_slots() should be called from
->atomic_check() to release a port's vcpi slot allocation from the
state.
Drivers that do not make use of this atomic helper are expected to call
drm_dp_find_vcpi_slots() instead before calling
drm_dp_mst_allocate_vcpi().
v2:
Added checks for verifying the port reference is valid
Moved get_mst_topology_state() into the helpers (Daniel)
Changed find_vcpi_slots() to not depend on current allocation
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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 75 +++++++++++++++++++++++++++++++++++
include/drm/drm_dp_mst_helper.h | 6 +++
2 files changed, 81 insertions(+)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 0ad0baa..9f3954e 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2498,6 +2498,81 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
}
/**
+ * drm_dp_atomic_find_vcpi_slots() - Find and add vcpi slots to the state
+ * @state: global atomic state
+ * @mgr: MST topology manager for the port
+ * @port: port to find vcpi slots for
+ * @pbn: bandwidth required for the mode in PBN
+ *
+ * RETURNS:
+ * Total slots in the atomic state assigned for this port or error
+ */
+int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int pbn)
+{
+ struct drm_dp_mst_topology_state *topology_state;
+ int req_slots;
+
+ topology_state = drm_atomic_get_mst_topology_state(state, mgr);
+ if (topology_state == NULL)
+ return -ENOMEM;
+
+ port = drm_dp_get_validated_port_ref(mgr, port);
+ if (port == NULL)
+ return -EINVAL;
+ req_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
+ DRM_DEBUG_KMS("vcpi slots req=%d, avail=%d\n",
+ req_slots, topology_state->avail_slots);
+
+ if (req_slots > topology_state->avail_slots) {
+ drm_dp_put_port(port);
+ return -ENOSPC;
+ }
+
+ topology_state->avail_slots -= req_slots;
+ DRM_DEBUG_KMS("vcpi slots avail=%d", topology_state->avail_slots);
+
+ drm_dp_put_port(port);
+ return req_slots;
+}
+EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
+
+/**
+ * drm_dp_atomic_release_vcpi_slots() - Release allocated vcpi slots
+ * @state: global atomic state
+ * @mgr: MST topology manager for the port
+ * @port: port to release the vcpi slots for
+ *
+ * RETURNS:
+ * Number of slots released from the atomic state for this port
+ */
+int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port)
+{
+ struct drm_dp_mst_topology_state *topology_state;
+ int curr_slots;
+
+ topology_state = drm_atomic_get_mst_topology_state(state, mgr);
+ if (topology_state == NULL)
+ return -ENOMEM;
+
+ port = drm_dp_get_validated_port_ref(mgr, port);
+ if (port == NULL)
+ return -EINVAL;
+
+ curr_slots = port->vcpi.num_slots;
+ topology_state->avail_slots += curr_slots;
+ DRM_DEBUG_KMS("vcpi slots released=%d, avail=%d\n",
+ curr_slots, topology_state->avail_slots);
+
+ drm_dp_put_port(port);
+ return curr_slots;
+}
+EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+
+/**
* drm_dp_mst_allocate_vcpi() - Allocate a virtual channel
* @mgr: manager for this port
* @port: port to allocate a virtual channel for.
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 0b371df..64e7dac 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -615,5 +615,11 @@ void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
struct drm_dp_mst_topology_mgr *mgr);
+int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int pbn);
+int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port);
#endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v5 4/5] drm: Connector helper function to release resources
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
` (2 preceding siblings ...)
2017-03-30 8:42 ` [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
@ 2017-03-30 8:42 ` Dhinakaran Pandiyan
2017-03-30 10:36 ` Maarten Lankhorst
2017-03-30 8:42 ` [PATCH v5 " Dhinakaran Pandiyan
` (2 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Having an ->atomic_release callback is useful to release shared resources
that get allocated in compute_config(). This function is expected to be
called in the atomic_check() phase before new resources are acquired.
v4: Document that the function is conditionally called and before
other atomic_checks() (Daniel)
v3: Use the new 'for_each_oldnew_connector_in_state()' macro.
v2: Moved the caller hunk to this patch (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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 19 +++++++++++++++++++
include/drm/drm_modeset_helper_vtables.h | 16 ++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index d14094d..9d07669 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -586,6 +586,25 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
}
}
+ for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) {
+ const struct drm_connector_helper_funcs *conn_funcs;
+ struct drm_crtc_state *crtc_state;
+
+ conn_funcs = connector->helper_private;
+ if (!conn_funcs->atomic_release)
+ continue;
+
+ if (!old_connector_state->crtc)
+ continue;
+
+ crtc_state = drm_atomic_get_existing_crtc_state(state, old_connector_state->crtc);
+
+ if (crtc_state->connectors_changed ||
+ crtc_state->mode_changed ||
+ (crtc_state->active_changed && !crtc_state->active))
+ conn_funcs->atomic_release(connector, new_connector_state);
+ }
+
return mode_fixup(state);
}
EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 091c422..84e80aa 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -836,6 +836,22 @@ struct drm_connector_helper_funcs {
*/
struct drm_encoder *(*atomic_best_encoder)(struct drm_connector *connector,
struct drm_connector_state *connector_state);
+
+ /**
+ * @atomic_release:
+ *
+ * This function is conditionally called to release shared resources
+ * when the attached CRTC's mode changes or it's connectors change or
+ * becomes inactive. It is called before the corresponding
+ * &drm_crtc_helper_funcs.atomic_check or
+ * &drm_crtc_helper_funcs.mode_fixup hooks are called.
+ *
+ * NOTE:
+ *
+ * This function is called in the check phase of an atomic update.
+ */
+ void (*atomic_release)(struct drm_connector *connector,
+ struct drm_connector_state *connector_state);
};
/**
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v5 5/5] drm/dp: Track MST link bandwidth
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
` (3 preceding siblings ...)
2017-03-30 8:42 ` [PATCH v5 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
@ 2017-03-30 8:42 ` Dhinakaran Pandiyan
2017-03-30 11:17 ` ✗ Fi.CI.BAT: warning for Adding driver-private objects to atomic state Patchwork
2017-04-04 20:36 ` ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6) Patchwork
6 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-03-30 8:42 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Use the added helpers to track MST link bandwidth for atomic modesets.
Link bw is acquired in the ->atomic_check() phase when CRTCs are being
enabled with drm_atomic_find_vcpi_slots() instead of drm_find_vcpi_slots().
Similarly, link bw is released during ->atomic_check() with the connector
helper callback ->atomic_release() when CRTCs are disabled.
v3:
Handled the case where ->atomic_release() is called more than once
during an atomic_check() for the same state.
v2:
Squashed atomic_release() implementation and caller (Daniel)
Fixed logic for connector-crtc switching case (Daniel)
Fixed logic for suspend-resume case.
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>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/i915/intel_dp_mst.c | 48 +++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index c1f62eb..8f93037 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -39,9 +39,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
struct intel_dp *intel_dp = &intel_dig_port->dp;
struct intel_connector *connector =
to_intel_connector(conn_state->connector);
- struct drm_atomic_state *state;
+ struct drm_atomic_state *state = pipe_config->base.state;
int bpp;
- int lane_count, slots;
+ int lane_count, slots = 0;
const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
int mst_pbn;
@@ -57,30 +57,63 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
* seem to suggest we should do otherwise.
*/
lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
-
pipe_config->lane_count = lane_count;
pipe_config->pipe_bpp = bpp;
pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
- state = pipe_config->base.state;
-
if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, connector->port))
pipe_config->has_audio = true;
- mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
+ mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
pipe_config->pbn = mst_pbn;
- slots = drm_dp_find_vcpi_slots(&intel_dp->mst_mgr, mst_pbn);
intel_link_compute_m_n(bpp, lane_count,
adjusted_mode->crtc_clock,
pipe_config->port_clock,
&pipe_config->dp_m_n);
+ if (pipe_config->base.active) {
+ slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
+ connector->port, mst_pbn);
+ if (slots < 0) {
+ DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots);
+ return false;
+ }
+ }
pipe_config->dp_m_n.tu = slots;
return true;
+}
+static void intel_dp_mst_atomic_release(struct drm_connector *connector,
+ struct drm_connector_state *conn_state)
+{
+ struct intel_dp_mst_encoder *intel_mst;
+ struct drm_dp_mst_topology_mgr *mgr;
+ struct drm_encoder *encoder;
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+ struct drm_atomic_state *state = conn_state->state;
+ struct drm_crtc *old_crtc = connector->state->crtc;
+ struct intel_crtc_state *old_crtc_state =
+ to_intel_crtc_state(old_crtc->state);
+ int slots;
+
+ encoder = connector->state->best_encoder;
+ intel_mst = enc_to_mst(encoder);
+ mgr = &intel_mst->primary->dp.mst_mgr;
+
+ slots = old_crtc_state->dp_m_n.tu;
+ if (slots > 0) {
+ int ret;
+
+ ret = drm_dp_atomic_release_vcpi_slots(state, mgr,
+ intel_connector->port);
+ if (ret == slots)
+ old_crtc_state->dp_m_n.tu = 0;
+ else
+ DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret);
+ }
}
static void intel_mst_disable_dp(struct intel_encoder *encoder,
@@ -387,6 +420,7 @@ static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_fun
.mode_valid = intel_dp_mst_mode_valid,
.atomic_best_encoder = intel_mst_atomic_best_encoder,
.best_encoder = intel_mst_best_encoder,
+ .atomic_release = intel_dp_mst_atomic_release,
};
static void intel_dp_mst_encoder_destroy(struct drm_encoder *encoder)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v5 4/5] drm: Connector helper function to release resources
2017-03-30 8:42 ` [PATCH v5 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
@ 2017-03-30 10:36 ` Maarten Lankhorst
2017-04-01 2:37 ` Pandiyan, Dhinakaran
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
0 siblings, 2 replies; 18+ messages in thread
From: Maarten Lankhorst @ 2017-03-30 10:36 UTC (permalink / raw)
To: Dhinakaran Pandiyan, intel-gfx
Cc: Daniel Vetter, Archit Taneja, Harry Wentland, dri-devel
Op 30-03-17 om 10:42 schreef Dhinakaran Pandiyan:
> From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
>
> Having an ->atomic_release callback is useful to release shared resources
> that get allocated in compute_config(). This function is expected to be
> called in the atomic_check() phase before new resources are acquired.
>
> v4: Document that the function is conditionally called and before
> other atomic_checks() (Daniel)
> v3: Use the new 'for_each_oldnew_connector_in_state()' macro.
> v2: Moved the caller hunk to this patch (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>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 19 +++++++++++++++++++
> include/drm/drm_modeset_helper_vtables.h | 16 ++++++++++++++++
> 2 files changed, 35 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index d14094d..9d07669 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -586,6 +586,25 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
> }
> }
>
> + for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) {
> + const struct drm_connector_helper_funcs *conn_funcs;
> + struct drm_crtc_state *crtc_state;
> +
> + conn_funcs = connector->helper_private;
> + if (!conn_funcs->atomic_release)
> + continue;
> +
> + if (!old_connector_state->crtc)
> + continue;
> +
> + crtc_state = drm_atomic_get_existing_crtc_state(state, old_connector_state->crtc);
> +
> + if (crtc_state->connectors_changed ||
> + crtc_state->mode_changed ||
> + (crtc_state->active_changed && !crtc_state->active))
> + conn_funcs->atomic_release(connector, new_connector_state);
> + }
> +
> return mode_fixup(state);
> }
Oops, I'm just looking at patch 5 again..
atomic_release should return an int to allow error propogation. There's no good reason why it shouldn't.
This would allow handling errors in patch 5 more gracefully.
> EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
> diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> index 091c422..84e80aa 100644
> --- a/include/drm/drm_modeset_helper_vtables.h
> +++ b/include/drm/drm_modeset_helper_vtables.h
> @@ -836,6 +836,22 @@ struct drm_connector_helper_funcs {
> */
> struct drm_encoder *(*atomic_best_encoder)(struct drm_connector *connector,
> struct drm_connector_state *connector_state);
> +
> + /**
> + * @atomic_release:
> + *
> + * This function is conditionally called to release shared resources
> + * when the attached CRTC's mode changes or it's connectors change or
> + * becomes inactive. It is called before the corresponding
> + * &drm_crtc_helper_funcs.atomic_check or
> + * &drm_crtc_helper_funcs.mode_fixup hooks are called.
> + *
> + * NOTE:
> + *
> + * This function is called in the check phase of an atomic update.
> + */
> + void (*atomic_release)(struct drm_connector *connector,
> + struct drm_connector_state *connector_state);
> };
>
> /**
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* ✗ Fi.CI.BAT: warning for Adding driver-private objects to atomic state
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
` (4 preceding siblings ...)
2017-03-30 8:42 ` [PATCH v5 " Dhinakaran Pandiyan
@ 2017-03-30 11:17 ` Patchwork
2017-04-04 20:36 ` ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6) Patchwork
6 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2017-03-30 11:17 UTC (permalink / raw)
To: Pandiyan, Dhinakaran; +Cc: intel-gfx
== Series Details ==
Series: Adding driver-private objects to atomic state
URL : https://patchwork.freedesktop.org/series/22177/
State : warning
== Summary ==
Series 22177v1 Adding driver-private objects to atomic state
https://patchwork.freedesktop.org/api/1.0/series/22177/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (fi-skl-6770hq) fdo#99739
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-byt-n2820)
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#99739 https://bugs.freedesktop.org/show_bug.cgi?id=99739
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 433s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 426s
fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 575s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 514s
fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 559s
fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 481s
fi-byt-n2820 total:278 pass:246 dwarn:1 dfail:0 fail:0 skip:31 time: 485s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 410s
fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 410s
fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 420s
fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 496s
fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 465s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 457s
fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 568s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 450s
fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 578s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 459s
fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 483s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 432s
fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 535s
fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 412s
66e17cacf58689a0d6ca38138217e667d100a64a drm-tip: 2017y-03m-30d-10h-12m-59s UTC integration manifest
6f58b7f drm/dp: Track MST link bandwidth
1cbb2f6 drm: Connector helper function to release resources
3d67bbb drm/dp: Add DP MST helpers to atomically find and release vcpi slots
24d4f95 drm/dp: Introduce MST topology state to track available link bandwidth
3168f00 drm: Add driver-private objects to atomic state
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4355/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v5 4/5] drm: Connector helper function to release resources
2017-03-30 10:36 ` Maarten Lankhorst
@ 2017-04-01 2:37 ` Pandiyan, Dhinakaran
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
1 sibling, 0 replies; 18+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-04-01 2:37 UTC (permalink / raw)
To: maarten.lankhorst
Cc: daniel.vetter, intel-gfx, Harry.wentland, architt, dri-devel
On Thu, 2017-03-30 at 12:36 +0200, Maarten Lankhorst wrote:
> Op 30-03-17 om 10:42 schreef Dhinakaran Pandiyan:
> > From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
> >
> > Having an ->atomic_release callback is useful to release shared resources
> > that get allocated in compute_config(). This function is expected to be
> > called in the atomic_check() phase before new resources are acquired.
> >
> > v4: Document that the function is conditionally called and before
> > other atomic_checks() (Daniel)
> > v3: Use the new 'for_each_oldnew_connector_in_state()' macro.
> > v2: Moved the caller hunk to this patch (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>
> > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > ---
> > drivers/gpu/drm/drm_atomic_helper.c | 19 +++++++++++++++++++
> > include/drm/drm_modeset_helper_vtables.h | 16 ++++++++++++++++
> > 2 files changed, 35 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> > index d14094d..9d07669 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -586,6 +586,25 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
> > }
> > }
> >
> > + for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) {
> > + const struct drm_connector_helper_funcs *conn_funcs;
> > + struct drm_crtc_state *crtc_state;
> > +
> > + conn_funcs = connector->helper_private;
> > + if (!conn_funcs->atomic_release)
> > + continue;
> > +
> > + if (!old_connector_state->crtc)
> > + continue;
> > +
> > + crtc_state = drm_atomic_get_existing_crtc_state(state, old_connector_state->crtc);
> > +
> > + if (crtc_state->connectors_changed ||
> > + crtc_state->mode_changed ||
> > + (crtc_state->active_changed && !crtc_state->active))
> > + conn_funcs->atomic_release(connector, new_connector_state);
> > + }
> > +
> > return mode_fixup(state);
> > }
> Oops, I'm just looking at patch 5 again..
>
> atomic_release should return an int to allow error propogation. There's no good reason why it shouldn't.
> This would allow handling errors in patch 5 more gracefully.
Makes sense, will change that. This made me think about how
intel_dp_mst_atomic_release() handles an invalid mst_port reference
i.e., in case the port is gone. I'll fix both and send a new version.
-DK
> > EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
> > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> > index 091c422..84e80aa 100644
> > --- a/include/drm/drm_modeset_helper_vtables.h
> > +++ b/include/drm/drm_modeset_helper_vtables.h
> > @@ -836,6 +836,22 @@ struct drm_connector_helper_funcs {
> > */
> > struct drm_encoder *(*atomic_best_encoder)(struct drm_connector *connector,
> > struct drm_connector_state *connector_state);
> > +
> > + /**
> > + * @atomic_release:
> > + *
> > + * This function is conditionally called to release shared resources
> > + * when the attached CRTC's mode changes or it's connectors change or
> > + * becomes inactive. It is called before the corresponding
> > + * &drm_crtc_helper_funcs.atomic_check or
> > + * &drm_crtc_helper_funcs.mode_fixup hooks are called.
> > + *
> > + * NOTE:
> > + *
> > + * This function is called in the check phase of an atomic update.
> > + */
> > + void (*atomic_release)(struct drm_connector *connector,
> > + struct drm_connector_state *connector_state);
> > };
> >
> > /**
>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v5 1/5] drm: Add driver-private objects to atomic state
2017-03-30 8:42 ` [PATCH v5 1/5] drm: Add " Dhinakaran Pandiyan
@ 2017-04-01 5:46 ` kbuild test robot
0 siblings, 0 replies; 18+ messages in thread
From: kbuild test robot @ 2017-04-01 5:46 UTC (permalink / raw)
Cc: Archit Taneja, Daniel Vetter, intel-gfx, dri-devel, Pandiyan,
Dhinakaran, Harry Wentland, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 10158 bytes --]
Hi Dhinakaran,
[auto build test WARNING on next-20170330]
[cannot apply to drm/drm-next drm-intel/for-linux-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Dhinakaran-Pandiyan/drm-Add-driver-private-objects-to-atomic-state/20170401-113603
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
WARNING: convert(1) not found, for SVG to PDF conversion install ImageMagick (https://www.imagemagick.org)
include/linux/init.h:1: warning: no structured comments found
kernel/sched/core.c:2088: warning: No description found for parameter 'rf'
kernel/sched/core.c:2088: warning: Excess function parameter 'cookie' description in 'try_to_wake_up_local'
include/linux/kthread.h:26: warning: Excess function parameter '...' description in 'kthread_create'
kernel/sys.c:1: warning: no structured comments found
include/linux/device.h:969: warning: No description found for parameter 'dma_ops'
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/linux/iio/iio.h:597: warning: No description found for parameter 'trig_readonly'
include/linux/iio/trigger.h:151: warning: No description found for parameter 'indio_dev'
include/linux/iio/trigger.h:151: warning: No description found for parameter 'trig'
include/linux/device.h:970: warning: No description found for parameter 'dma_ops'
include/drm/drm_drv.h:524: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_handler'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_preinstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_postinstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_uninstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'debugfs_init'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_open_object'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_close_object'
include/drm/drm_drv.h:524: warning: No description found for parameter 'prime_handle_to_fd'
include/drm/drm_drv.h:524: warning: No description found for parameter 'prime_fd_to_handle'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_export'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_import'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_pin'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_unpin'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_res_obj'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_get_sg_table'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_import_sg_table'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_vmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_vunmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_mmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_vm_ops'
include/drm/drm_drv.h:524: warning: No description found for parameter 'major'
include/drm/drm_drv.h:524: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:524: warning: No description found for parameter 'patchlevel'
include/drm/drm_drv.h:524: warning: No description found for parameter 'name'
include/drm/drm_drv.h:524: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:524: warning: No description found for parameter 'date'
include/drm/drm_drv.h:524: warning: No description found for parameter 'driver_features'
include/drm/drm_drv.h:524: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:524: warning: No description found for parameter 'num_ioctls'
include/drm/drm_drv.h:524: warning: No description found for parameter 'fops'
>> include/drm/drm_atomic.h:829: warning: No description found for parameter 'obj'
>> include/drm/drm_atomic.h:829: warning: No description found for parameter 'obj_state'
>> include/drm/drm_atomic.h:829: warning: No description found for parameter '__i'
>> include/drm/drm_atomic.h:829: warning: No description found for parameter '__funcs'
include/drm/drm_atomic.h:848: warning: No description found for parameter 'obj'
include/drm/drm_atomic.h:848: warning: No description found for parameter 'obj_state'
include/drm/drm_atomic.h:848: warning: No description found for parameter '__i'
include/drm/drm_atomic.h:848: warning: No description found for parameter '__funcs'
include/drm/drm_color_mgmt.h:1: warning: no structured comments found
drivers/gpu/drm/drm_plane_helper.c:403: warning: No description found for parameter 'ctx'
drivers/gpu/drm/drm_plane_helper.c:404: warning: No description found for parameter 'ctx'
drivers/gpu/drm/i915/intel_lpe_audio.c:342: warning: No description found for parameter 'pipe'
drivers/gpu/drm/i915/intel_lpe_audio.c:342: warning: No description found for parameter 'dp_output'
drivers/gpu/drm/i915/intel_lpe_audio.c:342: warning: No description found for parameter 'link_rate'
drivers/gpu/drm/i915/intel_lpe_audio.c:343: warning: No description found for parameter 'pipe'
drivers/gpu/drm/i915/intel_lpe_audio.c:343: warning: No description found for parameter 'dp_output'
drivers/gpu/drm/i915/intel_lpe_audio.c:343: warning: No description found for parameter 'link_rate'
drivers/media/dvb-core/dvb_frontend.h:677: warning: No description found for parameter 'refcount'
include/media/tveeprom.h:104: warning: Excess function parameter 'c' description in 'tveeprom_hauppauge_analog'
Documentation/core-api/assoc_array.rst:13: WARNING: Enumerated list ends without a blank line; unexpected unindent.
Documentation/doc-guide/sphinx.rst:126: ERROR: Unknown target name: "sphinx c domain".
kernel/sched/fair.c:7657: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1200: ERROR: Unexpected indentation.
kernel/time/timer.c:1202: ERROR: Unexpected indentation.
kernel/time/timer.c:1203: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:122: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:125: ERROR: Unexpected indentation.
include/linux/wait.h:127: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:990: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:322: WARNING: Inline literal start-string without end-string.
include/linux/iio/iio.h:219: ERROR: Unexpected indentation.
include/linux/iio/iio.h:220: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/iio/iio.h:226: WARNING: Definition list ends without a blank line; unexpected unindent.
drivers/iio/industrialio-core.c:639: ERROR: Unknown target name: "iio_val".
drivers/iio/industrialio-core.c:646: ERROR: Unknown target name: "iio_val".
drivers/message/fusion/mptbase.c:5051: WARNING: Definition list ends without a blank line; unexpected unindent.
drivers/tty/serial/serial_core.c:1898: WARNING: Definition list ends without a blank line; unexpected unindent.
include/linux/regulator/driver.h:271: ERROR: Unknown target name: "regulator_regmap_x_voltage".
include/linux/spi/spi.h:370: ERROR: Unexpected indentation.
drivers/usb/core/message.c:478: ERROR: Unexpected indentation.
drivers/usb/core/message.c:479: WARNING: Block quote ends without a blank line; unexpected unindent.
Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_type".
Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_dir".
Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_recip".
Documentation/driver-api/usb.rst:689: ERROR: Unknown target name: "usbdevfs_urb_type".
drivers/gpu/drm/drm_scdc_helper.c:203: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:204: WARNING: Block quote ends without a blank line; unexpected unindent.
Documentation/gpu/todo.rst:111: ERROR: Unknown target name: "drm_fb".
sound/soc/soc-core.c:2665: ERROR: Unknown target name: "snd_soc_daifmt".
sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn".
Documentation/usb/typec.rst:116: ERROR: Error in "kernel-doc" directive:
invalid option block.
vim +/obj +829 include/drm/drm_atomic.h
813 /**
814 * __for_each_private_obj - iterate over all private objects
815 * @__state: the atomic state
816 *
817 * This macro iterates over the array containing private object data in atomic
818 * state
819 */
820 #define __for_each_private_obj(__state, obj, obj_state, __i, __funcs) \
821 for ((__i) = 0; \
822 (__i) < (__state)->num_private_objs && \
823 ((obj) = (__state)->private_objs[__i].obj, \
824 (__funcs) = (__state)->private_objs[__i].funcs, \
825 (obj_state) = (__state)->private_objs[__i].obj_state, \
826 1); \
827 (__i)++) \
828
> 829 /**
830 * for_each_private_obj - iterate over a specify type of private object
831 * @__state: the atomic state
832 * @obj_funcs: function table to filter the private objects
833 *
834 * This macro iterates over the private objects state array while filtering the
835 * objects based on the vfunc table that is passed as @obj_funcs. New macros
836 * can be created by passing in the vfunc table associated with a specific
837 * private object.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 6613 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots
2017-03-30 8:42 ` [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
@ 2017-04-04 1:46 ` Pandiyan, Dhinakaran
0 siblings, 0 replies; 18+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-04-04 1:46 UTC (permalink / raw)
To: intel-gfx; +Cc: daniel.vetter, architt, Harry.wentland, dri-devel
On Thu, 2017-03-30 at 01:42 -0700, Dhinakaran Pandiyan wrote:
> From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
>
> drm_dp_atomic_find_vcpi_slots() should be called from ->atomic_check() to
> check there are sufficient vcpi slots for a mode and to add that to the
> state. This should be followed by a call to drm_dp_mst_allocate_vcpi()
> in ->atomic_commit() to initialize a struct vcpi for the port.
>
> drm_dp_atomic_release_vcpi_slots() should be called from
> ->atomic_check() to release a port's vcpi slot allocation from the
> state.
>
> Drivers that do not make use of this atomic helper are expected to call
> drm_dp_find_vcpi_slots() instead before calling
> drm_dp_mst_allocate_vcpi().
>
> v2:
> Added checks for verifying the port reference is valid
> Moved get_mst_topology_state() into the helpers (Daniel)
> Changed find_vcpi_slots() to not depend on current allocation
>
> 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>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 75 +++++++++++++++++++++++++++++++++++
> include/drm/drm_dp_mst_helper.h | 6 +++
> 2 files changed, 81 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 0ad0baa..9f3954e 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -2498,6 +2498,81 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
> }
>
> /**
> + * drm_dp_atomic_find_vcpi_slots() - Find and add vcpi slots to the state
> + * @state: global atomic state
> + * @mgr: MST topology manager for the port
> + * @port: port to find vcpi slots for
> + * @pbn: bandwidth required for the mode in PBN
> + *
> + * RETURNS:
> + * Total slots in the atomic state assigned for this port or error
> + */
> +int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
> + struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port, int pbn)
> +{
> + struct drm_dp_mst_topology_state *topology_state;
> + int req_slots;
> +
> + topology_state = drm_atomic_get_mst_topology_state(state, mgr);
> + if (topology_state == NULL)
> + return -ENOMEM;
> +
> + port = drm_dp_get_validated_port_ref(mgr, port);
> + if (port == NULL)
> + return -EINVAL;
> + req_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
> + DRM_DEBUG_KMS("vcpi slots req=%d, avail=%d\n",
> + req_slots, topology_state->avail_slots);
> +
> + if (req_slots > topology_state->avail_slots) {
> + drm_dp_put_port(port);
> + return -ENOSPC;
> + }
> +
> + topology_state->avail_slots -= req_slots;
> + DRM_DEBUG_KMS("vcpi slots avail=%d", topology_state->avail_slots);
> +
> + drm_dp_put_port(port);
> + return req_slots;
> +}
> +EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
> +
> +/**
> + * drm_dp_atomic_release_vcpi_slots() - Release allocated vcpi slots
> + * @state: global atomic state
> + * @mgr: MST topology manager for the port
> + * @port: port to release the vcpi slots for
> + *
> + * RETURNS:
> + * Number of slots released from the atomic state for this port
> + */
> +int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
> + struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port)
> +{
> + struct drm_dp_mst_topology_state *topology_state;
> + int curr_slots;
> +
> + topology_state = drm_atomic_get_mst_topology_state(state, mgr);
> + if (topology_state == NULL)
> + return -ENOMEM;
> +
> + port = drm_dp_get_validated_port_ref(mgr, port);
> + if (port == NULL)
> + return -EINVAL;
> +
> + curr_slots = port->vcpi.num_slots;
This is a problem if the port has been destroyed.
> + topology_state->avail_slots += curr_slots;
> + DRM_DEBUG_KMS("vcpi slots released=%d, avail=%d\n",
> + curr_slots, topology_state->avail_slots);
> +
> + drm_dp_put_port(port);
> + return curr_slots;
> +}
Should we do this instead?
int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_port *port, int
slots)
{
struct drm_dp_mst_topology_state *topology_state;
topology_state = drm_atomic_get_mst_topology_state(state, mgr);
if (topology_state == NULL)
return -ENOMEM;
/* We cannot rely on port->vcpi.num_slots to update
* topology_state->avail_slots as the port may not exist if the
parent
* branch device was unplugged. This should be fixed by tracking
* per-port slot allocation in drm_dp_mst_topology_state instead
of
* depending on the caller to tell us how many slots to release.
*/
topology_state->avail_slots += slots;
DRM_DEBUG_KMS("vcpi slots released=%d, avail=%d\n",
slots, topology_state->avail_slots);
return 0;
}
> +EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
> +
> +/**
> * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel
> * @mgr: manager for this port
> * @port: port to allocate a virtual channel for.
> diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
> index 0b371df..64e7dac 100644
> --- a/include/drm/drm_dp_mst_helper.h
> +++ b/include/drm/drm_dp_mst_helper.h
> @@ -615,5 +615,11 @@ void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
> int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
> struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
> struct drm_dp_mst_topology_mgr *mgr);
> +int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
> + struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port, int pbn);
> +int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
> + struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port);
>
> #endif
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v6 1/5] drm: Add driver-private objects to atomic state
2017-03-30 10:36 ` Maarten Lankhorst
2017-04-01 2:37 ` Pandiyan, Dhinakaran
@ 2017-04-04 19:30 ` Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
` (3 more replies)
1 sibling, 4 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-04-04 19:30 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
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.
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>
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>
---
drivers/gpu/drm/drm_atomic.c | 65 +++++++++++++++++++++++
drivers/gpu/drm/drm_atomic_helper.c | 5 ++
include/drm/drm_atomic.h | 101 ++++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 9b892af..4d37019 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -57,6 +57,7 @@ void drm_atomic_state_default_release(struct drm_atomic_state *state)
kfree(state->connectors);
kfree(state->crtcs);
kfree(state->planes);
+ kfree(state->private_objs);
}
EXPORT_SYMBOL(drm_atomic_state_default_release);
@@ -184,6 +185,17 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
state->planes[i].ptr = NULL;
state->planes[i].state = NULL;
}
+
+ for (i = 0; i < state->num_private_objs; i++) {
+ void *obj_state = state->private_objs[i].obj_state;
+
+ state->private_objs[i].funcs->destroy_state(obj_state);
+ state->private_objs[i].obj = NULL;
+ state->private_objs[i].obj_state = NULL;
+ state->private_objs[i].funcs = NULL;
+ }
+ state->num_private_objs = 0;
+
}
EXPORT_SYMBOL(drm_atomic_state_default_clear);
@@ -978,6 +990,59 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
}
/**
+ * drm_atomic_get_private_obj_state - get private object state
+ * @state: global atomic state
+ * @obj: private object to get the state for
+ * @funcs: pointer to the struct of function pointers that identify the object
+ * type
+ *
+ * This function returns the private object state for the given private object,
+ * allocating the state if needed. It does not grab any locks as the caller is
+ * expected to care of any required locking.
+ *
+ * RETURNS:
+ *
+ * Either the allocated state or the error code encoded into a pointer.
+ */
+void *
+drm_atomic_get_private_obj_state(struct drm_atomic_state *state, void *obj,
+ const struct drm_private_state_funcs *funcs)
+{
+ int index, num_objs, i;
+ size_t size;
+ struct __drm_private_objs_state *arr;
+
+ for (i = 0; i < state->num_private_objs; i++)
+ if (obj == state->private_objs[i].obj &&
+ state->private_objs[i].obj_state)
+ return state->private_objs[i].obj_state;
+
+ num_objs = state->num_private_objs + 1;
+ size = sizeof(*state->private_objs) * num_objs;
+ arr = krealloc(state->private_objs, size, GFP_KERNEL);
+ if (!arr)
+ return ERR_PTR(-ENOMEM);
+
+ state->private_objs = arr;
+ index = state->num_private_objs;
+ memset(&state->private_objs[index], 0, sizeof(*state->private_objs));
+
+ state->private_objs[index].obj_state = funcs->duplicate_state(state, obj);
+ if (!state->private_objs[index].obj_state)
+ return ERR_PTR(-ENOMEM);
+
+ state->private_objs[index].obj = obj;
+ state->private_objs[index].funcs = funcs;
+ state->num_private_objs = num_objs;
+
+ DRM_DEBUG_ATOMIC("Added new private object state %p to %p\n",
+ state->private_objs[index].obj_state, state);
+
+ return state->private_objs[index].obj_state;
+}
+EXPORT_SYMBOL(drm_atomic_get_private_obj_state);
+
+/**
* drm_atomic_get_connector_state - get connector state
* @state: global atomic state object
* @connector: connector to get state object for
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index c4538c5..d14094d 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2001,6 +2001,8 @@ void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
struct drm_plane *plane;
struct drm_plane_state *old_plane_state, *new_plane_state;
struct drm_crtc_commit *commit;
+ void *obj, *obj_state;
+ const struct drm_private_state_funcs *funcs;
if (stall) {
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
@@ -2061,6 +2063,9 @@ void drm_atomic_helper_swap_state(struct drm_atomic_state *state,
state->planes[i].state = old_plane_state;
plane->state = new_plane_state;
}
+
+ __for_each_private_obj(state, obj, obj_state, i, funcs)
+ funcs->swap_state(obj, &state->private_objs[i].obj_state);
}
EXPORT_SYMBOL(drm_atomic_helper_swap_state);
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index fd33ed5..80da31c 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -155,6 +155,53 @@ struct __drm_connnectors_state {
};
/**
+ * struct drm_private_state_funcs - atomic state functions for private objects
+ *
+ * These hooks are used by atomic helpers to create, swap and destroy states of
+ * private objects. The structure itself is used as a vtable to identify the
+ * associated private object type. Each private object type that needs to be
+ * added to the atomic states is expected to have an implementation of these
+ * hooks and pass a pointer to it's drm_private_state_funcs struct to
+ * drm_atomic_get_private_obj_state().
+ */
+struct drm_private_state_funcs {
+ /**
+ * @duplicate_state:
+ *
+ * Duplicate the current state of the private object and return it. It
+ * is an error to call this before obj->state has been initialized.
+ *
+ * RETURNS:
+ *
+ * Duplicated atomic state or NULL when obj->state is not
+ * initialized or allocation failed.
+ */
+ void *(*duplicate_state)(struct drm_atomic_state *state, void *obj);
+
+ /**
+ * @swap_state:
+ *
+ * This function swaps the existing state of a private object @obj with
+ * it's newly created state, the pointer to which is passed as
+ * @obj_state_ptr.
+ */
+ void (*swap_state)(void *obj, void **obj_state_ptr);
+
+ /**
+ * @destroy_state:
+ *
+ * Frees the private object state created with @duplicate_state.
+ */
+ void (*destroy_state)(void *obj_state);
+};
+
+struct __drm_private_objs_state {
+ void *obj;
+ void *obj_state;
+ const struct drm_private_state_funcs *funcs;
+};
+
+/**
* struct drm_atomic_state - the global state object for atomic updates
* @ref: count of all references to this state (will not be freed until zero)
* @dev: parent DRM device
@@ -165,6 +212,8 @@ struct __drm_connnectors_state {
* @crtcs: pointer to array of CRTC pointers
* @num_connector: size of the @connectors and @connector_states arrays
* @connectors: pointer to array of structures with per-connector data
+ * @num_private_objs: size of the @private_objs array
+ * @private_objs: pointer to array of private object pointers
* @acquire_ctx: acquire context for this atomic modeset state update
*/
struct drm_atomic_state {
@@ -178,6 +227,8 @@ struct drm_atomic_state {
struct __drm_crtcs_state *crtcs;
int num_connector;
struct __drm_connnectors_state *connectors;
+ int num_private_objs;
+ struct __drm_private_objs_state *private_objs;
struct drm_modeset_acquire_ctx *acquire_ctx;
@@ -270,6 +321,11 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
struct drm_connector_state *state, struct drm_property *property,
uint64_t val);
+void * __must_check
+drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
+ void *obj,
+ const struct drm_private_state_funcs *funcs);
+
/**
* drm_atomic_get_existing_crtc_state - get crtc state, if it exists
* @state: global atomic state object
@@ -755,6 +811,51 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
for_each_if (plane)
/**
+ * __for_each_private_obj - iterate over all private objects
+ * @__state: &struct drm_atomic_state pointer
+ * @obj: private object iteration cursor
+ * @obj_state: private object state iteration cursor
+ * @__i: int iteration cursor, for macro-internal use
+ * @__funcs: &struct drm_private_state_funcs iteration cursor
+ *
+ * This macro iterates over the array containing private object data in atomic
+ * state
+ */
+#define __for_each_private_obj(__state, obj, obj_state, __i, __funcs) \
+ for ((__i) = 0; \
+ (__i) < (__state)->num_private_objs && \
+ ((obj) = (__state)->private_objs[__i].obj, \
+ (__funcs) = (__state)->private_objs[__i].funcs, \
+ (obj_state) = (__state)->private_objs[__i].obj_state, \
+ 1); \
+ (__i)++) \
+
+/**
+ * for_each_private_obj - iterate over a specify type of private object
+ * @__state: &struct drm_atomic_state pointer
+ * @obj_funcs: &struct drm_private_state_funcs function table to filter
+ * private objects
+ * @obj: private object iteration cursor
+ * @obj_state: private object state iteration cursor
+ * @__i: int iteration cursor, for macro-internal use
+ * @__funcs: &struct drm_private_state_funcs iteration cursor
+ *
+ * This macro iterates over the private objects state array while filtering the
+ * objects based on the vfunc table that is passed as @obj_funcs. New macros
+ * can be created by passing in the vfunc table associated with a specific
+ * private object.
+ */
+#define for_each_private_obj(__state, obj_funcs, obj, obj_state, __i, __funcs) \
+ for ((__i) = 0; \
+ (__i) < (__state)->num_private_objs && \
+ ((obj) = (__state)->private_objs[__i].obj, \
+ (__funcs) = (__state)->private_objs[__i].funcs, \
+ (obj_state) = (__state)->private_objs[__i].obj_state, \
+ 1); \
+ (__i)++) \
+ for_each_if (__funcs == obj_funcs)
+
+/**
* drm_atomic_crtc_needs_modeset - compute combined modeset need
* @state: &drm_crtc_state for the CRTC
*
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v6 2/5] drm/dp: Introduce MST topology state to track available link bandwidth
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
@ 2017-04-04 19:30 ` Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
` (2 subsequent siblings)
3 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-04-04 19:30 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Link bandwidth is shared between multiple display streams in DP MST
configurations. The DP MST topology manager structure maintains the
shared link bandwidth for a primary link directly connected to the GPU. For
atomic modesetting drivers, checking if there is sufficient link bandwidth
for a mode needs to be done during the atomic_check phase to avoid failed
modesets. Let's encapsulate the available link bw information in a
private state structure so that bw can be allocated and released atomically
for each of the ports sharing the primary link.
v3: WARN_ON() if connection_mutex is not held (Archit)
v2: Included kernel doc, moved state initialization and switched to
kmemdup() for allocation (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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 75 +++++++++++++++++++++++++++++++++++
include/drm/drm_dp_mst_helper.h | 20 ++++++++++
2 files changed, 95 insertions(+)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index d3fc7e4..0ad0baa 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2936,6 +2936,69 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
(*mgr->cbs->hotplug)(mgr);
}
+void *drm_dp_mst_duplicate_state(struct drm_atomic_state *state, void *obj)
+{
+ struct drm_dp_mst_topology_mgr *mgr = obj;
+ struct drm_dp_mst_topology_state *new_mst_state;
+
+ if (WARN_ON(!mgr->state))
+ return NULL;
+
+ new_mst_state = kmemdup(mgr->state, sizeof(*new_mst_state), GFP_KERNEL);
+ if (new_mst_state)
+ new_mst_state->state = state;
+ return new_mst_state;
+}
+
+void drm_dp_mst_swap_state(void *obj, void **obj_state_ptr)
+{
+ struct drm_dp_mst_topology_mgr *mgr = obj;
+ struct drm_dp_mst_topology_state **topology_state_ptr;
+
+ topology_state_ptr = (struct drm_dp_mst_topology_state **)obj_state_ptr;
+
+ mgr->state->state = (*topology_state_ptr)->state;
+ swap(*topology_state_ptr, mgr->state);
+ mgr->state->state = NULL;
+}
+
+void drm_dp_mst_destroy_state(void *obj_state)
+{
+ kfree(obj_state);
+}
+
+static const struct drm_private_state_funcs mst_state_funcs = {
+ .duplicate_state = drm_dp_mst_duplicate_state,
+ .swap_state = drm_dp_mst_swap_state,
+ .destroy_state = drm_dp_mst_destroy_state,
+};
+
+/**
+ * drm_atomic_get_mst_topology_state: get MST topology state
+ *
+ * @state: global atomic state
+ * @mgr: MST topology manager, also the private object in this case
+ *
+ * This function wraps drm_atomic_get_priv_obj_state() passing in the MST atomic
+ * state vtable so that the private object state returned is that of a MST
+ * topology object. Also, drm_atomic_get_private_obj_state() expects the caller
+ * to care of the locking, so warn if don't hold the connection_mutex.
+ *
+ * RETURNS:
+ *
+ * The MST topology state or error pointer.
+ */
+struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr)
+{
+ struct drm_device *dev = mgr->dev;
+
+ WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+ return drm_atomic_get_private_obj_state(state, mgr,
+ &mst_state_funcs);
+}
+EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
+
/**
* drm_dp_mst_topology_mgr_init - initialise a topology manager
* @mgr: manager struct to initialise
@@ -2980,6 +3043,15 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
if (test_calc_pbn_mode() < 0)
DRM_ERROR("MST PBN self-test failed\n");
+ mgr->state = kzalloc(sizeof(*mgr->state), GFP_KERNEL);
+ if (mgr->state == NULL)
+ return -ENOMEM;
+ mgr->state->mgr = mgr;
+
+ /* max. time slots - one slot for MTP header */
+ mgr->state->avail_slots = 63;
+ mgr->funcs = &mst_state_funcs;
+
return 0;
}
EXPORT_SYMBOL(drm_dp_mst_topology_mgr_init);
@@ -3000,6 +3072,9 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
mutex_unlock(&mgr->payload_lock);
mgr->dev = NULL;
mgr->aux = NULL;
+ kfree(mgr->state);
+ mgr->state = NULL;
+ mgr->funcs = NULL;
}
EXPORT_SYMBOL(drm_dp_mst_topology_mgr_destroy);
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 5b02476..0b371df 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -24,6 +24,7 @@
#include <linux/types.h>
#include <drm/drm_dp_helper.h>
+#include <drm/drm_atomic.h>
struct drm_dp_mst_branch;
@@ -403,6 +404,12 @@ struct drm_dp_payload {
int vcpi;
};
+struct drm_dp_mst_topology_state {
+ int avail_slots;
+ struct drm_atomic_state *state;
+ struct drm_dp_mst_topology_mgr *mgr;
+};
+
/**
* struct drm_dp_mst_topology_mgr - DisplayPort MST manager
*
@@ -481,6 +488,16 @@ struct drm_dp_mst_topology_mgr {
int pbn_div;
/**
+ * @state: State information for topology manager
+ */
+ struct drm_dp_mst_topology_state *state;
+
+ /**
+ * @funcs: Atomic helper callbacks
+ */
+ const struct drm_private_state_funcs *funcs;
+
+ /**
* @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and
* &drm_dp_sideband_msg_tx.state once they are queued
*/
@@ -596,4 +613,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
+struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr);
+
#endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v6 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
@ 2017-04-04 19:30 ` Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 5/5] drm/dp: Track MST link bandwidth Dhinakaran Pandiyan
3 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-04-04 19:30 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
drm_dp_atomic_find_vcpi_slots() should be called from ->atomic_check() to
check there are sufficient vcpi slots for a mode and to add that to the
state. This should be followed by a call to drm_dp_mst_allocate_vcpi()
in ->atomic_commit() to initialize a struct vcpi for the port.
drm_dp_atomic_release_vcpi_slots() should be called from
->atomic_check() to release a port's vcpi slot allocation from the
state.
Drivers that do not make use of this atomic helper are expected to call
drm_dp_find_vcpi_slots() instead before calling
drm_dp_mst_allocate_vcpi().
v3: drm_dp_atomic_release_vcpi_slots() now needs to know how many slots
to release as we may not have a valid reference to port.
v2:
Added checks for verifying the port reference is valid
Moved get_mst_topology_state() into the helpers (Daniel)
Changed find_vcpi_slots() to not depend on current allocation
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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 76 +++++++++++++++++++++++++++++++++++
include/drm/drm_dp_mst_helper.h | 6 +++
2 files changed, 82 insertions(+)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 0ad0baa..cf01ed3 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2498,6 +2498,82 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
}
/**
+ * drm_dp_atomic_find_vcpi_slots() - Find and add vcpi slots to the state
+ * @state: global atomic state
+ * @mgr: MST topology manager for the port
+ * @port: port to find vcpi slots for
+ * @pbn: bandwidth required for the mode in PBN
+ *
+ * RETURNS:
+ * Total slots in the atomic state assigned for this port or error
+ */
+int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int pbn)
+{
+ struct drm_dp_mst_topology_state *topology_state;
+ int req_slots;
+
+ topology_state = drm_atomic_get_mst_topology_state(state, mgr);
+ if (topology_state == NULL)
+ return -ENOMEM;
+
+ port = drm_dp_get_validated_port_ref(mgr, port);
+ if (port == NULL)
+ return -EINVAL;
+ req_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
+ DRM_DEBUG_KMS("vcpi slots req=%d, avail=%d\n",
+ req_slots, topology_state->avail_slots);
+
+ if (req_slots > topology_state->avail_slots) {
+ drm_dp_put_port(port);
+ return -ENOSPC;
+ }
+
+ topology_state->avail_slots -= req_slots;
+ DRM_DEBUG_KMS("vcpi slots avail=%d", topology_state->avail_slots);
+
+ drm_dp_put_port(port);
+ return req_slots;
+}
+EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
+
+/**
+ * drm_dp_atomic_release_vcpi_slots() - Release allocated vcpi slots
+ * @state: global atomic state
+ * @mgr: MST topology manager for the port
+ * @port: port to release the vcpi slots for
+ * @slots: number of vcpi slots to release for @port
+ *
+ * RETURNS:
+ * 0 if @slots were added back to &drm_dp_mst_topology_state->avail_slots or
+ * negative error code
+ */
+int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int slots)
+{
+ struct drm_dp_mst_topology_state *topology_state;
+
+ topology_state = drm_atomic_get_mst_topology_state(state, mgr);
+ if (topology_state == NULL)
+ return -ENOMEM;
+
+ /* We cannot rely on port->vcpi.num_slots to update
+ * topology_state->avail_slots as the port may not exist if the parent
+ * branch device was unplugged. This should be fixed by tracking
+ * per-port slot allocation in drm_dp_mst_topology_state instead of
+ * depending on the caller to tell us how many slots to release.
+ */
+ topology_state->avail_slots += slots;
+ DRM_DEBUG_KMS("vcpi slots released=%d, avail=%d\n",
+ slots, topology_state->avail_slots);
+
+ return 0;
+}
+EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+
+/**
* drm_dp_mst_allocate_vcpi() - Allocate a virtual channel
* @mgr: manager for this port
* @port: port to allocate a virtual channel for.
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 0b371df..c781ff7 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -615,5 +615,11 @@ void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
struct drm_dp_mst_topology_mgr *mgr);
+int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int pbn);
+int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
+ struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, int slots);
#endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v6 4/5] drm: Connector helper function to release resources
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
@ 2017-04-04 19:30 ` Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 5/5] drm/dp: Track MST link bandwidth Dhinakaran Pandiyan
3 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-04-04 19:30 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Having an ->atomic_release callback is useful to release shared resources
that get allocated in compute_config(). This function is expected to be
called in the atomic_check() phase before new resources are acquired.
v5: Return an int (Maarten)
v4: Document that the function is conditionally called and before
other atomic_checks() (Daniel)
v3: Use the new 'for_each_oldnew_connector_in_state()' macro.
v2: Moved the caller hunk to this patch (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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++++++++++++++++++
include/drm/drm_modeset_helper_vtables.h | 20 ++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index d14094d..57d2e50 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -586,6 +586,28 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
}
}
+ for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) {
+ const struct drm_connector_helper_funcs *conn_funcs;
+ struct drm_crtc_state *crtc_state;
+
+ conn_funcs = connector->helper_private;
+ if (!conn_funcs->atomic_release)
+ continue;
+
+ if (!old_connector_state->crtc)
+ continue;
+
+ crtc_state = drm_atomic_get_existing_crtc_state(state, old_connector_state->crtc);
+
+ if (crtc_state->connectors_changed ||
+ crtc_state->mode_changed ||
+ (crtc_state->active_changed && !crtc_state->active)) {
+ ret = conn_funcs->atomic_release(connector, new_connector_state);
+ if (ret != 0)
+ return ret;
+ }
+ }
+
return mode_fixup(state);
}
EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 091c422..36a4b16 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -836,6 +836,26 @@ struct drm_connector_helper_funcs {
*/
struct drm_encoder *(*atomic_best_encoder)(struct drm_connector *connector,
struct drm_connector_state *connector_state);
+
+ /**
+ * @atomic_release:
+ *
+ * This function is conditionally called to release shared resources
+ * when the attached CRTC's mode changes or it's connectors change or
+ * becomes inactive. It is called before the corresponding
+ * &drm_crtc_helper_funcs.atomic_check or
+ * &drm_crtc_helper_funcs.mode_fixup hooks are called.
+ *
+ * NOTE:
+ *
+ * This function is called in the check phase of an atomic update.
+ *
+ * RETURNS:
+ *
+ * 0 on success or negative error codes on failure.
+ */
+ int (*atomic_release)(struct drm_connector *connector,
+ struct drm_connector_state *connector_state);
};
/**
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v6 5/5] drm/dp: Track MST link bandwidth
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
` (2 preceding siblings ...)
2017-04-04 19:30 ` [PATCH v6 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
@ 2017-04-04 19:30 ` Dhinakaran Pandiyan
3 siblings, 0 replies; 18+ messages in thread
From: Dhinakaran Pandiyan @ 2017-04-04 19:30 UTC (permalink / raw)
To: intel-gfx
Cc: Archit Taneja, Daniel Vetter, dri-devel, Pandiyan, Dhinakaran,
Harry Wentland
From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Use the added helpers to track MST link bandwidth for atomic modesets.
Link bw is acquired in the ->atomic_check() phase when CRTCs are being
enabled with drm_atomic_find_vcpi_slots() instead of drm_find_vcpi_slots().
Similarly, link bw is released during ->atomic_check() with the connector
helper callback ->atomic_release() when CRTCs are disabled.
v4: Return an int from intel_dp_mst_atomic_release() (Maarten)
v3:
Handled the case where ->atomic_release() is called more than once
during an atomic_check() for the same state.
v2:
Squashed atomic_release() implementation and caller (Daniel)
Fixed logic for connector-crtc switching case (Daniel)
Fixed logic for suspend-resume case.
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>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
drivers/gpu/drm/i915/intel_dp_mst.c | 48 +++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index c1f62eb..1db3845 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -39,9 +39,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
struct intel_dp *intel_dp = &intel_dig_port->dp;
struct intel_connector *connector =
to_intel_connector(conn_state->connector);
- struct drm_atomic_state *state;
+ struct drm_atomic_state *state = pipe_config->base.state;
int bpp;
- int lane_count, slots;
+ int lane_count, slots = 0;
const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
int mst_pbn;
@@ -57,30 +57,63 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
* seem to suggest we should do otherwise.
*/
lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
-
pipe_config->lane_count = lane_count;
pipe_config->pipe_bpp = bpp;
pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
- state = pipe_config->base.state;
-
if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, connector->port))
pipe_config->has_audio = true;
- mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
+ mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
pipe_config->pbn = mst_pbn;
- slots = drm_dp_find_vcpi_slots(&intel_dp->mst_mgr, mst_pbn);
intel_link_compute_m_n(bpp, lane_count,
adjusted_mode->crtc_clock,
pipe_config->port_clock,
&pipe_config->dp_m_n);
+ if (pipe_config->base.active) {
+ slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
+ connector->port, mst_pbn);
+ if (slots < 0) {
+ DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots);
+ return false;
+ }
+ }
pipe_config->dp_m_n.tu = slots;
return true;
+}
+static int intel_dp_mst_atomic_release(struct drm_connector *connector,
+ struct drm_connector_state *conn_state)
+{
+ struct intel_dp_mst_encoder *intel_mst;
+ struct drm_dp_mst_topology_mgr *mgr;
+ struct drm_encoder *encoder;
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+ struct drm_atomic_state *state = conn_state->state;
+ struct drm_crtc *old_crtc = connector->state->crtc;
+ struct intel_crtc_state *old_crtc_state =
+ to_intel_crtc_state(old_crtc->state);
+ int slots;
+ int ret = 0;
+
+ encoder = connector->state->best_encoder;
+ intel_mst = enc_to_mst(encoder);
+ mgr = &intel_mst->primary->dp.mst_mgr;
+
+ slots = old_crtc_state->dp_m_n.tu;
+ if (slots > 0) {
+ ret = drm_dp_atomic_release_vcpi_slots(state, mgr,
+ intel_connector->port, slots);
+ if (ret)
+ DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret);
+ else
+ old_crtc_state->dp_m_n.tu = 0;
+ }
+ return ret;
}
static void intel_mst_disable_dp(struct intel_encoder *encoder,
@@ -387,6 +420,7 @@ static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_fun
.mode_valid = intel_dp_mst_mode_valid,
.atomic_best_encoder = intel_mst_atomic_best_encoder,
.best_encoder = intel_mst_best_encoder,
+ .atomic_release = intel_dp_mst_atomic_release,
};
static void intel_dp_mst_encoder_destroy(struct drm_encoder *encoder)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6)
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
` (5 preceding siblings ...)
2017-03-30 11:17 ` ✗ Fi.CI.BAT: warning for Adding driver-private objects to atomic state Patchwork
@ 2017-04-04 20:36 ` Patchwork
2017-04-04 22:35 ` Pandiyan, Dhinakaran
6 siblings, 1 reply; 18+ messages in thread
From: Patchwork @ 2017-04-04 20:36 UTC (permalink / raw)
To: Pandiyan, Dhinakaran; +Cc: intel-gfx
== Series Details ==
Series: Adding driver-private objects to atomic state (rev6)
URL : https://patchwork.freedesktop.org/series/22177/
State : failure
== Summary ==
CC drivers/usb/host/xhci-dbg.o
CC net/ipv4/udp_diag.o
CC net/ipv4/tcp_cubic.o
CC net/ipv4/xfrm4_policy.o
CC drivers/usb/host/xhci-trace.o
CC drivers/usb/host/xhci-pci.o
CC net/ipv4/xfrm4_input.o
CC net/ipv4/xfrm4_state.o
CC net/ipv4/xfrm4_output.o
CC net/ipv4/xfrm4_protocol.o
LD drivers/video/backlight/built-in.o
LD drivers/mmc/core/mmc_core.o
LD drivers/mmc/host/built-in.o
LD drivers/nvme/host/nvme.o
LD drivers/nvme/host/built-in.o
LD drivers/nvme/built-in.o
LD drivers/pci/pcie/pcieportdrv.o
LD net/key/built-in.o
LD drivers/rtc/built-in.o
LD net/unix/unix.o
LD net/netlink/built-in.o
LD net/unix/built-in.o
LD lib/lz4/built-in.o
LD [M] drivers/ssb/ssb.o
LD [M] drivers/misc/mei/mei-me.o
LD drivers/md/dm-mod.o
LD drivers/misc/built-in.o
LD drivers/tty/serial/8250/8250.o
LD kernel/events/built-in.o
LD drivers/pci/pcie/aer/aerdriver.o
LD drivers/pci/pcie/aer/built-in.o
LD drivers/usb/storage/usb-storage.o
LD drivers/pci/pcie/built-in.o
LD drivers/usb/storage/built-in.o
LD drivers/mmc/core/mmc_block.o
LD drivers/mmc/core/built-in.o
LD drivers/mmc/built-in.o
LD [M] drivers/net/ethernet/broadcom/genet/genet.o
LD [M] drivers/usb/serial/usbserial.o
LD drivers/video/fbdev/core/fb.o
AR lib/lib.a
LD net/packet/built-in.o
LD drivers/video/fbdev/core/built-in.o
EXPORTS lib/lib-ksyms.o
LD kernel/sched/built-in.o
LD drivers/thermal/thermal_sys.o
LD drivers/thermal/built-in.o
LD lib/built-in.o
LD kernel/built-in.o
LD [M] sound/pci/hda/snd-hda-codec-generic.o
LD sound/pci/built-in.o
LD net/ipv6/ipv6.o
LD net/ipv6/built-in.o
LD drivers/iommu/built-in.o
LD drivers/tty/serial/8250/8250_base.o
LD drivers/tty/serial/8250/built-in.o
LD sound/built-in.o
LD drivers/tty/serial/built-in.o
LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o
LD drivers/usb/gadget/libcomposite.o
LD drivers/video/fbdev/built-in.o
LD drivers/usb/gadget/udc/udc-core.o
LD drivers/pci/built-in.o
LD drivers/usb/gadget/udc/built-in.o
LD drivers/usb/gadget/built-in.o
LD net/xfrm/built-in.o
LD drivers/video/console/built-in.o
LD drivers/video/built-in.o
LD drivers/scsi/scsi_mod.o
LD drivers/spi/built-in.o
LD drivers/scsi/sd_mod.o
LD drivers/scsi/built-in.o
LD drivers/usb/core/usbcore.o
LD drivers/usb/core/built-in.o
CC arch/x86/kernel/cpu/capflags.o
LD arch/x86/kernel/cpu/built-in.o
LD [M] drivers/net/ethernet/intel/e1000/e1000.o
LD arch/x86/kernel/built-in.o
LD drivers/tty/vt/built-in.o
LD fs/btrfs/btrfs.o
LD drivers/tty/built-in.o
LD arch/x86/built-in.o
LD fs/btrfs/built-in.o
LD net/ipv4/built-in.o
LD fs/ext4/ext4.o
LD fs/ext4/built-in.o
LD drivers/md/md-mod.o
LD drivers/md/built-in.o
LD fs/built-in.o
LD [M] drivers/net/ethernet/intel/igb/igb.o
LD net/core/built-in.o
LD drivers/usb/host/xhci-hcd.o
LD net/built-in.o
LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o
LD drivers/usb/host/built-in.o
LD drivers/usb/built-in.o
LD drivers/net/ethernet/built-in.o
LD drivers/net/built-in.o
Makefile:1002: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6)
2017-04-04 20:36 ` ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6) Patchwork
@ 2017-04-04 22:35 ` Pandiyan, Dhinakaran
0 siblings, 0 replies; 18+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-04-04 22:35 UTC (permalink / raw)
To: intel-gfx
On Tue, 2017-04-04 at 20:36 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: Adding driver-private objects to atomic state (rev6)
> URL : https://patchwork.freedesktop.org/series/22177/
> State : failure
>
I guess the in-reply-to confused CI. Here's the result for the same
series sent to try-bot.
https://lists.freedesktop.org/archives/intel-gfx-trybot/2017-April/017329.html
-DK
> == Summary ==
>
> CC drivers/usb/host/xhci-dbg.o
> CC net/ipv4/udp_diag.o
> CC net/ipv4/tcp_cubic.o
> CC net/ipv4/xfrm4_policy.o
> CC drivers/usb/host/xhci-trace.o
> CC drivers/usb/host/xhci-pci.o
> CC net/ipv4/xfrm4_input.o
> CC net/ipv4/xfrm4_state.o
> CC net/ipv4/xfrm4_output.o
> CC net/ipv4/xfrm4_protocol.o
> LD drivers/video/backlight/built-in.o
> LD drivers/mmc/core/mmc_core.o
> LD drivers/mmc/host/built-in.o
> LD drivers/nvme/host/nvme.o
> LD drivers/nvme/host/built-in.o
> LD drivers/nvme/built-in.o
> LD drivers/pci/pcie/pcieportdrv.o
> LD net/key/built-in.o
> LD drivers/rtc/built-in.o
> LD net/unix/unix.o
> LD net/netlink/built-in.o
> LD net/unix/built-in.o
> LD lib/lz4/built-in.o
> LD [M] drivers/ssb/ssb.o
> LD [M] drivers/misc/mei/mei-me.o
> LD drivers/md/dm-mod.o
> LD drivers/misc/built-in.o
> LD drivers/tty/serial/8250/8250.o
> LD kernel/events/built-in.o
> LD drivers/pci/pcie/aer/aerdriver.o
> LD drivers/pci/pcie/aer/built-in.o
> LD drivers/usb/storage/usb-storage.o
> LD drivers/pci/pcie/built-in.o
> LD drivers/usb/storage/built-in.o
> LD drivers/mmc/core/mmc_block.o
> LD drivers/mmc/core/built-in.o
> LD drivers/mmc/built-in.o
> LD [M] drivers/net/ethernet/broadcom/genet/genet.o
> LD [M] drivers/usb/serial/usbserial.o
> LD drivers/video/fbdev/core/fb.o
> AR lib/lib.a
> LD net/packet/built-in.o
> LD drivers/video/fbdev/core/built-in.o
> EXPORTS lib/lib-ksyms.o
> LD kernel/sched/built-in.o
> LD drivers/thermal/thermal_sys.o
> LD drivers/thermal/built-in.o
> LD lib/built-in.o
> LD kernel/built-in.o
> LD [M] sound/pci/hda/snd-hda-codec-generic.o
> LD sound/pci/built-in.o
> LD net/ipv6/ipv6.o
> LD net/ipv6/built-in.o
> LD drivers/iommu/built-in.o
> LD drivers/tty/serial/8250/8250_base.o
> LD drivers/tty/serial/8250/built-in.o
> LD sound/built-in.o
> LD drivers/tty/serial/built-in.o
> LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o
> LD drivers/usb/gadget/libcomposite.o
> LD drivers/video/fbdev/built-in.o
> LD drivers/usb/gadget/udc/udc-core.o
> LD drivers/pci/built-in.o
> LD drivers/usb/gadget/udc/built-in.o
> LD drivers/usb/gadget/built-in.o
> LD net/xfrm/built-in.o
> LD drivers/video/console/built-in.o
> LD drivers/video/built-in.o
> LD drivers/scsi/scsi_mod.o
> LD drivers/spi/built-in.o
> LD drivers/scsi/sd_mod.o
> LD drivers/scsi/built-in.o
> LD drivers/usb/core/usbcore.o
> LD drivers/usb/core/built-in.o
> CC arch/x86/kernel/cpu/capflags.o
> LD arch/x86/kernel/cpu/built-in.o
> LD [M] drivers/net/ethernet/intel/e1000/e1000.o
> LD arch/x86/kernel/built-in.o
> LD drivers/tty/vt/built-in.o
> LD fs/btrfs/btrfs.o
> LD drivers/tty/built-in.o
> LD arch/x86/built-in.o
> LD fs/btrfs/built-in.o
> LD net/ipv4/built-in.o
> LD fs/ext4/ext4.o
> LD fs/ext4/built-in.o
> LD drivers/md/md-mod.o
> LD drivers/md/built-in.o
> LD fs/built-in.o
> LD [M] drivers/net/ethernet/intel/igb/igb.o
> LD net/core/built-in.o
> LD drivers/usb/host/xhci-hcd.o
> LD net/built-in.o
> LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o
> LD drivers/usb/host/built-in.o
> LD drivers/usb/built-in.o
> LD drivers/net/ethernet/built-in.o
> LD drivers/net/built-in.o
> Makefile:1002: recipe for target 'drivers' failed
> make: *** [drivers] Error 2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2017-04-04 22:35 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 8:42 [PATCH v5 0/5] Adding driver-private objects to atomic state Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 1/5] drm: Add " Dhinakaran Pandiyan
2017-04-01 5:46 ` kbuild test robot
2017-03-30 8:42 ` [PATCH v5 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
2017-04-04 1:46 ` Pandiyan, Dhinakaran
2017-03-30 8:42 ` [PATCH v5 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
2017-03-30 10:36 ` Maarten Lankhorst
2017-04-01 2:37 ` Pandiyan, Dhinakaran
2017-04-04 19:30 ` [PATCH v6 1/5] drm: Add driver-private objects to atomic state Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 2/5] drm/dp: Introduce MST topology state to track available link bandwidth Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 3/5] drm/dp: Add DP MST helpers to atomically find and release vcpi slots Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 4/5] drm: Connector helper function to release resources Dhinakaran Pandiyan
2017-04-04 19:30 ` [PATCH v6 5/5] drm/dp: Track MST link bandwidth Dhinakaran Pandiyan
2017-03-30 8:42 ` [PATCH v5 " Dhinakaran Pandiyan
2017-03-30 11:17 ` ✗ Fi.CI.BAT: warning for Adding driver-private objects to atomic state Patchwork
2017-04-04 20:36 ` ✗ Fi.CI.BAT: failure for Adding driver-private objects to atomic state (rev6) Patchwork
2017-04-04 22:35 ` Pandiyan, Dhinakaran
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.