Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199675
b: refs/heads/master
c: 1ca14e7
h: refs/heads/master
i:
  199673: c0363a6
  199671: 7d9498a
v: v3
  • Loading branch information
Thomas Hellstrom authored and Dave Airlie committed May 31, 2010
1 parent 8e9d80e commit e478b82
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 316ab13ae2ad603fd5e3a909524e68d98db1b1b6
refs/heads/master: 1ca14e75caae504fdf957cf0c1c4f3aafc886a60
8 changes: 0 additions & 8 deletions trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,6 @@ static int vmw_driver_unload(struct drm_device *dev)
{
struct vmw_private *dev_priv = vmw_priv(dev);

DRM_INFO(VMWGFX_DRIVER_NAME " unload.\n");

unregister_pm_notifier(&dev_priv->pm_nb);

vmw_fb_close(dev_priv);
Expand Down Expand Up @@ -555,7 +553,6 @@ static int vmw_master_create(struct drm_device *dev,
{
struct vmw_master *vmaster;

DRM_INFO("Master create.\n");
vmaster = kzalloc(sizeof(*vmaster), GFP_KERNEL);
if (unlikely(vmaster == NULL))
return -ENOMEM;
Expand All @@ -572,7 +569,6 @@ static void vmw_master_destroy(struct drm_device *dev,
{
struct vmw_master *vmaster = vmw_master(master);

DRM_INFO("Master destroy.\n");
master->driver_priv = NULL;
kfree(vmaster);
}
Expand All @@ -588,8 +584,6 @@ static int vmw_master_set(struct drm_device *dev,
struct vmw_master *vmaster = vmw_master(file_priv->master);
int ret = 0;

DRM_INFO("Master set.\n");

if (active) {
BUG_ON(active != &dev_priv->fbdev_master);
ret = ttm_vt_lock(&active->lock, false, vmw_fp->tfile);
Expand Down Expand Up @@ -631,8 +625,6 @@ static void vmw_master_drop(struct drm_device *dev,
struct vmw_master *vmaster = vmw_master(file_priv->master);
int ret;

DRM_INFO("Master drop.\n");

/**
* Make sure the master doesn't disappear while we have
* it locked.
Expand Down

0 comments on commit e478b82

Please sign in to comment.