1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index fa91a17b81b6..aecc3e3dec0c 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -237,7 +237,6 @@ struct radeon_afmt {
         int offset;
         bool last_buffer_filled_status;
         int id;
-        struct r600_audio_pin *pin;
 };
 
 struct radeon_mode_info {
@@ -343,7 +342,6 @@ struct radeon_crtc {
         int max_cursor_width;
         int max_cursor_height;
         uint32_t legacy_display_base_addr;
-        uint32_t legacy_cursor_offset;
         enum radeon_rmx_type rmx_type;
         u8 h_border;
         u8 v_border;
@@ -440,6 +438,7 @@ struct radeon_encoder_atom_dig {
         uint8_t backlight_level;
         int panel_mode;
         struct radeon_afmt *afmt;
+        struct r600_audio_pin *pin;
         int active_mst_links;
 };
 
@@ -754,7 +753,7 @@ extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);
 extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
                                     struct drm_connector *connector);
 int radeon_dp_get_max_link_rate(struct drm_connector *connector,
-                                u8 *dpcd);
+                                const u8 *dpcd);
 extern void radeon_dp_set_rx_power_state(struct drm_connector *connector,
                                          u8 power_state);
 extern void radeon_dp_aux_init(struct radeon_connector *radeon_connector);