mirror of https://gitee.com/openkylin/linux.git
drm/omap: remove no-op cleanup code
The driver sets crtc and plane rotation properties back to 0 degrees in dev_lastclose() using drm_object_property_set_value(). drm_object_property_set_value() doesn't do anything with atomic drivers, and a recent change added WARN_ON() when atomic driver calls the function. So remove the code. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
parent
f64eafa0c8
commit
4161f200ff
|
@ -464,44 +464,11 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)
|
||||||
*/
|
*/
|
||||||
static void dev_lastclose(struct drm_device *dev)
|
static void dev_lastclose(struct drm_device *dev)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
|
|
||||||
/* we don't support vga_switcheroo.. so just make sure the fbdev
|
|
||||||
* mode is active
|
|
||||||
*/
|
|
||||||
struct omap_drm_private *priv = dev->dev_private;
|
struct omap_drm_private *priv = dev->dev_private;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
DBG("lastclose: dev=%p", dev);
|
DBG("lastclose: dev=%p", dev);
|
||||||
|
|
||||||
/* need to restore default rotation state.. not sure
|
|
||||||
* if there is a cleaner way to restore properties to
|
|
||||||
* default state? Maybe a flag that properties should
|
|
||||||
* automatically be restored to default state on
|
|
||||||
* lastclose?
|
|
||||||
*/
|
|
||||||
for (i = 0; i < priv->num_crtcs; i++) {
|
|
||||||
struct drm_crtc *crtc = priv->crtcs[i];
|
|
||||||
|
|
||||||
if (!crtc->primary->rotation_property)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
drm_object_property_set_value(&crtc->base,
|
|
||||||
crtc->primary->rotation_property,
|
|
||||||
DRM_MODE_ROTATE_0);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < priv->num_planes; i++) {
|
|
||||||
struct drm_plane *plane = priv->planes[i];
|
|
||||||
|
|
||||||
if (!plane->rotation_property)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
drm_object_property_set_value(&plane->base,
|
|
||||||
plane->rotation_property,
|
|
||||||
DRM_MODE_ROTATE_0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (priv->fbdev) {
|
if (priv->fbdev) {
|
||||||
ret = drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
|
ret = drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Reference in New Issue