[PATCH -next] drm/vmwgfx: Remove set but not used variable 'file_priv'

[PATCH -next] drm/vmwgfx: Remove set but not used variable 'file_priv'

[YueHaibing]

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c: In function 'vmw_event_fence_action_seq_passed':
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c:909:19: warning:
 variable 'file_priv' set but not used [-Wunused-but-set-variable]
  struct drm_file *file_priv;
  
It not used any more since 
commit fb740cf2492c ("drm: Create drm_send_event helpers")

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index f872615..301260e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -906,13 +906,10 @@ static void vmw_event_fence_action_seq_passed(struct vmw_fence_action *action)
 		container_of(action, struct vmw_event_fence_action, action);
 	struct drm_device *dev = eaction->dev;
 	struct drm_pending_event *event = eaction->event;
-	struct drm_file *file_priv;
-
 
 	if (unlikely(event = NULL))
 		return;
 
-	file_priv = event->file_priv;
 	spin_lock_irq(&dev->event_lock);
 
 	if (likely(eaction->tv_sec != NULL)) {

Re: [PATCH -next] drm/vmwgfx: Remove set but not used variable 'file_priv'

[Sinclair Yeh]

Reviewed-by: Sinclair Yeh <syeh@vmware.com>

On Fri, Oct 05, 2018 at 11:36:58AM +0000, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/gpu/drm/vmwgfx/vmwgfx_fence.c: In function 'vmw_event_fence_action_seq_passed':
> drivers/gpu/drm/vmwgfx/vmwgfx_fence.c:909:19: warning:
>  variable 'file_priv' set but not used [-Wunused-but-set-variable]
>   struct drm_file *file_priv;
>   
> It not used any more since 
> commit fb740cf2492c ("drm: Create drm_send_event helpers")
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> index f872615..301260e 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> @@ -906,13 +906,10 @@ static void vmw_event_fence_action_seq_passed(struct vmw_fence_action *action)
>  		container_of(action, struct vmw_event_fence_action, action);
>  	struct drm_device *dev = eaction->dev;
>  	struct drm_pending_event *event = eaction->event;
> -	struct drm_file *file_priv;
> -
>  
>  	if (unlikely(event == NULL))
>  		return;
>  
> -	file_priv = event->file_priv;
>  	spin_lock_irq(&dev->event_lock);
>  
>  	if (likely(eaction->tv_sec != NULL)) {
> 
> 
> 

[PATCH -next] drm/vmwgfx: Remove set but not used variable 'restart'

[YueHaibing]

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c: In function 'vmw_cmdbuf_work_func':
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c:514:7: warning:
 variable 'restart' set but not used [-Wunused-but-set-variable]

It not used any more after commit dc366364c4ef ("drm/vmwgfx: Fix multiple
command buffer context use")

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 70dab55e7888..ed15655eacd2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -511,17 +511,14 @@ static void vmw_cmdbuf_work_func(struct work_struct *work)
 		container_of(work, struct vmw_cmdbuf_man, work);
 	struct vmw_cmdbuf_header *entry, *next;
 	uint32_t dummy;
-	bool restart[SVGA_CB_CONTEXT_MAX];
 	bool send_fence = false;
 	struct list_head restart_head[SVGA_CB_CONTEXT_MAX];
 	int i;
 	struct vmw_cmdbuf_context *ctx;
 	bool global_block = false;
 
-	for_each_cmdbuf_ctx(man, i, ctx) {
+	for_each_cmdbuf_ctx(man, i, ctx)
 		INIT_LIST_HEAD(&restart_head[i]);
-		restart[i] = false;
-	}
 
 	mutex_lock(&man->error_mutex);
 	spin_lock(&man->lock);
@@ -533,7 +530,6 @@ static void vmw_cmdbuf_work_func(struct work_struct *work)
 		const char *cmd_name;
 
 		list_del_init(&entry->list);
-		restart[entry->cb_context] = true;
 		global_block = true;
 
 		if (!vmw_cmd_describe(header, &error_cmd_size, &cmd_name)) {

Re: [PATCH -next] drm/vmwgfx: Remove set but not used variable 'restart'

[Deepak Singh Rawat]

Thanks for doing this. Will include this one with next vmwgfx pull
request.

Reviewed-by: Deepak Rawat <drawat@vmware.com>

On Thu, 2019-02-14 at 02:08 +0000, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c: In function
> 'vmw_cmdbuf_work_func':
> drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c:514:7: warning:
>  variable 'restart' set but not used [-Wunused-but-set-variable]
> 
> It not used any more after commit dc366364c4ef ("drm/vmwgfx: Fix
> multiple
> command buffer context use")
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> index 70dab55e7888..ed15655eacd2 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> @@ -511,17 +511,14 @@ static void vmw_cmdbuf_work_func(struct
> work_struct *work)
>  		container_of(work, struct vmw_cmdbuf_man, work);
>  	struct vmw_cmdbuf_header *entry, *next;
>  	uint32_t dummy;
> -	bool restart[SVGA_CB_CONTEXT_MAX];
>  	bool send_fence = false;
>  	struct list_head restart_head[SVGA_CB_CONTEXT_MAX];
>  	int i;
>  	struct vmw_cmdbuf_context *ctx;
>  	bool global_block = false;
>  
> -	for_each_cmdbuf_ctx(man, i, ctx) {
> +	for_each_cmdbuf_ctx(man, i, ctx)
>  		INIT_LIST_HEAD(&restart_head[i]);
> -		restart[i] = false;
> -	}
>  
>  	mutex_lock(&man->error_mutex);
>  	spin_lock(&man->lock);
> @@ -533,7 +530,6 @@ static void vmw_cmdbuf_work_func(struct
> work_struct *work)
>  		const char *cmd_name;
>  
>  		list_del_init(&entry->list);
> -		restart[entry->cb_context] = true;
>  		global_block = true;
>  
>  		if (!vmw_cmd_describe(header, &error_cmd_size,
> &cmd_name)) {
> 
> 
> 

[PATCH -next] drm/vmwgfx: Remove set but not used variable 'fb_offset, fb_depth'

[YueHaibing]

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c: In function 'vmw_fb_init':
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c:645:29: warning:
 variable 'fb_offset' set but not used [-Wunused-but-set-variable]

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c:645:19: warning:
 variable 'fb_depth' set but not used [-Wunused-but-set-variable]

They're not used any more, so can be removed.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 2a9112515f46..86efb91f5034 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -642,12 +642,11 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
 	struct vmw_fb_par *par;
 	struct fb_info *info;
 	unsigned fb_width, fb_height;
-	unsigned fb_bpp, fb_depth, fb_offset, fb_pitch, fb_size;
+	unsigned fb_bpp, fb_pitch, fb_size;
 	struct drm_display_mode *init_mode;
 	int ret;
 
 	fb_bpp = 32;
-	fb_depth = 24;
 
 	/* XXX As shouldn't these be as well. */
 	fb_width = min(vmw_priv->fb_max_width, (unsigned)2048);
@@ -655,7 +654,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
 
 	fb_pitch = fb_width * fb_bpp / 8;
 	fb_size = fb_pitch * fb_height;
-	fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET);
 
 	info = framebuffer_alloc(sizeof(*par), device);
 	if (!info)

Re: [PATCH -next] drm/vmwgfx: Remove set but not used variable 'fb_offset, fb_depth'

[Deepak Singh Rawat]

VGhhbmtzIGZvciBkb2luZyB0aGlzLg0KDQpSZXZpZXdlZC1ieTogRGVlcGFrIFJhd2F0IDxkcmF3
YXRAdm13YXJlLmNvbT4NCg0KT24gU2F0LCAyMDE5LTAzLTIzIGF0IDAyOjQ2ICswMDAwLCBZdWVI
YWliaW5nIHdyb3RlOg0KPiBGaXhlcyBnY2MgJy1XdW51c2VkLWJ1dC1zZXQtdmFyaWFibGUnIHdh
cm5pbmc6DQo+IA0KPiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jOiBJbiBmdW5j
dGlvbiAndm13X2ZiX2luaXQnOg0KPiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5j
OjY0NToyOTogd2FybmluZzoNCj4gIHZhcmlhYmxlICdmYl9vZmZzZXQnIHNldCBidXQgbm90IHVz
ZWQgWy1XdW51c2VkLWJ1dC1zZXQtdmFyaWFibGVdDQo+IA0KPiBkcml2ZXJzL2dwdS9kcm0vdm13
Z2Z4L3Ztd2dmeF9mYi5jOjY0NToxOTogd2FybmluZzoNCj4gIHZhcmlhYmxlICdmYl9kZXB0aCcg
c2V0IGJ1dCBub3QgdXNlZCBbLVd1bnVzZWQtYnV0LXNldC12YXJpYWJsZV0NCj4gDQo+IFRoZXkn
cmUgbm90IHVzZWQgYW55IG1vcmUsIHNvIGNhbiBiZSByZW1vdmVkLg0KPiANCj4gU2lnbmVkLW9m
Zi1ieTogWXVlSGFpYmluZyA8eXVlaGFpYmluZ0BodWF3ZWkuY29tPg0KPiAtLS0NCj4gIGRyaXZl
cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZiLmMgfCA0ICstLS0NCj4gIDEgZmlsZSBjaGFuZ2Vk
LCAxIGluc2VydGlvbigrKSwgMyBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jDQo+IGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dm
eC92bXdnZnhfZmIuYw0KPiBpbmRleCAyYTkxMTI1MTVmNDYuLjg2ZWZiOTFmNTAzNCAxMDA2NDQN
Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmIuYw0KPiArKysgYi9kcml2
ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jDQo+IEBAIC02NDIsMTIgKzY0MiwxMSBAQCBp
bnQgdm13X2ZiX2luaXQoc3RydWN0IHZtd19wcml2YXRlICp2bXdfcHJpdikNCj4gIAlzdHJ1Y3Qg
dm13X2ZiX3BhciAqcGFyOw0KPiAgCXN0cnVjdCBmYl9pbmZvICppbmZvOw0KPiAgCXVuc2lnbmVk
IGZiX3dpZHRoLCBmYl9oZWlnaHQ7DQo+IC0JdW5zaWduZWQgZmJfYnBwLCBmYl9kZXB0aCwgZmJf
b2Zmc2V0LCBmYl9waXRjaCwgZmJfc2l6ZTsNCj4gKwl1bnNpZ25lZCBmYl9icHAsIGZiX3BpdGNo
LCBmYl9zaXplOw0KPiAgCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICppbml0X21vZGU7DQo+ICAJ
aW50IHJldDsNCj4gIA0KPiAgCWZiX2JwcCA9IDMyOw0KPiAtCWZiX2RlcHRoID0gMjQ7DQo+ICAN
Cj4gIAkvKiBYWFggQXMgc2hvdWxkbid0IHRoZXNlIGJlIGFzIHdlbGwuICovDQo+ICAJZmJfd2lk
dGggPSBtaW4odm13X3ByaXYtPmZiX21heF93aWR0aCwgKHVuc2lnbmVkKTIwNDgpOw0KPiBAQCAt
NjU1LDcgKzY1NCw2IEBAIGludCB2bXdfZmJfaW5pdChzdHJ1Y3Qgdm13X3ByaXZhdGUgKnZtd19w
cml2KQ0KPiAgDQo+ICAJZmJfcGl0Y2ggPSBmYl93aWR0aCAqIGZiX2JwcCAvIDg7DQo+ICAJZmJf
c2l6ZSA9IGZiX3BpdGNoICogZmJfaGVpZ2h0Ow0KPiAtCWZiX29mZnNldCA9IHZtd19yZWFkKHZt
d19wcml2LCBTVkdBX1JFR19GQl9PRkZTRVQpOw0KPiAgDQo+ICAJaW5mbyA9IGZyYW1lYnVmZmVy
X2FsbG9jKHNpemVvZigqcGFyKSwgZGV2aWNlKTsNCj4gIAlpZiAoIWluZm8pDQo+IA0KPiANCj4g
DQoNCg=

Re: [PATCH -next] drm/vmwgfx: Remove set but not used variable 'fb_offset, fb_depth'

[Mukesh Ojha]

On 3/23/2019 8:16 AM, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_fb.c: In function 'vmw_fb_init':
> drivers/gpu/drm/vmwgfx/vmwgfx_fb.c:645:29: warning:
>   variable 'fb_offset' set but not used [-Wunused-but-set-variable]
>
> drivers/gpu/drm/vmwgfx/vmwgfx_fb.c:645:19: warning:
>   variable 'fb_depth' set but not used [-Wunused-but-set-variable]
>
> They're not used any more, so can be removed.
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>


Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

-Mukesh

> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> index 2a9112515f46..86efb91f5034 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> @@ -642,12 +642,11 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
>   	struct vmw_fb_par *par;
>   	struct fb_info *info;
>   	unsigned fb_width, fb_height;
> -	unsigned fb_bpp, fb_depth, fb_offset, fb_pitch, fb_size;
> +	unsigned fb_bpp, fb_pitch, fb_size;
>   	struct drm_display_mode *init_mode;
>   	int ret;
>   
>   	fb_bpp = 32;
> -	fb_depth = 24;
>   
>   	/* XXX As shouldn't these be as well. */
>   	fb_width = min(vmw_priv->fb_max_width, (unsigned)2048);
> @@ -655,7 +654,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
>   
>   	fb_pitch = fb_width * fb_bpp / 8;
>   	fb_size = fb_pitch * fb_height;
> -	fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET);
>   
>   	info = framebuffer_alloc(sizeof(*par), device);
>   	if (!info)
>
>
>