Skip to content

Commit

Permalink
staging: omapdrm: Expose the OMAP Z-Order property through DRM
Browse files Browse the repository at this point in the history
Added support for zorder changes through DRM plane properties

Signed-off-by: Andre Renaud <andre@bluewatersys.com>
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Andre Renaud authored and Greg Kroah-Hartman committed Aug 15, 2012
1 parent 3c810c6 commit 8451b5a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/staging/omapdrm/omap_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ struct omap_drm_private {

/* properties: */
struct drm_property *rotation_prop;
struct drm_property *zorder_prop;
};

/* this should probably be in drm-core to standardize amongst drivers */
Expand Down
19 changes: 19 additions & 0 deletions drivers/staging/omapdrm/omap_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,15 @@ void omap_plane_install_properties(struct drm_plane *plane,
priv->rotation_prop = prop;
}
drm_object_attach_property(obj, prop, 0);

prop = priv->zorder_prop;
if (!prop) {
prop = drm_property_create_range(dev, 0, "zorder", 0, 3);
if (prop == NULL)
return;
priv->zorder_prop = prop;
}
drm_object_attach_property(obj, prop, 0);
}

int omap_plane_set_property(struct drm_plane *plane,
Expand All @@ -448,6 +457,16 @@ int omap_plane_set_property(struct drm_plane *plane,
DBG("%s: rotation: %02x", ovl->name, (uint32_t)val);
omap_plane->win.rotation = val;

if (ovl->is_enabled(ovl))
ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
else
ret = 0;
} else if (property == priv->zorder_prop) {
struct omap_overlay *ovl = omap_plane->ovl;

DBG("%s: zorder: %d", ovl->name, (uint32_t)val);
omap_plane->info.zorder = val;

if (ovl->is_enabled(ovl))
ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
else
Expand Down

0 comments on commit 8451b5a

Please sign in to comment.