Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Just two small fixes: one radeon, one amdkfd"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/amdkfd: fix topology bug with capability attr.
drm/radeon: use proper ACR regisiter for DCE3.2
+3
-3
+2
-2
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+2
-2
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
···
684
684
dev->node_props.cpu_core_id_base);
685
685
sysfs_show_32bit_prop(buffer, "simd_id_base",
686
686
dev->node_props.simd_id_base);
687
-
sysfs_show_32bit_prop(buffer, "capability",
688
-
dev->node_props.capability);
689
687
sysfs_show_32bit_prop(buffer, "max_waves_per_simd",
690
688
dev->node_props.max_waves_per_simd);
691
689
sysfs_show_32bit_prop(buffer, "lds_size_in_kb",
···
734
736
dev->gpu->kfd2kgd->get_fw_version(
735
737
dev->gpu->kgd,
736
738
KGD_ENGINE_MEC1));
739
+
sysfs_show_32bit_prop(buffer, "capability",
740
+
dev->node_props.capability);
737
741
}
738
742
739
743
return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute",
+1
-1
drivers/gpu/drm/radeon/dce3_1_afmt.c
+1
-1
drivers/gpu/drm/radeon/dce3_1_afmt.c
···
173
173
struct drm_device *dev = encoder->dev;
174
174
struct radeon_device *rdev = dev->dev_private;
175
175
176
-
WREG32(HDMI0_ACR_PACKET_CONTROL + offset,
176
+
WREG32(DCE3_HDMI0_ACR_PACKET_CONTROL + offset,
177
177
HDMI0_ACR_SOURCE | /* select SW CTS value */
178
178
HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
179
179