drm/qxl: use qxl_num_crtc directly

qdev->monitors_config->max_allowed is effectively set by the
qxl.num_heads module parameter, stored in the qxl_num_crtc variable.
Lets get rid of the indirection and use the variable qxl_num_crtc
directly.  The kernel doesn't need to dereference pointers each time it
needs the value, and when reading the code you don't have to trace where
and why qdev->monitors_config->max_allowed is set.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-16-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 3f2e253f724425387faf5bd752a06cd432fb3bef..a18afd21cc41e4f64d0f679900e57f4789cfa539 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -80,10 +80,10 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
                DRM_DEBUG_KMS("no client monitors configured\n");
                return status;
        }
-       if (num_monitors > qdev->monitors_config->max_allowed) {
+       if (num_monitors > qxl_num_crtc) {
                DRM_DEBUG_KMS("client monitors list will be truncated: %d < %d\n",
-                             qdev->monitors_config->max_allowed, num_monitors);
-               num_monitors = qdev->monitors_config->max_allowed;
+                             qxl_num_crtc, num_monitors);
+               num_monitors = qxl_num_crtc;
        } else {
                num_monitors = qdev->rom->client_monitors_config.count;
        }
@@ -96,8 +96,7 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
                return status;
        }
        /* we copy max from the client but it isn't used */
-       qdev->client_monitors_config->max_allowed =
-                               qdev->monitors_config->max_allowed;
+       qdev->client_monitors_config->max_allowed = qxl_num_crtc;
        for (i = 0 ; i < qdev->client_monitors_config->count ; ++i) {
                struct qxl_urect *c_rect =
                        &qdev->rom->client_monitors_config.heads[i];
@@ -204,7 +203,7 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector,
 
        if (!qdev->monitors_config)
                return 0;
-       if (h >= qdev->monitors_config->max_allowed)
+       if (h >= qxl_num_crtc)
                return 0;
        if (!qdev->client_monitors_config)
                return 0;
@@ -307,8 +306,7 @@ static void qxl_crtc_update_monitors_config(struct drm_crtc *crtc,
                return;
        }
 
-       if (!qdev->monitors_config ||
-           qdev->monitors_config->max_allowed <= i)
+       if (!qdev->monitors_config || qxl_num_crtc <= i)
                return;
 
        head.id = i;
@@ -350,9 +348,10 @@ static void qxl_crtc_update_monitors_config(struct drm_crtc *crtc,
        if (oldcount != qdev->monitors_config->count)
                DRM_DEBUG_KMS("active heads %d -> %d (%d total)\n",
                              oldcount, qdev->monitors_config->count,
-                             qdev->monitors_config->max_allowed);
+                             qxl_num_crtc);
 
        qdev->monitors_config->heads[i] = head;
+       qdev->monitors_config->max_allowed = qxl_num_crtc;
        qxl_send_monitors_config(qdev);
 }
 
@@ -1146,9 +1145,8 @@ int qxl_create_monitors_object(struct qxl_device *qdev)
 {
        int ret;
        struct drm_gem_object *gobj;
-       int max_allowed = qxl_num_crtc;
        int monitors_config_size = sizeof(struct qxl_monitors_config) +
-               max_allowed * sizeof(struct qxl_head);
+               qxl_num_crtc * sizeof(struct qxl_head);
 
        ret = qxl_gem_object_create(qdev, monitors_config_size, 0,
                                    QXL_GEM_DOMAIN_VRAM,
@@ -1170,9 +1168,8 @@ int qxl_create_monitors_object(struct qxl_device *qdev)
                qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);
 
        memset(qdev->monitors_config, 0, monitors_config_size);
-       qdev->monitors_config->max_allowed = max_allowed;
-
-       qdev->dumb_heads = kcalloc(max_allowed, sizeof(qdev->dumb_heads[0]), GFP_KERNEL);
+       qdev->dumb_heads = kcalloc(qxl_num_crtc, sizeof(qdev->dumb_heads[0]),
+                                  GFP_KERNEL);
        if (!qdev->dumb_heads) {
                qxl_destroy_monitors_object(qdev);
                return -ENOMEM;