72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
|
From 9167d76c435a7c1df7954f0fbe5cc6d083f8ed2f Mon Sep 17 00:00:00 2001
|
||
|
|
From: David McFarland <corngood@gmail.com>
|
||
|
|
Date: Mon, 6 Feb 2017 22:13:49 -0400
|
||
|
|
Subject: [PATCH 1/3] fix warnings for Werror
|
||
|
|
|
||
|
|
---
|
||
|
|
amd/amdgpu/amdgpu_device.c | 4 ++--
|
||
|
|
amd/amdgpu/amdgpu_sa.c | 2 +-
|
||
|
|
amd/display/dc/bios/bios_parser2.c | 8 ++++----
|
||
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/amd/amdgpu/amdgpu_device.c b/amd/amdgpu/amdgpu_device.c
|
||
|
|
index fc1c543..186e06d 100644
|
||
|
|
--- a/amd/amdgpu/amdgpu_device.c
|
||
|
|
+++ b/amd/amdgpu/amdgpu_device.c
|
||
|
|
@@ -3164,7 +3164,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
|
||
|
|
struct drm_info_node *node, *tmp;
|
||
|
|
|
||
|
|
if (!&minor->debugfs_root)
|
||
|
|
- return 0;
|
||
|
|
+ return;
|
||
|
|
|
||
|
|
mutex_lock(&minor->debugfs_lock);
|
||
|
|
list_for_each_entry_safe(node, tmp,
|
||
|
|
@@ -3175,7 +3175,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
|
||
|
|
}
|
||
|
|
mutex_unlock(&minor->debugfs_lock);
|
||
|
|
|
||
|
|
- return 0;
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
|
||
|
|
index 7206b34..8b7123c 100644
|
||
|
|
--- a/amd/amdgpu/amdgpu_sa.c
|
||
|
|
+++ b/amd/amdgpu/amdgpu_sa.c
|
||
|
|
@@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
|
||
|
|
if (i->fence)
|
||
|
|
#if defined(BUILD_AS_DKMS)
|
||
|
|
seq_printf(m, " protected by 0x%08x on context %d",
|
||
|
|
- i->fence->seqno, i->fence->context);
|
||
|
|
+ i->fence->seqno, (int)i->fence->context);
|
||
|
|
#else
|
||
|
|
seq_printf(m, " protected by 0x%08x on context %llu",
|
||
|
|
i->fence->seqno, i->fence->context);
|
||
|
|
diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c
|
||
|
|
index 86fce5a..99681c5 100644
|
||
|
|
--- a/amd/display/dc/bios/bios_parser2.c
|
||
|
|
+++ b/amd/display/dc/bios/bios_parser2.c
|
||
|
|
@@ -1326,13 +1326,13 @@ static enum bp_result get_embedded_panel_info_v2_1(
|
||
|
|
info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0;
|
||
|
|
|
||
|
|
info->lcd_timing.misc_info.H_REPLICATION_BY2 =
|
||
|
|
- lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2;
|
||
|
|
+ (lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0;
|
||
|
|
info->lcd_timing.misc_info.V_REPLICATION_BY2 =
|
||
|
|
- lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2;
|
||
|
|
+ (lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0;
|
||
|
|
info->lcd_timing.misc_info.COMPOSITE_SYNC =
|
||
|
|
- lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC;
|
||
|
|
+ (lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0;
|
||
|
|
info->lcd_timing.misc_info.INTERLACE =
|
||
|
|
- lvds->lcd_timing.miscinfo & ATOM_INTERLACE;
|
||
|
|
+ (lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0;
|
||
|
|
|
||
|
|
/* not provided by VBIOS*/
|
||
|
|
info->lcd_timing.misc_info.DOUBLE_CLOCK = 0;
|
||
|
|
--
|
||
|
|
2.15.1
|
||
|
|
|