From patchwork Fri Sep 30 09:58:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9357899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5448F60757 for ; Fri, 30 Sep 2016 09:59:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45B1729F77 for ; Fri, 30 Sep 2016 09:59:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A8C529F7B; Fri, 30 Sep 2016 09:59:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2999929F77 for ; Fri, 30 Sep 2016 09:59:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B50E6E9A1; Fri, 30 Sep 2016 09:59:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 189796E9A0; Fri, 30 Sep 2016 09:59:42 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p197so1198845wmg.1; Fri, 30 Sep 2016 02:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=vXzIiMmhc6kuyFzsA7mg/7rtmf9QOBSDCWKuQ+yUbo8=; b=XTrpVnlYG3ftGIRoinrLcLIkYIg9kEeH9Ij2aW+9hH39ryTEALWAgFVjPvtMJMGIfu MkBXdHdMHLqNXuSWSadr7pm1gN80LWOFpgS1VDviI14m2cbgG4GGa+Z1ZUELfWsgus9h VoLFydJ/WEOfp6wyQCT7hnpIW6kRDf1icjXmQVlD/IPkiwA+vKbrFcjRJ2Q0HmbEK/bO Ey0Jf3J02TsIVA3MUaCxDVRTjCCathOrIKdbTakZK/aAu6NpyBajOC+o+rAVix3+trwS gtEiYac08BUgzQi3jYcZSwGAHTASnniLC+yZVOn/WnejRX/MeeokjYmD+uz7/4OsswU8 sP4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=vXzIiMmhc6kuyFzsA7mg/7rtmf9QOBSDCWKuQ+yUbo8=; b=CvLrAdtbffceK0T8vgQyX53S9NVsJA7ub24SmBsqhO3aEFch6x4GinSDUxwREKpXBm WCASMlUnupmZuRCjzqj2pj0w79sDo4zUUBZnZbxLJQXgbNP7Mp4GKVhkwDCEPkTDWR18 2Nud7kFibbL0+paETxVPE0jWyC72Z2Xj7R5/vPH105891KIHgAlodNe7lwZ30T6yW88X r3ILwb8aff0rPFRussaIu2ZD698K6vNJ/nAQ7xcnGK0KjUGR/5gVAKX9DIulFGqgN5gP tmhZNJ/4jyszkXUGF4Vj8K70NXlEOxs+qIjWUtC146GOcqU3+QNXIPJcTsV6Ds1JuOag QcQw== X-Gm-Message-State: AA6/9Rlgtba0E2bhIzIP0g3iVg2zk9YQlD3qF5ARffV9LAxFTOZvzcDM+BL7X8EQ4UIlRg== X-Received: by 10.194.192.195 with SMTP id hi3mr5300800wjc.108.1475229580761; Fri, 30 Sep 2016 02:59:40 -0700 (PDT) Received: from cizrna.lan ([109.72.12.232]) by smtp.gmail.com with ESMTPSA id zz9sm16208776wjb.36.2016.09.30.02.59.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2016 02:59:39 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915: Fix build when !CONFIG_DEBUG_FS Date: Fri, 30 Sep 2016 11:58:42 +0200 Message-Id: <1475229522-24113-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 Cc: Tomeu Vizoso , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add stub for intel_crtc_set_crc_source() and fix arguments of stub for intel_display_crc_init(). Signed-off-by: Tomeu Vizoso Fixes: 21165bd933ac ("drm/i915/debugfs: Move out pipe CRC code") Fixes: 13fa0253d97a ("drm/i915: Use new CRC debugfs API") --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 91ff3d735c45..e0cb71c9c52e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3530,7 +3530,7 @@ static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {retu static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {} static inline int i915_debugfs_connector_add(struct drm_connector *connector) { return 0; } -static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {} +static inline void intel_display_crc_init(struct drm_device *dev) {} #endif /* i915_gpu_error.c */ diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c49a11ed70be..73bab745c855 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1842,8 +1842,14 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state); /* intel_pipe_crc.c */ int intel_pipe_crc_create(struct drm_minor *minor); void intel_pipe_crc_cleanup(struct drm_minor *minor); +#ifdef CONFIG_DEBUG_FS int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, size_t *values_cnt); +#else +static inline int intel_crtc_set_crc_source(struct drm_crtc *crtc, + const char *source_name, + size_t *values_cnt) { return 0; } +#endif extern const struct file_operations i915_display_crc_ctl_fops; #endif /* __INTEL_DRV_H__ */