From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 24/66] drm/i915: Stop calling encoder->mode_set Date: Fri, 16 May 2014 12:04:47 +0200 Message-ID: <20140516100447.GH8790@phenom.ffwll.local> References: <1398376542-27825-1-git-send-email-daniel.vetter@ffwll.ch> <1398376542-27825-25-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 18B446E2A8 for ; Fri, 16 May 2014 03:04:52 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id e53so1360596eek.25 for ; Fri, 16 May 2014 03:04:51 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1398376542-27825-25-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Thu, Apr 24, 2014 at 11:55:00PM +0200, Daniel Vetter wrote: > All the callbacks are gone now. > > Signed-off-by: Daniel Vetter Merged up to this patch here, thanks everyone for the reviews. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 33 ++------------------------------- > 1 file changed, 2 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index f8ebe9b59746..dec4127a4738 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -7202,35 +7202,6 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, > return true; > } > > -static int intel_crtc_mode_set(struct drm_crtc *crtc, > - int x, int y, > - struct drm_framebuffer *fb) > -{ > - struct drm_device *dev = crtc->dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > - struct intel_encoder *encoder; > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct drm_display_mode *mode = &intel_crtc->config.requested_mode; > - int ret; > - > - ret = dev_priv->display.crtc_mode_set(crtc, x, y, fb); > - > - if (ret != 0) > - return ret; > - > - for_each_encoder_on_crtc(dev, crtc, encoder) { > - DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n", > - encoder->base.base.id, > - drm_get_encoder_name(&encoder->base), > - mode->base.id, mode->name); > - > - if (encoder->mode_set) > - encoder->mode_set(encoder); > - } > - > - return 0; > -} > - > static struct { > int clock; > u32 config; > @@ -9994,8 +9965,8 @@ static int __intel_set_mode(struct drm_crtc *crtc, > * on the DPLL. > */ > for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) { > - ret = intel_crtc_mode_set(&intel_crtc->base, > - x, y, fb); > + ret = dev_priv->display.crtc_mode_set(&intel_crtc->base, > + x, y, fb); > if (ret) > goto done; > } > -- > 1.8.1.4 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch