Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_mode.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 43a9d3aec6c426e20bbff9bbb30084fe3cc523b2..2af2678ddaf6254948d529f647f87bb1ef74a959 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -257,15 +257,7 @@ struct amdgpu_audio {
        int num_pins;
 };
 
-struct amdgpu_mode_mc_save {
-       u32 vga_render_control;
-       u32 vga_hdp_control;
-       bool crtc_enabled[AMDGPU_MAX_CRTCS];
-};
-
 struct amdgpu_display_funcs {
-       /* vga render */
-       void (*set_vga_render_state)(struct amdgpu_device *adev, bool render);
        /* display watermarks */
        void (*bandwidth_update)(struct amdgpu_device *adev);
        /* get frame count */
@@ -300,10 +292,6 @@ struct amdgpu_display_funcs {
                              uint16_t connector_object_id,
                              struct amdgpu_hpd *hpd,
                              struct amdgpu_router *router);
-       void (*stop_mc_access)(struct amdgpu_device *adev,
-                              struct amdgpu_mode_mc_save *save);
-       void (*resume_mc_access)(struct amdgpu_device *adev,
-                                struct amdgpu_mode_mc_save *save);
 };
 
 struct amdgpu_mode_info {
@@ -369,7 +357,6 @@ struct amdgpu_atom_ss {
 struct amdgpu_crtc {
        struct drm_crtc base;
        int crtc_id;
-       u16 lut_r[256], lut_g[256], lut_b[256];
        bool enabled;
        bool can_tile;
        uint32_t crtc_offset;