Skip to content

Commit

Permalink
[fix] misc-additions retry
Browse files Browse the repository at this point in the history
  • Loading branch information
whitehara committed Sep 9, 2024
1 parent de34b94 commit 3bbde6a
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions 6.10/0012-misc-additions.patch
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,6 @@ index 901d1961b73927..05c49141f5802f 100644
+ This option extends the KMS color management API with AMD driver-specific properties to enhance the color management support on AMD Steam Deck.
+
endmenu
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 59d2eee72a3297..0a4e75de95c257 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4078,7 +4078,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
return r;
}

-#ifdef AMD_PRIVATE_COLOR
+#ifdef CONFIG_AMD_PRIVATE_COLOR
if (amdgpu_dm_create_color_properties(adev)) {
dc_state_release(state->context);
kfree(state);
return -ENOMEM;
#endif
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index c87b64e464ed5c..6fe07243adc3d5 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
Expand Down

0 comments on commit 3bbde6a

Please sign in to comment.