| Message ID | 1461623608-29538-8-git-send-email-gustavo@padovan.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Apr 25, 2016 at 07:33:27PM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Create one timeline context for each CRTC to be able to handle out-fences > and signal them. It adds a few members to struct drm_crtc: fence_context, > where we store the context we get from fence_context_alloc(), the > fence seqno and the fence lock, that we pass in fence_init() to be > used by the fence. > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > --- > drivers/gpu/drm/drm_crtc.c | 29 +++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 19 +++++++++++++++++++ > 2 files changed, 48 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 65212ce..cf9750a 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -659,6 +659,32 @@ static unsigned int drm_num_crtcs(struct drm_device *dev) > return num; > } > > +static const char *drm_crtc_fence_get_driver_name(struct fence *fence) > +{ > + struct drm_crtc *crtc = fence_to_crtc(fence); > + > + return crtc->dev->driver->name; > +} > + > +static const char *drm_crtc_fence_get_timeline_name(struct fence *fence) > +{ > + struct drm_crtc *crtc = fence_to_crtc(fence); > + > + return crtc->name; > +} Is that exported to userspace? crtc->name is an internal thing, not meant for outside consumption. > + > +static bool drm_crtc_fence_enable_signaling(struct fence *fence) > +{ > + return true; > +} > + > +const struct fence_ops drm_crtc_fence_ops = { > + .get_driver_name = drm_crtc_fence_get_driver_name, > + .get_timeline_name = drm_crtc_fence_get_timeline_name, > + .enable_signaling = drm_crtc_fence_enable_signaling, > + .wait = fence_default_wait, > +}; > + > /** > * drm_crtc_init_with_planes - Initialise a new CRTC object with > * specified primary and cursor planes. > @@ -709,6 +735,9 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, > return -ENOMEM; > } > > + crtc->fence_context = fence_context_alloc(1); > + spin_lock_init(&crtc->fence_lock); > + > crtc->base.properties = &crtc->properties; > > list_add_tail(&crtc->head, &config->crtc_list); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 5ba3cda..d8c32c8 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -32,6 +32,7 @@ > #include <linux/fb.h> > #include <linux/hdmi.h> > #include <linux/media-bus-format.h> > +#include <linux/fence.h> > #include <uapi/drm/drm_mode.h> > #include <uapi/drm/drm_fourcc.h> > #include <drm/drm_modeset_lock.h> > @@ -715,6 +716,9 @@ struct drm_crtc_funcs { > * @helper_private: mid-layer private data > * @properties: property tracking for this CRTC > * @state: current atomic state for this CRTC > + * @fence_context: context for fence signalling > + * @fence_lock: fence lock for the fence context > + * @fence_seqno: seqno variable to create fences > * @acquire_ctx: per-CRTC implicit acquire context used by atomic drivers for > * legacy IOCTLs > * > @@ -771,6 +775,11 @@ struct drm_crtc { > > struct drm_crtc_state *state; > > + /* fence timelines info for DRM out-fences */ > + unsigned int fence_context; > + spinlock_t fence_lock; > + unsigned long fence_seqno; > + > /* > * For legacy crtc IOCTLs so that atomic drivers can get at the locking > * acquire context. > @@ -778,6 +787,16 @@ struct drm_crtc { > struct drm_modeset_acquire_ctx *acquire_ctx; > }; > > +extern const struct fence_ops drm_crtc_fence_ops; > + > +static inline struct drm_crtc *fence_to_crtc(struct fence *fence) > +{ > + if (fence->ops != &drm_crtc_fence_ops) > + return NULL; > + > + return container_of(fence->lock, struct drm_crtc, fence_lock); > +} > + > /** > * struct drm_connector_state - mutable connector state > * @connector: backpointer to the connector > -- > 2.5.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
2016-04-26 Ville Syrjälä <ville.syrjala@linux.intel.com>: > On Mon, Apr 25, 2016 at 07:33:27PM -0300, Gustavo Padovan wrote: > > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > > > Create one timeline context for each CRTC to be able to handle out-fences > > and signal them. It adds a few members to struct drm_crtc: fence_context, > > where we store the context we get from fence_context_alloc(), the > > fence seqno and the fence lock, that we pass in fence_init() to be > > used by the fence. > > > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > --- > > drivers/gpu/drm/drm_crtc.c | 29 +++++++++++++++++++++++++++++ > > include/drm/drm_crtc.h | 19 +++++++++++++++++++ > > 2 files changed, 48 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > > index 65212ce..cf9750a 100644 > > --- a/drivers/gpu/drm/drm_crtc.c > > +++ b/drivers/gpu/drm/drm_crtc.c > > @@ -659,6 +659,32 @@ static unsigned int drm_num_crtcs(struct drm_device *dev) > > return num; > > } > > > > +static const char *drm_crtc_fence_get_driver_name(struct fence *fence) > > +{ > > + struct drm_crtc *crtc = fence_to_crtc(fence); > > + > > + return crtc->dev->driver->name; > > +} > > + > > +static const char *drm_crtc_fence_get_timeline_name(struct fence *fence) > > +{ > > + struct drm_crtc *crtc = fence_to_crtc(fence); > > + > > + return crtc->name; > > +} > > Is that exported to userspace? crtc->name is an internal thing, not > meant for outside consumption. No. However it may be exported via debugfs at some point. Maybe have drm_crtc->timeline_name which has the obj_id instead, eg., "drm_crtc19" ? Gustavo
On Tue, Apr 26, 2016 at 11:23:06AM -0300, Gustavo Padovan wrote: > 2016-04-26 Ville Syrjälä <ville.syrjala@linux.intel.com>: > > > On Mon, Apr 25, 2016 at 07:33:27PM -0300, Gustavo Padovan wrote: > > > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > > > > > Create one timeline context for each CRTC to be able to handle out-fences > > > and signal them. It adds a few members to struct drm_crtc: fence_context, > > > where we store the context we get from fence_context_alloc(), the > > > fence seqno and the fence lock, that we pass in fence_init() to be > > > used by the fence. > > > > > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > > --- > > > drivers/gpu/drm/drm_crtc.c | 29 +++++++++++++++++++++++++++++ > > > include/drm/drm_crtc.h | 19 +++++++++++++++++++ > > > 2 files changed, 48 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > > > index 65212ce..cf9750a 100644 > > > --- a/drivers/gpu/drm/drm_crtc.c > > > +++ b/drivers/gpu/drm/drm_crtc.c > > > @@ -659,6 +659,32 @@ static unsigned int drm_num_crtcs(struct drm_device *dev) > > > return num; > > > } > > > > > > +static const char *drm_crtc_fence_get_driver_name(struct fence *fence) > > > +{ > > > + struct drm_crtc *crtc = fence_to_crtc(fence); > > > + > > > + return crtc->dev->driver->name; > > > +} > > > + > > > +static const char *drm_crtc_fence_get_timeline_name(struct fence *fence) > > > +{ > > > + struct drm_crtc *crtc = fence_to_crtc(fence); > > > + > > > + return crtc->name; > > > +} > > > > Is that exported to userspace? crtc->name is an internal thing, not > > meant for outside consumption. > > No. However it may be exported via debugfs at some point. Maybe have > drm_crtc->timeline_name which has the obj_id instead, eg., "drm_crtc19" ? I'm fine either way if it's an internal thing. So pick whichever makes people's life easier I guess.
Hi, On 26 April 2016 at 00:33, Gustavo Padovan <gustavo@padovan.org> wrote: > +static inline struct drm_crtc *fence_to_crtc(struct fence *fence) > +{ > + if (fence->ops != &drm_crtc_fence_ops) > + return NULL; Since this is (currently) only used before unconditional dereferences, maybe turn this into a BUG_ON instead of return NULL? Cheers, Daniel
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 65212ce..cf9750a 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -659,6 +659,32 @@ static unsigned int drm_num_crtcs(struct drm_device *dev) return num; } +static const char *drm_crtc_fence_get_driver_name(struct fence *fence) +{ + struct drm_crtc *crtc = fence_to_crtc(fence); + + return crtc->dev->driver->name; +} + +static const char *drm_crtc_fence_get_timeline_name(struct fence *fence) +{ + struct drm_crtc *crtc = fence_to_crtc(fence); + + return crtc->name; +} + +static bool drm_crtc_fence_enable_signaling(struct fence *fence) +{ + return true; +} + +const struct fence_ops drm_crtc_fence_ops = { + .get_driver_name = drm_crtc_fence_get_driver_name, + .get_timeline_name = drm_crtc_fence_get_timeline_name, + .enable_signaling = drm_crtc_fence_enable_signaling, + .wait = fence_default_wait, +}; + /** * drm_crtc_init_with_planes - Initialise a new CRTC object with * specified primary and cursor planes. @@ -709,6 +735,9 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, return -ENOMEM; } + crtc->fence_context = fence_context_alloc(1); + spin_lock_init(&crtc->fence_lock); + crtc->base.properties = &crtc->properties; list_add_tail(&crtc->head, &config->crtc_list); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 5ba3cda..d8c32c8 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -32,6 +32,7 @@ #include <linux/fb.h> #include <linux/hdmi.h> #include <linux/media-bus-format.h> +#include <linux/fence.h> #include <uapi/drm/drm_mode.h> #include <uapi/drm/drm_fourcc.h> #include <drm/drm_modeset_lock.h> @@ -715,6 +716,9 @@ struct drm_crtc_funcs { * @helper_private: mid-layer private data * @properties: property tracking for this CRTC * @state: current atomic state for this CRTC + * @fence_context: context for fence signalling + * @fence_lock: fence lock for the fence context + * @fence_seqno: seqno variable to create fences * @acquire_ctx: per-CRTC implicit acquire context used by atomic drivers for * legacy IOCTLs * @@ -771,6 +775,11 @@ struct drm_crtc { struct drm_crtc_state *state; + /* fence timelines info for DRM out-fences */ + unsigned int fence_context; + spinlock_t fence_lock; + unsigned long fence_seqno; + /* * For legacy crtc IOCTLs so that atomic drivers can get at the locking * acquire context. @@ -778,6 +787,16 @@ struct drm_crtc { struct drm_modeset_acquire_ctx *acquire_ctx; }; +extern const struct fence_ops drm_crtc_fence_ops; + +static inline struct drm_crtc *fence_to_crtc(struct fence *fence) +{ + if (fence->ops != &drm_crtc_fence_ops) + return NULL; + + return container_of(fence->lock, struct drm_crtc, fence_lock); +} + /** * struct drm_connector_state - mutable connector state * @connector: backpointer to the connector