Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-13 14:59:58 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:46:07 +0200
commita6fe947129779004fa3d421bd5cbf88ab7fc593c (patch)
treeb0fc6460a3dd9fd373db548d4a3c0c7d2ee13829
parent0d0e6aacd0201de0fda7c2e8d6cdabbe98a56d22 (diff)
drm/vmwgfx: Remove set but not used variable 'restart'
(bsc#1111666).
-rw-r--r--patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch61
-rw-r--r--series.conf1
2 files changed, 62 insertions, 0 deletions
diff --git a/patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch b/patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch
new file mode 100644
index 0000000000..f533fc1ce4
--- /dev/null
+++ b/patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch
@@ -0,0 +1,61 @@
+From b2130cca9c8db5073b71d832da2a6c8311a8f3bb Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Fri, 1 Mar 2019 09:47:43 -0800
+Subject: [PATCH] drm/vmwgfx: Remove set but not used variable 'restart'
+Git-commit: b2130cca9c8db5073b71d832da2a6c8311a8f3bb
+Patch-mainline: v5.2-rc1
+References: bsc#1111666
+
+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>
+Reviewed-by: Deepak Rawat <drawat@vmware.com>
+Signed-off-by: Deepak Rawat <drawat@vmware.com>
+Fixes: dc366364c4ef ("drm/vmwgfx: Fix multiple command buffer context use")
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ 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)) {
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 0b5f8af485..9b874d5b29 100644
--- a/series.conf
+++ b/series.conf
@@ -45668,6 +45668,7 @@
patches.drm/drm-rcar-du-Fix-rcar_du_crtc-structure-documentation.patch
patches.drm/drm-doc-Drop-content-type-from-the-legacy-kms-proper.patch
patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch
+ patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch
patches.drivers/ALSA-hda-realtek-Support-low-power-consumption-for-A.patch
patches.drivers/ALSA-hda-realtek-Support-low-power-consumption-ALC256.patch