From patchwork Thu Jul 26 18:48:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1244881 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 801DF3FC33 for ; Thu, 26 Jul 2012 20:18:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DD40A0E99 for ; Thu, 26 Jul 2012 13:18:36 -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 CF9E59E9D9 for ; Thu, 26 Jul 2012 12:56:36 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so1724686wgb.12 for ; Thu, 26 Jul 2012 12:56:36 -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=C0aNzVnHA01AqRPvdtlZT+08fHf3V3+FBGkRUNx84vk=; b=Ojg9HARwqq+Fmvp9ShzmGntOHX8L2JjfaYXwHFH1HLNKZbHRSCM56lQe5s5F/kip+c T144Or9KBKJ886FgAWFEsteTWRynTzJm+MDG6e4CSB0xD5Ua++L4t/F1vfmc8t0wiNwv WnMIHJepoQaMPfeI7kPLgRDDcCEbSEE3JBFiQ= 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=C0aNzVnHA01AqRPvdtlZT+08fHf3V3+FBGkRUNx84vk=; b=egF6D8U07MjL0nNCcJPTSgxYb1W2IONxQdS9YG9nQXgHLRCyzlhgXhH/6l66NrF0Bh d4SFrfDlTuzeHCxAwUk07cCbZObz5F/fOoKn/NCCCRh+o17FcF+R+cD57KjpQBGUKCDj eqEEKeS1hBqrPvTRtM2YPzPhaiSLs5MKRZ8pgDwW/L756M0Axql8UlEGbk+eQ5KDRVq1 M/y1htUyGblsAWjWDx2Vd6Q7hv3mOCny2bpbo+bC1r8Xl9e+JpPVk4D3l6aT+tB44eVT /qNNhRNlXqOXyktAPBBLZlSwzgfg2WN+bT5jqPS2XjaIDaZqxHaLieV1eHNNiLJqkWw+ bajw== Received: by 10.180.103.4 with SMTP id fs4mr83479wib.16.1343332596426; Thu, 26 Jul 2012 12:56:36 -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 fr4sm391403wib.8.2012.07.26.12.56.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:56:35 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:48:48 +0200 Message-Id: <1343328581-2324-24-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn+Y4a6jZDrFQplU1NhiqAnKqTmFWcW3zS1tEdQFvnF2bNfQMUINBgdStbL1cHv2/V1zhQ/ Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 23/76] 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 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7ae1a71..941d0d1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6511,7 +6511,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, @@ -6573,7 +6572,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; @@ -6589,7 +6587,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; @@ -6751,10 +6748,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) { @@ -6787,8 +6780,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;