Add new properties to specify width and height for writeback.
Signed-off-by: Ben Davis <ben.davis@xxxxxxx>
---
drivers/gpu/drm/drm_atomic_uapi.c | 8 ++++++++
drivers/gpu/drm/drm_writeback.c | 30 ++++++++++++++++++++++++++++++
include/drm/drm_connector.h | 4 ++++
include/drm/drm_mode_config.h | 10 ++++++++++
4 files changed, 52 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index d520a04..064d986 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -765,6 +765,10 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
return -EINVAL;
}
state->content_protection = val;
+ } else if (property == config->prop_writeback_dest_w) {
+ state->writeback_dest_w = val;
+ } else if (property == config->prop_writeback_dest_h) {
+ state->writeback_dest_h = val;
} else if (property == config->writeback_fb_id_property) {
struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL, val);
int ret = drm_atomic_set_writeback_fb_for_connector(state, fb);
@@ -837,6 +841,10 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
*val = state->scaling_mode;
} else if (property == connector->content_protection_property) {
*val = state->content_protection;
+ } else if (property == config->prop_writeback_dest_w) {
+ *val = state->writeback_dest_w;
+ } else if (property == config->prop_writeback_dest_h) {
+ *val = state->writeback_dest_h;
} else if (property == config->writeback_fb_id_property) {
/* Writeback framebuffer is one-shot, write and forget */
*val = 0;
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index c20e6fe..2d7ee22 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -74,6 +74,14 @@
* applications making use of writeback connectors *always* retrieve an
* out-fence for the commit and use it appropriately.
* From userspace, this property will always read as zero.
+ *
+ * "WRITEBACK_DEST_W":
+ * The width of the composition to write back. 0 acts as default. If
+ * non-zero the composition will be scaled to match the given width.
+ *
+ * "WRITEBACK_DEST_H":
+ * The height of the composition to write back. 0 acts as default. If
+ * non-zero the composition will be scaled to match the given height.
*/
#define fence_to_wb_connector(x) container_of(x->lock, \
@@ -141,6 +149,22 @@ static int create_writeback_properties(struct drm_device *dev)
dev->mode_config.writeback_out_fence_ptr_property = prop;
}
+ if (!dev->mode_config.prop_writeback_dest_w) {
+ prop = drm_property_create_range(dev, DRM_MODE_PROP_ATOMIC,
+ "WRITEBACK_DEST_W", 1, UINT_MAX);
+ if (!prop)
+ return -ENOMEM;
+ dev->mode_config.prop_writeback_dest_w = prop;
+ }
+
+ if (!dev->mode_config.prop_writeback_dest_h) {
+ prop = drm_property_create_range(dev, DRM_MODE_PROP_ATOMIC,
+ "WRITEBACK_DEST_H", 1, UINT_MAX);
+ if (!prop)
+ return -ENOMEM;
+ dev->mode_config.prop_writeback_dest_h = prop;
+ }
+
return 0;
}
@@ -225,6 +249,12 @@ int drm_writeback_connector_init(struct drm_device *dev,
drm_object_attach_property(&connector->base,
config->writeback_pixel_formats_property,
blob->base.id);
+
+ drm_object_attach_property(&connector->base,
+ config->prop_writeback_dest_w, 0);
+ drm_object_attach_property(&connector->base,
+ config->prop_writeback_dest_h, 0);
+
wb_connector->pixel_formats_blob_ptr = blob;
return 0;
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 8fe22ab..c956960 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -515,6 +515,10 @@ struct drm_connector_state {
*/
struct drm_writeback_job *writeback_job;
+ /** @writeback_dest_w: width of plane to write to wb buffer */
+ /** @writeback_dest_h: height of plane to write to wb buffer */
+ uint32_t writeback_dest_w, writeback_dest_h;
+
/**
* @max_requested_bpc: Connector property to limit the maximum bit
* depth of the pixels.
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 7f60e8e..5e30a58 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -622,6 +622,16 @@ struct drm_mode_config {
*/
struct drm_property *prop_crtc_h;
/**
+ * @prop_writeback_dest_w: Writeback connector property for the plane
+ * destination position in the writeback buffer.
+ */
+ struct drm_property *prop_writeback_dest_w;
+ /**
+ * @prop_writeback_dest_h: Writeback connector property for the plane
+ * destination position in the writeback buffer.
+ */
+ struct drm_property *prop_writeback_dest_h;
+ /**
* @prop_fb_id: Default atomic plane property to specify the
* &drm_framebuffer.
*/
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
