dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Subject: [PATCH 01/13] drm/msm: COMPILE_TEST support
Date: Sat,  7 Dec 2013 18:35:33 -0500	[thread overview]
Message-ID: <1386459345-17731-2-git-send-email-robdclark@gmail.com> (raw)
In-Reply-To: <1386459345-17731-1-git-send-email-robdclark@gmail.com>

With a simple stub, we can get COMPILE_TEST support.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---
 drivers/gpu/drm/msm/Kconfig                 |  3 +--
 drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c |  2 --
 drivers/gpu/drm/msm/msm_drv.h               | 11 +++++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index f39ab75..bb103fb 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -2,8 +2,7 @@
 config DRM_MSM
 	tristate "MSM DRM"
 	depends on DRM
-	depends on ARCH_MSM
-	depends on ARCH_MSM8960
+	depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST)
 	select DRM_KMS_HELPER
 	select SHMEM
 	select TMPFS
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c
index 5e0dcae..3799ccc 100644
--- a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c
@@ -15,8 +15,6 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mach/clk.h>
-
 #include "mdp4_kms.h"
 
 #include "drm_crtc.h"
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index d39f086..8823a88 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -31,6 +31,17 @@
 #include <linux/types.h>
 #include <asm/sizes.h>
 
+
+#if defined(CONFIG_ARCH_MSM)
+#  include <mach/clk.h>
+#elif defined(CONFIG_COMPILE_TEST)
+/* stubs we need for compile-test: */
+static inline struct device *msm_iommu_get_ctx(const char *ctx_name)
+{
+	return NULL;
+}
+#endif
+
 #ifndef CONFIG_OF
 #include <mach/board.h>
 #include <mach/socinfo.h>
-- 
1.8.4.2

  reply	other threads:[~2013-12-07 23:36 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-07 23:35 [PATCH 00/13] drm/msm: apq8060a and apq8x74 support Rob Clark
2013-12-07 23:35 ` Rob Clark [this message]
2013-12-07 23:35 ` [PATCH 02/13] drm/msm: add missing MODULE_FIRMWARE()s Rob Clark
2013-12-07 23:35 ` [PATCH 03/13] drm/msm: fix bus scaling Rob Clark
2013-12-07 23:35 ` [PATCH 04/13] drm/msm: add support for non-IOMMU systems Rob Clark
2013-12-07 23:35 ` [PATCH 05/13] drm/msm: add support for msm8060ab/bstem Rob Clark
2013-12-07 23:35 ` [PATCH 06/13] drm/msm: move mdp4 -> mdp/mdp4 Rob Clark
2013-12-07 23:35 ` [PATCH 07/13] drm/msm: resync generated headers Rob Clark
2013-12-07 23:35 ` [PATCH 08/13] drm/msm: mdp4_format -> mdp_format Rob Clark
2013-12-07 23:35 ` [PATCH 09/13] drm/msm: split out msm_kms.h Rob Clark
2013-12-09 17:36   ` Erik Faye-Lund
2013-12-09 17:43     ` Rob Clark
2013-12-07 23:35 ` [PATCH 10/13] drm/msm: move irq utils to mdp_kms Rob Clark
2013-12-07 23:35 ` [PATCH 11/13] drm/msm: add hdmi support for apq8x74/mdp5 Rob Clark
2013-12-07 23:35 ` [PATCH 12/13] drm/msm: add mdp5/apq8x74 Rob Clark
2013-12-07 23:35 ` [PATCH 13/13] drm/msm: add a330/apq8x74 Rob Clark

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386459345-17731-2-git-send-email-robdclark@gmail.com \
    --to=robdclark@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox