diff --git a/[refs] b/[refs]
index 05977f21ff54..950b603b6d2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e48854c58ca9a0f39e716dcb18247bfc21e2022
+refs/heads/master: 816175dd1fd755b5475e30933eff3c3e03657f5a
diff --git a/trunk/drivers/gpu/drm/tilcdc/Makefile b/trunk/drivers/gpu/drm/tilcdc/Makefile
index deda656b10e7..7d2eefe94bf7 100644
--- a/trunk/drivers/gpu/drm/tilcdc/Makefile
+++ b/trunk/drivers/gpu/drm/tilcdc/Makefile
@@ -1,4 +1,7 @@
-ccflags-y := -Iinclude/drm -Werror
+ccflags-y := -Iinclude/drm
+ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
+	ccflags-y += -Werror
+endif
 
 tilcdc-y := \
 	tilcdc_crtc.o \