From patchwork Tue Jul 3 09:28:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1150371 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 A252CDFF72 for ; Tue, 3 Jul 2012 10:55:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E425A01D8 for ; Tue, 3 Jul 2012 03:55:45 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 14B5BA01F9 for ; Tue, 3 Jul 2012 03:35:00 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so4714241wgb.12 for ; Tue, 03 Jul 2012 03:35:00 -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=M7uuGNcDgiP+VOm/7uk92GtNp/4Jd655rbNVkh7/1bY=; b=KALtiJdyHPbDcS+ry0rRqBkus+uR3JDQIvqIKF4uu/Uy648QbYrunNsM30achrpZM2 BVkacq9eXQY639kgS80B327Q2R6bWhJVsnS7C6ye4qq/GF6tlET0ymlsana1lRfOBrfw qQKenMk4HFEYXUc4A7EGBKQwLVEuolW98MALo= 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=M7uuGNcDgiP+VOm/7uk92GtNp/4Jd655rbNVkh7/1bY=; b=JTSXt5IFGGZt8cFVAy8NMGcfXt4/E38+TW9ovFvdSkG4RnKO7GO8dyD1CPtqUEcapF 9OyDuspGSyYBDUDAZAOQcmV9RcbBT0tSR9sjJoBeJCK9Ra8n7f4kDQWBQoqIB/VqAXj+ 4petFLojcHNqfp/wyP8lYbbO2rBJOUlC/LM3fb8T6YZorRHk25WKgwxANFqobh2u7KjO EqsbX0H+rf8HTyQ1j53YNwA1mECV3P8c6S65OZkZ9ulcRN5mpuwSAT1azGbd6DWbZIkM H8qpzD7JZYAQeHtR47RB52oMKLfNH72i117GkppVLJM6mrJiw5B2nZVaSqFbmTeHQ8KO lcBQ== Received: by 10.216.193.129 with SMTP id k1mr3462934wen.201.1341311700690; Tue, 03 Jul 2012 03:35:00 -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 e9sm14845138wiw.10.2012.07.03.03.34.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 03:35:00 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 3 Jul 2012 11:28:19 +0200 Message-Id: <1341307715-3886-28-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> References: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQm4UJu/74ECL9QId7mlkHZ6dzmoLGe/xvbkHzmKY5+NREkKC0zrnkxSNB7M5hT/mNUGLdYz Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 27/43] 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 72c415b..0fd9085 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6546,7 +6546,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, @@ -6608,7 +6607,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; @@ -6624,7 +6622,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; @@ -6786,10 +6783,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) { @@ -6822,8 +6815,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;