artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e90137a
)
drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family
author
jsg
<jsg@openbsd.org>
Wed, 13 Sep 2023 12:44:35 +0000
(12:44 +0000)
committer
jsg
<jsg@openbsd.org>
Wed, 13 Sep 2023 12:44:35 +0000
(12:44 +0000)
From George Shen
faa77cf5f28f4bbfbbb00f7e0caa2c8561f7dfe0
in linux-6.1.y/6.1.53
25b054c3c89cb6a7106a7982f0f70e83d0797dab
in mainline linux
sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_dccg.c
patch
|
blob
|
history
diff --git
a/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_dccg.c
b/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_dccg.c
index
cef32a1
..
b735e54
100644
(file)
--- a/
sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_dccg.c
+++ b/
sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_dccg.c
@@
-84,7
+84,8
@@
static enum phyd32clk_clock_source get_phy_mux_symclk(
struct dcn_dccg *dccg_dcn,
enum phyd32clk_clock_source src)
{
- if (dccg_dcn->base.ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) {
+ if (dccg_dcn->base.ctx->asic_id.chip_family == FAMILY_YELLOW_CARP &&
+ dccg_dcn->base.ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) {
if (src == PHYD32CLKC)
src = PHYD32CLKF;
if (src == PHYD32CLKD)