diff options
author | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:11:40 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:11:50 +1000 |
commit | c703bf9e11c3314d068b974ef1af030ba5050e77 (patch) | |
tree | a87638962f6bcf497527bce5aab66f50da6a7aaa /drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h | |
parent | 96413c78d958e1047bf1cba78b91e1c7addc58b3 (diff) | |
parent | 59d3191f14dc18881fec1172c7096b7863622803 (diff) |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 5.1:
- Powerplay fixes
- DC fixes
- Fix locking around indirect register access in some cases
- KFD MQD fix
- Disable BACO for vega20 for now (fixes pending)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190307202528.3148-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h')
-rw-r--r-- | drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h b/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h index 4222e403b151..dcef85994c45 100644 --- a/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h +++ b/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h @@ -145,7 +145,7 @@ void mod_freesync_build_vrr_infopacket(struct mod_freesync *mod_freesync, const struct dc_stream_state *stream, const struct mod_vrr_params *vrr, enum vrr_packet_type packet_type, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket); void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, |