]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: Remove crtc_mode_set() hook
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Wed, 29 Oct 2014 09:32:37 +0000 (11:32 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 7 Nov 2014 17:41:46 +0000 (18:41 +0100)
There's no users left after the conversion to calculate clocks before
disabling crtcs during mode set.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c

index 4fb93e28b5acd786fb6152b47577b1080f27c6d5..03be342400bdadb8219359b1a92b08d058f8f991 100644 (file)
@@ -487,9 +487,6 @@ struct drm_i915_display_funcs {
        void (*get_plane_config)(struct intel_crtc *,
                                 struct intel_plane_config *);
        int (*crtc_compute_clock)(struct intel_crtc *crtc);
-       int (*crtc_mode_set)(struct intel_crtc *crtc,
-                            int x, int y,
-                            struct drm_framebuffer *old_fb);
        void (*crtc_enable)(struct drm_crtc *crtc);
        void (*crtc_disable)(struct drm_crtc *crtc);
        void (*off)(struct drm_crtc *crtc);
index 5af00c4899809dd1142ea1291a16ed2d97535061..200fcb163a2df2f25cbad094530996f0e8eba017 100644 (file)
@@ -10882,13 +10882,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,
                crtc->primary->fb = fb;
                crtc->x = x;
                crtc->y = y;
-
-               if (dev_priv->display.crtc_mode_set) {
-                       ret = dev_priv->display.crtc_mode_set(intel_crtc,
-                                                             x, y, fb);
-                       if (ret)
-                               goto done;
-               }
        }
 
        /* Now enable the clocks, plane, pipe, and connectors that we set up. */