From patchwork Wed Jul 11 14:28:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1183741 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id B3630DF25A for ; Wed, 11 Jul 2012 15:58:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C9EAA0E83 for ; Wed, 11 Jul 2012 08:58:04 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 431BB9EEA3 for ; Wed, 11 Jul 2012 08:35:44 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so960506wey.36 for ; Wed, 11 Jul 2012 08:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Z7fF4zjLOSuT3gIPVPa4tt4Jczyv7gNlQDsGtFIzrZY=; b=iLwI8/bn2diAW/WACkCrn1A52iiCEBXkL3iXhc3XL/rRsfyoXbwXl5CGWEzGv3skSK ne5nwN8PiClNwZ5IEBoPVkzrw+kI39UXPKY6GGehpUTOtnEN5mktv7fvbb0PWp6DnFaQ YTIrs2BPG0NoizBRiuktOSJIgZ9NNjuIcR/Qk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Z7fF4zjLOSuT3gIPVPa4tt4Jczyv7gNlQDsGtFIzrZY=; b=ijhh5EAMxg5K/JbTpLLv1CCQxZfV7kznSqSDIZl80AYg8iiMCPOw1Q+NsjEp4/9KJb Air0wSS2aA+eZaPXQNQ5si3gEq0hcQys8Afw/FHqKSUqY3oiQ5bfbVxczf6vpaVspdsB 9ztBpc335tHcecdRLqO4DCnj1WAZ1tJzPhYKxQlSOb0Qew+1eEbijrCRsrggqcme9EB3 s32fs+issxiROGQwNwhniZM+0GBO/X4KFmEN5tgQF4cDIOa/9wyzQQ4TTRNIv5pWv4bd HToRJXjOJ+8U7Zmo8as9IdBgT+PC6oX9FsNzXLR4o8uvYCDPOR/jX7X11ak7eYtiVJD3 vm8w== Received: by 10.180.93.68 with SMTP id cs4mr48050140wib.14.1342020944047; Wed, 11 Jul 2012 08:35:44 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bc2sm5777080wib.0.2012.07.11.08.35.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:35:43 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:10 +0200 Message-Id: <1342016944-23395-28-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn+XlsIXrvE1M2Ddjx1y7TxTAiFKImvUIKNyemUj2qGtk1Cw/704gkD1gusQj1xp/Jp7IHF Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 27/81] drm/i915: call set_base directly X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org And drop the check, we always have it. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7edb3a1..28a5ba0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6584,7 +6584,6 @@ static void intel_crtc_reset(struct drm_crtc *crtc) static struct drm_crtc_helper_funcs intel_helper_funcs = { .mode_fixup = intel_crtc_mode_fixup, .mode_set = intel_crtc_mode_set, - .mode_set_base = intel_pipe_set_base, .mode_set_base_atomic = intel_pipe_set_base_atomic, .load_lut = intel_crtc_load_lut, .disable = intel_crtc_disable, @@ -6646,7 +6645,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) bool fb_changed = false; /* if true and !mode_changed just do a flip */ struct drm_connector *save_connectors, *connector; int count = 0, ro, fail = 0; - struct drm_crtc_helper_funcs *crtc_funcs; struct drm_mode_set save_set; int ret; int i; @@ -6662,7 +6660,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) if (!set->crtc->helper_private) return -EINVAL; - crtc_funcs = set->crtc->helper_private; if (!set->mode) set->fb = NULL; @@ -6824,10 +6821,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) } } - /* mode_set_base is not a required function */ - if (fb_changed && !crtc_funcs->mode_set_base) - mode_changed = true; - if (mode_changed) { set->crtc->enabled = drm_helper_crtc_in_use(set->crtc); if (set->crtc->enabled) { @@ -6860,8 +6853,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set) old_fb = set->crtc->fb; if (set->crtc->fb != set->fb) set->crtc->fb = set->fb; - ret = crtc_funcs->mode_set_base(set->crtc, - set->x, set->y, old_fb); + ret = intel_pipe_set_base(set->crtc, + set->x, set->y, old_fb); if (ret != 0) { set->crtc->fb = old_fb; goto fail;