Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.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 ffde1e9666e8c00ee603f98cb4d81453974c7ff9..54f06c959340923c36ca469dd558df968e5688d0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -89,7 +89,6 @@ enum amdgpu_hpd_id {
        AMDGPU_HPD_4,
        AMDGPU_HPD_5,
        AMDGPU_HPD_6,
-       AMDGPU_HPD_LAST,
        AMDGPU_HPD_NONE = 0xff,
 };
 
@@ -106,7 +105,6 @@ enum amdgpu_crtc_irq {
        AMDGPU_CRTC_IRQ_VLINE4,
        AMDGPU_CRTC_IRQ_VLINE5,
        AMDGPU_CRTC_IRQ_VLINE6,
-       AMDGPU_CRTC_IRQ_LAST,
        AMDGPU_CRTC_IRQ_NONE = 0xff
 };
 
@@ -117,7 +115,6 @@ enum amdgpu_pageflip_irq {
        AMDGPU_PAGEFLIP_IRQ_D4,
        AMDGPU_PAGEFLIP_IRQ_D5,
        AMDGPU_PAGEFLIP_IRQ_D6,
-       AMDGPU_PAGEFLIP_IRQ_LAST,
        AMDGPU_PAGEFLIP_IRQ_NONE = 0xff
 };
 
@@ -661,10 +658,6 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev);
 void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state);
 int amdgpu_fbdev_total_size(struct amdgpu_device *adev);
 bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj);
-void amdgpu_fbdev_restore_mode(struct amdgpu_device *adev);
-
-void amdgpu_fb_output_poll_changed(struct amdgpu_device *adev);
-
 
 int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tiled);