[PATCH v2 07/16] drm: omapdrm: gem: Remove omap_drm_private has_dmm field

[Laurent Pinchart]

The field is set to true iff the usergart field is not NULL. Test
usergart instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 drivers/gpu/drm/omapdrm/omap_drv.c   | 2 +-
 drivers/gpu/drm/omapdrm/omap_drv.h   | 1 -
 drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c   | 5 ++---
 drivers/gpu/drm/omapdrm/omap_plane.c | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 69be482e8d47..83d63d71062c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -303,7 +303,7 @@ static int omap_modeset_init_properties(struct drm_device 
*dev)
 {
        struct omap_drm_private *priv = dev->dev_private;

-       if (priv->has_dmm) {
+       if (priv->usergart) {
                dev->mode_config.rotation_property =
                        drm_mode_create_rotation_property(dev,
                                BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h 
b/drivers/gpu/drm/omapdrm/omap_drv.h
index 718f032aa052..97fcb892fdd7 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -100,7 +100,6 @@ struct omap_drm_private {
        struct list_head obj_list;

        struct omap_drm_usergart *usergart;
-       bool has_dmm;

        /* properties: */
        struct drm_property *zorder_prop;
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c 
b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index db4aa35accfc..9fb15de1207f 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -132,7 +132,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
                        mode_cmd.width * ((sizes->surface_bpp + 7) / 8),
                        mode_cmd.width, sizes->surface_bpp);

-       fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;
+       fbdev->ywrap_enabled = priv->usergart && ywrap_enabled;
        if (fbdev->ywrap_enabled) {
                /* need to align pitch to page size if using DMM scrolling */
                mode_cmd.pitches[0] = PAGE_ALIGN(mode_cmd.pitches[0]);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c 
b/drivers/gpu/drm/omapdrm/omap_gem.c
index 391bc7378f9f..8e3b415aa43b 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -787,7 +787,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,

        mutex_lock(&obj->dev->struct_mutex);

-       if (remap && is_shmem(obj) && priv->has_dmm) {
+       if (remap && is_shmem(obj) && priv->usergart) {
                if (omap_obj->paddr_cnt == 0) {
                        struct page **pages;
                        uint32_t npages = obj->size >> PAGE_SHIFT;
@@ -1393,7 +1393,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device 
*dev,

        obj = &omap_obj->base;

-       if ((flags & OMAP_BO_SCANOUT) && !priv->has_dmm) {
+       if ((flags & OMAP_BO_SCANOUT) && !priv->usergart) {
                /* attempt to allocate contiguous memory if we don't
                 * have DMM for remappign discontiguous buffers
                 */
@@ -1521,7 +1521,6 @@ void omap_gem_init(struct drm_device *dev)
        }

        priv->usergart = usergart;
-       priv->has_dmm = true;
 }

 void omap_gem_deinit(struct drm_device *dev)
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c 
b/drivers/gpu/drm/omapdrm/omap_plane.c
index 11d406b160e1..1c6ec7080f16 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -208,7 +208,7 @@ void omap_plane_install_properties(struct drm_plane *plane,
        struct drm_device *dev = plane->dev;
        struct omap_drm_private *priv = dev->dev_private;

-       if (priv->has_dmm) {
+       if (priv->usergart) {
                struct drm_property *prop = dev->mode_config.rotation_property;

                drm_object_attach_property(obj, prop, 0);
-- 
2.4.10