diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-10-04 20:13:36 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-05 11:17:36 +0200 |
| commit | 6ea77d1384ed0c2d040a1934ecc3fd7187580931 (patch) | |
| tree | 92b4358b0e91c4bca5da8ebe42cf9d64967a6536 | |
| parent | vmwgfx: Bump driver minor to advertise support for new ioctls. (diff) | |
| download | linux-6ea77d1384ed0c2d040a1934ecc3fd7187580931.tar.xz linux-6ea77d1384ed0c2d040a1934ecc3fd7187580931.zip | |
vmwgfx: Minor cleanups
As suggested by Konrad Rzeszutek Wilk
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index a98ee19bd682..ddb5abd6ac56 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -569,9 +569,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) vmw_overlay_init(dev_priv); /* 3D Depends on Screen Objects being used. */ - DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ? - "Detected device 3D availability.\n" : - "Detected no device 3D availability.\n"); + DRM_INFO("Detected %sdevice 3D availability.\n", + vmw_fifo_have_3d(dev_priv) ? + "" : "no "); /* We might be done with the fifo now */ if (dev_priv->enable_fb) { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 0921cce44205..fc62c8798c4c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1317,18 +1317,19 @@ int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num, struct drm_device *dev = dev_priv->dev; struct vmw_display_unit *du; struct drm_connector *con; - int i; mutex_lock(&dev->mode_config.mutex); #if 0 - DRM_INFO("%s: new layout ", __func__); - for (i = 0; i < (int)num; i++) - DRM_INFO("(%i, %i %ux%u) ", rects[i].x, rects[i].y, - rects[i].w, rects[i].h); - DRM_INFO("\n"); -#else - (void)i; + { + unsigned int i; + + DRM_INFO("%s: new layout ", __func__); + for (i = 0; i < num; i++) + DRM_INFO("(%i, %i %ux%u) ", rects[i].x, rects[i].y, + rects[i].w, rects[i].h); + DRM_INFO("\n"); + } #endif list_for_each_entry(con, &dev->mode_config.connector_list, head) { |