* [PATCH 00/21] drm/i915: the great header refactoring, part two
@ 2019-04-29 12:29 Jani Nikula
2019-04-29 12:29 ` [PATCH 01/21] drm/i915: ensure more headers remain self-contained Jani Nikula
` (28 more replies)
0 siblings, 29 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Continue the header refactoring started in part one [1].
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/59022/
Jani Nikula (21):
drm/i915: ensure more headers remain self-contained
drm/i915: make intel_bios.h self-contained
drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
drm/i915: make intel_dpll_mgr.h self-contained
drm/i915: move dsi init functions to intel_dsi.h
drm/i915: extract intel_fifo_underrun.h from intel_drv.h
drm/i915: extract intel_dp_link_training.h from intel_drv.h
drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
drm/i915: extract intel_bios.h functions from i915_drv.h
drm/i915: extract intel_quirks.h from intel_drv.h
drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
drm/i915: extract intel_dp_mst.h from intel_drv.h
drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
drm/i915: extract intel_atomic.h from intel_drv.h
drm/i915: extract intel_runtime_pm.h from intel_drv.h
drm/i915: move some leftovers to intel_pm.h from i915_drv.h
drm/i915: extract intel_combo_phy.h from i915_drv.h
drm/i915: add single combo phy init/unit functions
drivers/gpu/drm/i915/Makefile.header-test | 23 +-
drivers/gpu/drm/i915/dvo_ch7017.c | 3 +-
drivers/gpu/drm/i915/dvo_ch7xxx.c | 3 +-
drivers/gpu/drm/i915/dvo_ivch.c | 3 +-
drivers/gpu/drm/i915/dvo_ns2501.c | 5 +-
drivers/gpu/drm/i915/dvo_sil164.c | 3 +-
drivers/gpu/drm/i915/dvo_tfp410.c | 3 +-
drivers/gpu/drm/i915/gt/intel_reset.c | 2 +
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_drv.c | 3 +
drivers/gpu/drm/i915/i915_drv.h | 118 +---------
drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-
drivers/gpu/drm/i915/i915_irq.c | 3 +
drivers/gpu/drm/i915/i915_irq.h | 114 +++++++++
drivers/gpu/drm/i915/i915_pmu.c | 3 +-
drivers/gpu/drm/i915/i915_sysfs.c | 3 +-
drivers/gpu/drm/i915/i915_trace.h | 1 +
drivers/gpu/drm/i915/icl_dsi.c | 1 +
drivers/gpu/drm/i915/intel_atomic.c | 12 +
drivers/gpu/drm/i915/intel_atomic.h | 49 ++++
drivers/gpu/drm/i915/intel_bios.h | 21 ++
drivers/gpu/drm/i915/intel_combo_phy.c | 25 +-
drivers/gpu/drm/i915/intel_combo_phy.h | 14 ++
drivers/gpu/drm/i915/intel_crt.c | 2 +
drivers/gpu/drm/i915/intel_ddi.c | 4 +
drivers/gpu/drm/i915/intel_display.c | 6 +
drivers/gpu/drm/i915/intel_dp.c | 6 +
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 1 +
drivers/gpu/drm/i915/intel_dp_aux_backlight.h | 13 ++
drivers/gpu/drm/i915/intel_dp_link_training.c | 1 +
drivers/gpu/drm/i915/intel_dp_link_training.h | 14 ++
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +
drivers/gpu/drm/i915/intel_dp_mst.h | 14 ++
drivers/gpu/drm/i915/intel_dpll_mgr.c | 1 +
drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 +-
drivers/gpu/drm/i915/intel_drv.h | 218 ------------------
drivers/gpu/drm/i915/intel_dsi.h | 4 +
.../gpu/drm/i915/intel_dsi_dcs_backlight.c | 8 +-
.../gpu/drm/i915/intel_dsi_dcs_backlight.h | 13 ++
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
.../gpu/drm/i915/{dvo.h => intel_dvo_dev.h} | 10 +-
drivers/gpu/drm/i915/intel_fifo_underrun.c | 1 +
drivers/gpu/drm/i915/intel_fifo_underrun.h | 27 +++
drivers/gpu/drm/i915/intel_hdmi.c | 3 +
drivers/gpu/drm/i915/intel_hotplug.h | 30 +++
drivers/gpu/drm/i915/intel_lvds.c | 1 +
drivers/gpu/drm/i915/intel_overlay.c | 4 +-
drivers/gpu/drm/i915/intel_overlay.h | 29 +++
drivers/gpu/drm/i915/intel_panel.c | 2 +
drivers/gpu/drm/i915/intel_pipe_crc.c | 1 +
drivers/gpu/drm/i915/intel_pm.c | 8 +
drivers/gpu/drm/i915/intel_pm.h | 10 +
drivers/gpu/drm/i915/intel_quirks.c | 1 +
drivers/gpu/drm/i915/intel_quirks.h | 13 ++
drivers/gpu/drm/i915/intel_runtime_pm.c | 13 +-
drivers/gpu/drm/i915/intel_runtime_pm.h | 105 +++++++++
drivers/gpu/drm/i915/intel_sdvo.c | 3 +
drivers/gpu/drm/i915/intel_tv.c | 1 +
drivers/gpu/drm/i915/intel_vdsc.c | 2 +
drivers/gpu/drm/i915/intel_vdsc.h | 21 ++
drivers/gpu/drm/i915/vlv_dsi.c | 2 +
61 files changed, 655 insertions(+), 366 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_irq.h
create mode 100644 drivers/gpu/drm/i915/intel_atomic.h
create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.h
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.h
create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.h
create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.h
create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h
rename drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} (97%)
create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.h
create mode 100644 drivers/gpu/drm/i915/intel_hotplug.h
create mode 100644 drivers/gpu/drm/i915/intel_overlay.h
create mode 100644 drivers/gpu/drm/i915/intel_quirks.h
create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.h
create mode 100644 drivers/gpu/drm/i915/intel_vdsc.h
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 01/21] drm/i915: ensure more headers remain self-contained
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 02/21] drm/i915: make intel_bios.h self-contained Jani Nikula
` (27 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Add more headers to the header test list:
* i915_drv.h
* i915_params.h
* i915_reg.h
* intel_drv.h
* intel_uncore.h
Happily they already are self-contained, but keep them that way.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 325071..9ace5e7 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -4,9 +4,12 @@
# Test the headers are compilable as standalone units
header_test := \
i915_active_types.h \
+ i915_drv.h \
i915_gem_context_types.h \
i915_gem_pm.h \
+ i915_params.h \
i915_priolist_types.h \
+ i915_reg.h \
i915_scheduler_types.h \
i915_timeline_types.h \
intel_atomic_plane.h \
@@ -18,6 +21,7 @@ header_test := \
intel_csr.h \
intel_ddi.h \
intel_dp.h \
+ intel_drv.h \
intel_dvo.h \
intel_fbc.h \
intel_fbdev.h \
@@ -34,6 +38,7 @@ header_test := \
intel_sdvo.h \
intel_sprite.h \
intel_tv.h \
+ intel_uncore.h \
intel_wakeref.h
quiet_cmd_header_test = HDRTEST $@
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 02/21] drm/i915: make intel_bios.h self-contained
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
2019-04-29 12:29 ` [PATCH 01/21] drm/i915: ensure more headers remain self-contained Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 03/21] drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained Jani Nikula
` (26 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Just a types include required.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_bios.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 9ace5e7..1d954b 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -14,6 +14,7 @@ header_test := \
i915_timeline_types.h \
intel_atomic_plane.h \
intel_audio.h \
+ intel_bios.h \
intel_cdclk.h \
intel_color.h \
intel_connector.h \
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 7e3545..cf871a 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -30,6 +30,8 @@
#ifndef _INTEL_BIOS_H_
#define _INTEL_BIOS_H_
+#include <linux/types.h>
+
enum intel_backlight_type {
INTEL_BACKLIGHT_PMIC,
INTEL_BACKLIGHT_LPSS,
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 03/21] drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
2019-04-29 12:29 ` [PATCH 01/21] drm/i915: ensure more headers remain self-contained Jani Nikula
2019-04-29 12:29 ` [PATCH 02/21] drm/i915: make intel_bios.h self-contained Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 04/21] drm/i915: make intel_dpll_mgr.h self-contained Jani Nikula
` (25 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Put the header more in line with the rest. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/dvo_ch7017.c | 3 ++-
drivers/gpu/drm/i915/dvo_ch7xxx.c | 3 ++-
drivers/gpu/drm/i915/dvo_ivch.c | 3 ++-
drivers/gpu/drm/i915/dvo_ns2501.c | 5 +++--
drivers/gpu/drm/i915/dvo_sil164.c | 3 ++-
drivers/gpu/drm/i915/dvo_tfp410.c | 3 ++-
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} | 10 ++++++----
9 files changed, 21 insertions(+), 12 deletions(-)
rename drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} (97%)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 1d954b..69f88ab 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -24,6 +24,7 @@ header_test := \
intel_dp.h \
intel_drv.h \
intel_dvo.h \
+ intel_dvo_dev.h \
intel_fbc.h \
intel_fbdev.h \
intel_frontbuffer.h \
diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
index caac99..602380 100644
--- a/drivers/gpu/drm/i915/dvo_ch7017.c
+++ b/drivers/gpu/drm/i915/dvo_ch7017.c
@@ -25,7 +25,8 @@
*
*/
-#include "dvo.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
#define CH7017_TV_DISPLAY_MODE 0x00
#define CH7017_FLICKER_FILTER 0x01
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
index 397ac5..e070be 100644
--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-#include "dvo.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
#define CH7xxx_REG_VID 0x4a
#define CH7xxx_REG_DID 0x4b
diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
index 24278c..09dba3 100644
--- a/drivers/gpu/drm/i915/dvo_ivch.c
+++ b/drivers/gpu/drm/i915/dvo_ivch.c
@@ -29,7 +29,8 @@
*
*/
-#include "dvo.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
/*
* register definitions for the i82807aa.
diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c
index c584e01..c83a5d 100644
--- a/drivers/gpu/drm/i915/dvo_ns2501.c
+++ b/drivers/gpu/drm/i915/dvo_ns2501.c
@@ -26,9 +26,10 @@
*
*/
-#include "dvo.h"
-#include "i915_reg.h"
#include "i915_drv.h"
+#include "i915_reg.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
#define NS2501_VID 0x1305
#define NS2501_DID 0x6726
diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
index 4ae5d8..04698ea 100644
--- a/drivers/gpu/drm/i915/dvo_sil164.c
+++ b/drivers/gpu/drm/i915/dvo_sil164.c
@@ -26,7 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-#include "dvo.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
#define SIL164_VID 0x0001
#define SIL164_DID 0x0006
diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
index d603bc..623114e 100644
--- a/drivers/gpu/drm/i915/dvo_tfp410.c
+++ b/drivers/gpu/drm/i915/dvo_tfp410.c
@@ -25,7 +25,8 @@
*
*/
-#include "dvo.h"
+#include "intel_drv.h"
+#include "intel_dvo_dev.h"
/* register definitions according to the TFP410 data sheet */
#define TFP410_VID 0x014C
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index adef81..930013 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -32,11 +32,11 @@
#include <drm/drm_crtc.h>
#include <drm/i915_drm.h>
-#include "dvo.h"
#include "i915_drv.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_dvo.h"
+#include "intel_dvo_dev.h"
#include "intel_panel.h"
#define SIL164_ADDR 0x38
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/intel_dvo_dev.h
similarity index 97%
rename from drivers/gpu/drm/i915/dvo.h
rename to drivers/gpu/drm/i915/intel_dvo_dev.h
index 16e034..94a6ae1 100644
--- a/drivers/gpu/drm/i915/dvo.h
+++ b/drivers/gpu/drm/i915/intel_dvo_dev.h
@@ -20,12 +20,14 @@
* OF THIS SOFTWARE.
*/
-#ifndef _INTEL_DVO_H
-#define _INTEL_DVO_H
+#ifndef __INTEL_DVO_DEV_H__
+#define __INTEL_DVO_DEV_H__
#include <linux/i2c.h>
+
#include <drm/drm_crtc.h>
-#include "intel_drv.h"
+
+#include "i915_reg.h"
struct intel_dvo_device {
const char *name;
@@ -135,4 +137,4 @@ extern const struct intel_dvo_dev_ops tfp410_ops;
extern const struct intel_dvo_dev_ops ch7017_ops;
extern const struct intel_dvo_dev_ops ns2501_ops;
-#endif /* _INTEL_DVO_H */
+#endif /* __INTEL_DVO_DEV_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 04/21] drm/i915: make intel_dpll_mgr.h self-contained
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (2 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 03/21] drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 05/21] drm/i915: move dsi init functions to intel_dsi.h Jani Nikula
` (24 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
And ensure it stays that way.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_dpll_mgr.c | 1 +
drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 ++++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 69f88ab..0979af 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -22,6 +22,7 @@ header_test := \
intel_csr.h \
intel_ddi.h \
intel_dp.h \
+ intel_dpll_mgr.h \
intel_drv.h \
intel_dvo.h \
intel_dvo_dev.h \
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index e01c057..dda5dd 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -21,6 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
+#include "intel_dpll_mgr.h"
#include "intel_drv.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/intel_dpll_mgr.h
index bd8124c..8835dd2 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.h
@@ -25,6 +25,10 @@
#ifndef _INTEL_DPLL_MGR_H_
#define _INTEL_DPLL_MGR_H_
+#include <linux/types.h>
+
+#include "intel_display.h"
+
/*FIXME: Move this to a more appropriate place. */
#define abs_diff(a, b) ({ \
typeof(a) __a = (a); \
@@ -32,13 +36,13 @@
(void) (&__a == &__b); \
__a > __b ? (__a - __b) : (__b - __a); })
+struct drm_atomic_state;
+struct drm_device;
struct drm_i915_private;
struct intel_crtc;
struct intel_crtc_state;
struct intel_encoder;
-
struct intel_shared_dpll;
-struct intel_dpll_mgr;
/**
* enum intel_dpll_id - possible DPLL ids
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 05/21] drm/i915: move dsi init functions to intel_dsi.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (3 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 04/21] drm/i915: make intel_dpll_mgr.h self-contained Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 06/21] drm/i915: extract intel_fifo_underrun.h from intel_drv.h Jani Nikula
` (23 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Keep the header self-contained. It'll need rework of its own in the
future, but gotta start somewhere.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_drv.h | 5 -----
drivers/gpu/drm/i915/intel_dsi.h | 4 ++++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 0979af..ff8403 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -24,6 +24,7 @@ header_test := \
intel_dp.h \
intel_dpll_mgr.h \
intel_drv.h \
+ intel_dsi.h \
intel_dvo.h \
intel_dvo_dev.h \
intel_fbc.h \
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a38b9c..20f28e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1832,11 +1832,6 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
/* intel_dp_mst.c */
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
-/* vlv_dsi.c */
-void vlv_dsi_init(struct drm_i915_private *dev_priv);
-
-/* icl_dsi.c */
-void icl_dsi_init(struct drm_i915_private *dev_priv);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
index 705a60..1d1e6b 100644
--- a/drivers/gpu/drm/i915/intel_dsi.h
+++ b/drivers/gpu/drm/i915/intel_dsi.h
@@ -151,6 +151,9 @@ static inline u16 intel_dsi_encoder_ports(struct intel_encoder *encoder)
return enc_to_intel_dsi(&encoder->base)->ports;
}
+/* icl_dsi.c */
+void icl_dsi_init(struct drm_i915_private *dev_priv);
+
/* intel_dsi.c */
int intel_dsi_bitrate(const struct intel_dsi *intel_dsi);
int intel_dsi_tlpx_ns(const struct intel_dsi *intel_dsi);
@@ -166,6 +169,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,
struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
const struct mipi_dsi_host_ops *funcs,
enum port port);
+void vlv_dsi_init(struct drm_i915_private *dev_priv);
/* vlv_dsi_pll.c */
int vlv_dsi_pll_compute(struct intel_encoder *encoder,
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 06/21] drm/i915: extract intel_fifo_underrun.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (4 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 05/21] drm/i915: move dsi init functions to intel_dsi.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 07/21] drm/i915: extract intel_dp_link_training.h " Jani Nikula
` (22 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/intel_crt.c | 1 +
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 13 -----------
drivers/gpu/drm/i915/intel_fifo_underrun.c | 1 +
drivers/gpu/drm/i915/intel_fifo_underrun.h | 27 ++++++++++++++++++++++
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/vlv_dsi.c | 1 +
12 files changed, 37 insertions(+), 13 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index ff8403..01485f 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -29,6 +29,7 @@ header_test := \
intel_dvo_dev.h \
intel_fbc.h \
intel_fbdev.h \
+ intel_fifo_underrun.h \
intel_frontbuffer.h \
intel_hdcp.h \
intel_hdmi.h \
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 15f541..ed21f7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -40,6 +40,7 @@
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_drv.h"
+#include "intel_fifo_underrun.h"
#include "intel_psr.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index b665c3..1d32af6 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -39,6 +39,7 @@
#include "intel_crt.h"
#include "intel_ddi.h"
#include "intel_drv.h"
+#include "intel_fifo_underrun.h"
/* Here's the desired hotplug mode */
#define ADPA_HOTPLUG_BITS (ADPA_CRT_HOTPLUG_PERIOD_128 | \
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index f181c2..a1f8056 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -34,6 +34,7 @@
#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_dsi.h"
+#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
#include "intel_lspcon.h"
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5453dbe..03a2a7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -58,6 +58,7 @@
#include "intel_dvo.h"
#include "intel_fbc.h"
#include "intel_fbdev.h"
+#include "intel_fifo_underrun.h"
#include "intel_frontbuffer.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 08d9257..b9b03b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -48,6 +48,7 @@
#include "intel_ddi.h"
#include "intel_dp.h"
#include "intel_drv.h"
+#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
#include "intel_lspcon.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 20f28e..17182f5 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1581,19 +1581,6 @@ intel_atomic_get_new_crtc_state(struct intel_atomic_state *state,
&crtc->base));
}
-/* intel_fifo_underrun.c */
-bool intel_set_cpu_fifo_underrun_reporting(struct drm_i915_private *dev_priv,
- enum pipe pipe, bool enable);
-bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv,
- enum pipe pch_transcoder,
- bool enable);
-void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,
- enum pipe pipe);
-void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,
- enum pipe pch_transcoder);
-void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv);
-void intel_check_pch_fifo_underruns(struct drm_i915_private *dev_priv);
-
/* i915_irq.c */
void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.c b/drivers/gpu/drm/i915/intel_fifo_underrun.c
index 74c8b0..8545ad 100644
--- a/drivers/gpu/drm/i915/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/intel_fifo_underrun.c
@@ -28,6 +28,7 @@
#include "i915_drv.h"
#include "intel_drv.h"
#include "intel_fbc.h"
+#include "intel_fifo_underrun.h"
/**
* DOC: fifo underrun handling
diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.h b/drivers/gpu/drm/i915/intel_fifo_underrun.h
new file mode 100644
index 000000..e04f22a
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_fifo_underrun.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_FIFO_UNDERRUN_H__
+#define __INTEL_FIFO_UNDERRUN_H__
+
+#include <linux/types.h>
+
+#include "intel_display.h"
+
+struct drm_i915_private;
+
+bool intel_set_cpu_fifo_underrun_reporting(struct drm_i915_private *dev_priv,
+ enum pipe pipe, bool enable);
+bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv,
+ enum pipe pch_transcoder,
+ bool enable);
+void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,
+ enum pipe pipe);
+void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,
+ enum pipe pch_transcoder);
+void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv);
+void intel_check_pch_fifo_underruns(struct drm_i915_private *dev_priv);
+
+#endif /* __INTEL_FIFO_UNDERRUN_H__ */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index d2b3b3..e2341d 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -45,6 +45,7 @@
#include "intel_ddi.h"
#include "intel_dp.h"
#include "intel_drv.h"
+#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
#include "intel_lspcon.h"
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 0e3d91d..ef2748 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -39,6 +39,7 @@
#include "i915_drv.h"
#include "intel_connector.h"
#include "intel_drv.h"
+#include "intel_fifo_underrun.h"
#include "intel_hdmi.h"
#include "intel_panel.h"
#include "intel_sdvo.h"
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c
index b4c658..5d343a 100644
--- a/drivers/gpu/drm/i915/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/vlv_dsi.c
@@ -35,6 +35,7 @@
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_dsi.h"
+#include "intel_fifo_underrun.h"
#include "intel_panel.h"
#include "intel_sideband.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 07/21] drm/i915: extract intel_dp_link_training.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (5 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 06/21] drm/i915: extract intel_fifo_underrun.h from intel_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 08/21] drm/i915: extract intel_dp_aux_backlight.h " Jani Nikula
` (21 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_dp_link_training.c | 1 +
drivers/gpu/drm/i915/intel_dp_link_training.h | 14 ++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 4 ----
6 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 01485f..93d566 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -22,6 +22,7 @@ header_test := \
intel_csr.h \
intel_ddi.h \
intel_dp.h \
+ intel_dp_link_training.h \
intel_dpll_mgr.h \
intel_drv.h \
intel_dsi.h \
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index a1f8056..3ce421 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -32,6 +32,7 @@
#include "intel_connector.h"
#include "intel_ddi.h"
#include "intel_dp.h"
+#include "intel_dp_link_training.h"
#include "intel_drv.h"
#include "intel_dsi.h"
#include "intel_fifo_underrun.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b9b03b..c5e104f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -47,6 +47,7 @@
#include "intel_connector.h"
#include "intel_ddi.h"
#include "intel_dp.h"
+#include "intel_dp_link_training.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
index 54b0693..9b1fcce 100644
--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
@@ -22,6 +22,7 @@
*/
#include "intel_dp.h"
+#include "intel_dp_link_training.h"
#include "intel_drv.h"
static void
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.h b/drivers/gpu/drm/i915/intel_dp_link_training.h
new file mode 100644
index 000000..174566
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_DP_LINK_TRAINING_H__
+#define __INTEL_DP_LINK_TRAINING_H__
+
+struct intel_dp;
+
+void intel_dp_start_link_train(struct intel_dp *intel_dp);
+void intel_dp_stop_link_train(struct intel_dp *intel_dp);
+
+#endif /* __INTEL_DP_LINK_TRAINING_H__ */
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 17182f5..92ebc1 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1803,10 +1803,6 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane,
u32 pixel_format, u64 modifier,
unsigned int rotation);
-/* intel_dp_link_training.c */
-void intel_dp_start_link_train(struct intel_dp *intel_dp);
-void intel_dp_stop_link_train(struct intel_dp *intel_dp);
-
/* intel_vdsc.c */
int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
struct intel_crtc_state *pipe_config);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 08/21] drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (6 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 07/21] drm/i915: extract intel_dp_link_training.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 09/21] drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h Jani Nikula
` (20 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 1 +
drivers/gpu/drm/i915/intel_dp_aux_backlight.h | 13 +++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 3 ---
drivers/gpu/drm/i915/intel_panel.c | 1 +
5 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 93d566..7ca4fb 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -22,6 +22,7 @@ header_test := \
intel_csr.h \
intel_ddi.h \
intel_dp.h \
+ intel_dp_aux_backlight.h \
intel_dp_link_training.h \
intel_dpll_mgr.h \
intel_drv.h \
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
index 357136f..7ded95 100644
--- a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
@@ -22,6 +22,7 @@
*
*/
+#include "intel_dp_aux_backlight.h"
#include "intel_drv.h"
static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.h b/drivers/gpu/drm/i915/intel_dp_aux_backlight.h
new file mode 100644
index 000000..ed60c285
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_DP_AUX_BACKLIGHT_H__
+#define __INTEL_DP_AUX_BACKLIGHT_H__
+
+struct intel_connector;
+
+int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
+
+#endif /* __INTEL_DP_AUX_BACKLIGHT_H__ */
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 92ebc1..0960c6b 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1809,9 +1809,6 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
enum intel_display_power_domain
intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);
-/* intel_dp_aux_backlight.c */
-int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
-
/* intel_dp_mst.c */
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 4ab4ce..5a3e0f 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -35,6 +35,7 @@
#include <linux/pwm.h>
#include "intel_connector.h"
+#include "intel_dp_aux_backlight.h"
#include "intel_drv.h"
#include "intel_panel.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 09/21] drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (7 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 08/21] drm/i915: extract intel_dp_aux_backlight.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 10/21] drm/i915: extract intel_hotplug.h " Jani Nikula
` (19 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_drv.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 62 ------------
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/i915_irq.h | 114 ++++++++++++++++++++++
drivers/gpu/drm/i915/i915_trace.h | 1 +
drivers/gpu/drm/i915/intel_drv.h | 37 -------
drivers/gpu/drm/i915/intel_pm.c | 1 +
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
11 files changed, 122 insertions(+), 99 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_irq.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 7ca4fb..beda60e 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -7,6 +7,7 @@ header_test := \
i915_drv.h \
i915_gem_context_types.h \
i915_gem_pm.h \
+ i915_irq.h \
i915_params.h \
i915_priolist_types.h \
i915_reg.h \
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 3424d28..760551 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -9,6 +9,7 @@
#include "i915_drv.h"
#include "i915_gpu_error.h"
+#include "i915_irq.h"
#include "intel_engine_pm.h"
#include "intel_gt_pm.h"
#include "intel_reset.h"
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index ffbf5d9..0e4dff 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -35,6 +35,7 @@
#include "gt/intel_reset.h"
#include "i915_gem_context.h"
+#include "i915_irq.h"
#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbc.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index aacc8d..4cfdc27 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -52,6 +52,7 @@
#include "gt/intel_workarounds.h"
#include "i915_drv.h"
+#include "i915_irq.h"
#include "i915_pmu.h"
#include "i915_query.h"
#include "i915_trace.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1cea98..df9ac39 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2728,7 +2728,6 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
-/* i915_irq.c */
static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)
{
unsigned long delay;
@@ -2746,11 +2745,6 @@ static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)
&dev_priv->gpu_error.hangcheck_work, delay);
}
-extern void intel_irq_init(struct drm_i915_private *dev_priv);
-extern void intel_irq_fini(struct drm_i915_private *dev_priv);
-int intel_irq_install(struct drm_i915_private *dev_priv);
-void intel_irq_uninstall(struct drm_i915_private *dev_priv);
-
static inline bool intel_gvt_active(struct drm_i915_private *dev_priv)
{
return dev_priv->gvt;
@@ -2761,62 +2755,6 @@ static inline bool intel_vgpu_active(struct drm_i915_private *dev_priv)
return dev_priv->vgpu.active;
}
-u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv,
- enum pipe pipe);
-void
-i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
- u32 status_mask);
-
-void
-i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
- u32 status_mask);
-
-void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv);
-void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv);
-void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
- u32 mask,
- u32 bits);
-void ilk_update_display_irq(struct drm_i915_private *dev_priv,
- u32 interrupt_mask,
- u32 enabled_irq_mask);
-static inline void
-ilk_enable_display_irq(struct drm_i915_private *dev_priv, u32 bits)
-{
- ilk_update_display_irq(dev_priv, bits, bits);
-}
-static inline void
-ilk_disable_display_irq(struct drm_i915_private *dev_priv, u32 bits)
-{
- ilk_update_display_irq(dev_priv, bits, 0);
-}
-void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
- enum pipe pipe,
- u32 interrupt_mask,
- u32 enabled_irq_mask);
-static inline void bdw_enable_pipe_irq(struct drm_i915_private *dev_priv,
- enum pipe pipe, u32 bits)
-{
- bdw_update_pipe_irq(dev_priv, pipe, bits, bits);
-}
-static inline void bdw_disable_pipe_irq(struct drm_i915_private *dev_priv,
- enum pipe pipe, u32 bits)
-{
- bdw_update_pipe_irq(dev_priv, pipe, bits, 0);
-}
-void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
- u32 interrupt_mask,
- u32 enabled_irq_mask);
-static inline void
-ibx_enable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)
-{
- ibx_display_interrupt_update(dev_priv, bits, bits);
-}
-static inline void
-ibx_disable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)
-{
- ibx_display_interrupt_update(dev_priv, bits, 0);
-}
-
/* i915_gem.c */
int i915_gem_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ed21f7..4a6a374 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -38,6 +38,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "i915_irq.h"
#include "i915_trace.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
diff --git a/drivers/gpu/drm/i915/i915_irq.h b/drivers/gpu/drm/i915/i915_irq.h
new file mode 100644
index 000000..0ccd0d9
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_irq.h
@@ -0,0 +1,114 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_IRQ_H__
+#define __I915_IRQ_H__
+
+#include <linux/types.h>
+
+#include "i915_drv.h"
+
+struct drm_i915_private;
+struct intel_crtc;
+
+extern void intel_irq_init(struct drm_i915_private *dev_priv);
+extern void intel_irq_fini(struct drm_i915_private *dev_priv);
+int intel_irq_install(struct drm_i915_private *dev_priv);
+void intel_irq_uninstall(struct drm_i915_private *dev_priv);
+
+u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv,
+ enum pipe pipe);
+void
+i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+ u32 status_mask);
+
+void
+i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+ u32 status_mask);
+
+void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv);
+void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv);
+
+void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
+ u32 mask,
+ u32 bits);
+void ilk_update_display_irq(struct drm_i915_private *dev_priv,
+ u32 interrupt_mask,
+ u32 enabled_irq_mask);
+static inline void
+ilk_enable_display_irq(struct drm_i915_private *dev_priv, u32 bits)
+{
+ ilk_update_display_irq(dev_priv, bits, bits);
+}
+static inline void
+ilk_disable_display_irq(struct drm_i915_private *dev_priv, u32 bits)
+{
+ ilk_update_display_irq(dev_priv, bits, 0);
+}
+void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
+ enum pipe pipe,
+ u32 interrupt_mask,
+ u32 enabled_irq_mask);
+static inline void bdw_enable_pipe_irq(struct drm_i915_private *dev_priv,
+ enum pipe pipe, u32 bits)
+{
+ bdw_update_pipe_irq(dev_priv, pipe, bits, bits);
+}
+static inline void bdw_disable_pipe_irq(struct drm_i915_private *dev_priv,
+ enum pipe pipe, u32 bits)
+{
+ bdw_update_pipe_irq(dev_priv, pipe, bits, 0);
+}
+void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
+ u32 interrupt_mask,
+ u32 enabled_irq_mask);
+static inline void
+ibx_enable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)
+{
+ ibx_display_interrupt_update(dev_priv, bits, bits);
+}
+static inline void
+ibx_disable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)
+{
+ ibx_display_interrupt_update(dev_priv, bits, 0);
+}
+
+void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
+void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
+void gen6_mask_pm_irq(struct drm_i915_private *dev_priv, u32 mask);
+void gen6_unmask_pm_irq(struct drm_i915_private *dev_priv, u32 mask);
+void gen11_reset_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv);
+void gen6_rps_reset_ei(struct drm_i915_private *dev_priv);
+
+static inline u32 gen6_sanitize_rps_pm_mask(const struct drm_i915_private *i915,
+ u32 mask)
+{
+ return mask & ~i915->gt_pm.rps.pm_intrmsk_mbz;
+}
+
+void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv);
+void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv);
+static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv)
+{
+ /*
+ * We only use drm_irq_uninstall() at unload and VT switch, so
+ * this is the only thing we need to check.
+ */
+ return dev_priv->runtime_pm.irqs_enabled;
+}
+
+int intel_get_crtc_scanline(struct intel_crtc *crtc);
+void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
+ u8 pipe_mask);
+void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
+ u8 pipe_mask);
+void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv);
+void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv);
+void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv);
+
+#endif /* __I915_IRQ_H__ */
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index b5286f..83b389e 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -11,6 +11,7 @@
#include "gt/intel_engine.h"
#include "i915_drv.h"
+#include "i915_irq.h"
#include "intel_drv.h"
#undef TRACE_SYSTEM
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0960c6b..0fc726 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1581,43 +1581,6 @@ intel_atomic_get_new_crtc_state(struct intel_atomic_state *state,
&crtc->base));
}
-/* i915_irq.c */
-void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
-void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);
-void gen6_mask_pm_irq(struct drm_i915_private *dev_priv, u32 mask);
-void gen6_unmask_pm_irq(struct drm_i915_private *dev_priv, u32 mask);
-void gen11_reset_rps_interrupts(struct drm_i915_private *dev_priv);
-void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv);
-void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv);
-void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv);
-void gen6_rps_reset_ei(struct drm_i915_private *dev_priv);
-
-static inline u32 gen6_sanitize_rps_pm_mask(const struct drm_i915_private *i915,
- u32 mask)
-{
- return mask & ~i915->gt_pm.rps.pm_intrmsk_mbz;
-}
-
-void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv);
-void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv);
-static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv)
-{
- /*
- * We only use drm_irq_uninstall() at unload and VT switch, so
- * this is the only thing we need to check.
- */
- return dev_priv->runtime_pm.irqs_enabled;
-}
-
-int intel_get_crtc_scanline(struct intel_crtc *crtc);
-void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
- u8 pipe_mask);
-void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
- u8 pipe_mask);
-void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv);
-void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv);
-void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv);
-
/* intel_display.c */
void intel_plane_destroy(struct drm_plane *plane);
void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 3687e9..8eeea4 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -34,6 +34,7 @@
#include <drm/drm_plane_helper.h>
#include "i915_drv.h"
+#include "i915_irq.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_pm.h"
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 166f16..2115ee 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -32,6 +32,7 @@
#include <drm/drm_print.h>
#include "i915_drv.h"
+#include "i915_irq.h"
#include "intel_cdclk.h"
#include "intel_crt.h"
#include "intel_csr.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 10/21] drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (8 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 09/21] drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:50 ` [PATCH v2] " Jani Nikula
2019-04-29 12:29 ` [PATCH 11/21] drm/i915: extract intel_bios.h functions from i915_drv.h Jani Nikula
` (18 subsequent siblings)
28 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_drv.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 11 ---------
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/intel_crt.c | 1 +
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 5 ----
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_hotplug.h | 30 +++++++++++++++++++++++
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/intel_tv.c | 1 +
14 files changed, 41 insertions(+), 16 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_hotplug.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index beda60e..dafaaa 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -36,6 +36,7 @@ header_test := \
intel_frontbuffer.h \
intel_hdcp.h \
intel_hdmi.h \
+ intel_hotplug.h \
intel_lspcon.h \
intel_lvds.h \
intel_panel.h \
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4cfdc27..b891a6 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -63,6 +63,7 @@
#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbdev.h"
+#include "intel_hotplug.h"
#include "intel_pm.h"
#include "intel_sprite.h"
#include "intel_uc.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index df9ac39..7a6c21 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2717,17 +2717,6 @@ int intel_engines_init(struct drm_i915_private *dev_priv);
u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv);
-/* intel_hotplug.c */
-void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
- u32 pin_mask, u32 long_mask);
-void intel_hpd_init(struct drm_i915_private *dev_priv);
-void intel_hpd_init_work(struct drm_i915_private *dev_priv);
-void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
-enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
- enum port port);
-bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
-void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
-
static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)
{
unsigned long delay;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4a6a374..e31137b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -42,6 +42,7 @@
#include "i915_trace.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
+#include "intel_hotplug.h"
#include "intel_psr.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 1d32af6..eb81b4 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -40,6 +40,7 @@
#include "intel_ddi.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
+#include "intel_hotplug.h"
/* Here's the desired hotplug mode */
#define ADPA_HOTPLUG_BITS (ADPA_CRT_HOTPLUG_PERIOD_128 | \
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 3ce421..4864f85 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -38,6 +38,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_panel.h"
#include "intel_psr.h"
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 03a2a7..9b184e7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -62,6 +62,7 @@
#include "intel_frontbuffer.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lvds.h"
#include "intel_pipe_crc.h"
#include "intel_pm.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index c5e104f..a3bd69 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -52,6 +52,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_lvds.h"
#include "intel_panel.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0fc726..f71a41 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1779,11 +1779,6 @@ void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
-/* intel_hotplug.c */
-void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
-bool intel_encoder_hotplug(struct intel_encoder *encoder,
- struct intel_connector *connector);
-
/* intel_overlay.c */
void intel_overlay_setup(struct drm_i915_private *dev_priv);
void intel_overlay_cleanup(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e2341d..4d3e2c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -48,6 +48,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_sdvo.h"
#include "intel_panel.h"
diff --git a/drivers/gpu/drm/i915/intel_hotplug.h b/drivers/gpu/drm/i915/intel_hotplug.h
new file mode 100644
index 000000..805f89
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_hotplug.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_HOTPLUG_H__
+#define __INTEL_HOTPLUG_H__
+
+#include <linux/types.h>
+
+#include <drm/i915_drm.h>
+
+struct drm_i915_private;
+struct intel_connector;
+struct intel_encoder;
+
+void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
+bool intel_encoder_hotplug(struct intel_encoder *encoder,
+ struct intel_connector *connector);
+void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
+ u32 pin_mask, u32 long_mask);
+void intel_hpd_init(struct drm_i915_private *dev_priv);
+void intel_hpd_init_work(struct drm_i915_private *dev_priv);
+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
+enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
+ enum port port);
+bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
+void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
+
+#endif /* __INTEL_HOTPLUG_H__ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 2115ee..61b6fd 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -38,6 +38,7 @@
#include "intel_csr.h"
#include "intel_dp.h"
#include "intel_drv.h"
+#include "intel_hotplug.h"
#include "intel_sideband.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index ef2748..66365b1 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -41,6 +41,7 @@
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_panel.h"
#include "intel_sdvo.h"
#include "intel_sdvo_regs.h"
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 5dbba3..5dc594e 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -38,6 +38,7 @@
#include "i915_drv.h"
#include "intel_connector.h"
#include "intel_drv.h"
+#include "intel_hotplug.h"
#include "intel_tv.h"
enum tv_margin {
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 11/21] drm/i915: extract intel_bios.h functions from i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (9 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 10/21] drm/i915: extract intel_hotplug.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 12/21] drm/i915: extract intel_quirks.h from intel_drv.h Jani Nikula
` (17 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the header remains self-contained, and do so with minimal further
includes, using forward declarations as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 16 ----------------
drivers/gpu/drm/i915/intel_bios.h | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7a6c21..f0cbd6b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3281,22 +3281,6 @@ static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
}
extern void intel_i2c_reset(struct drm_i915_private *dev_priv);
-/* intel_bios.c */
-void intel_bios_init(struct drm_i915_private *dev_priv);
-void intel_bios_cleanup(struct drm_i915_private *dev_priv);
-bool intel_bios_is_valid_vbt(const void *buf, size_t size);
-bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
-bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
-bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);
-bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
-bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);
-bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
-bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,
- enum port port);
-bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,
- enum port port);
-enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port port);
-
/* intel_acpi.c */
#ifdef CONFIG_ACPI
extern void intel_register_dsm_handler(void);
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index cf871a..7bac53f 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -32,6 +32,10 @@
#include <linux/types.h>
+#include <drm/i915_drm.h>
+
+struct drm_i915_private;
+
enum intel_backlight_type {
INTEL_BACKLIGHT_PMIC,
INTEL_BACKLIGHT_LPSS,
@@ -222,4 +226,19 @@ struct mipi_pps_data {
u16 panel_power_cycle_delay;
} __packed;
+void intel_bios_init(struct drm_i915_private *dev_priv);
+void intel_bios_cleanup(struct drm_i915_private *dev_priv);
+bool intel_bios_is_valid_vbt(const void *buf, size_t size);
+bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
+bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);
+bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
+bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);
+bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
+bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,
+ enum port port);
+bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,
+ enum port port);
+enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port port);
+
#endif /* _INTEL_BIOS_H_ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 12/21] drm/i915: extract intel_quirks.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (10 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 11/21] drm/i915: extract intel_bios.h functions from i915_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 13/21] drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h Jani Nikula
` (16 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 3 ++-
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 3 ---
drivers/gpu/drm/i915/intel_quirks.c | 1 +
drivers/gpu/drm/i915/intel_quirks.h | 13 +++++++++++++
5 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_quirks.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index dafaaa..aed673 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -43,8 +43,9 @@ header_test := \
intel_pipe_crc.h \
intel_pm.h \
intel_psr.h \
- intel_sideband.h \
+ intel_quirks.h \
intel_sdvo.h \
+ intel_sideband.h \
intel_sprite.h \
intel_tv.h \
intel_uncore.h \
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9b184e7..9e4a381 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -67,6 +67,7 @@
#include "intel_pipe_crc.h"
#include "intel_pm.h"
#include "intel_psr.h"
+#include "intel_quirks.h"
#include "intel_sdvo.h"
#include "intel_sideband.h"
#include "intel_sprite.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index f71a41..b2cdd7 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1789,9 +1789,6 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
void intel_overlay_reset(struct drm_i915_private *dev_priv);
-/* intel_quirks.c */
-void intel_init_quirks(struct drm_i915_private *dev_priv);
-
/* intel_runtime_pm.c */
void intel_runtime_pm_init_early(struct drm_i915_private *dev_priv);
int intel_power_domains_init(struct drm_i915_private *);
diff --git a/drivers/gpu/drm/i915/intel_quirks.c b/drivers/gpu/drm/i915/intel_quirks.c
index ec2b0fc..0b749c2 100644
--- a/drivers/gpu/drm/i915/intel_quirks.c
+++ b/drivers/gpu/drm/i915/intel_quirks.c
@@ -6,6 +6,7 @@
#include <linux/dmi.h>
#include "intel_drv.h"
+#include "intel_quirks.h"
/*
* Some machines (Lenovo U160) do not work with SSC on LVDS for some reason
diff --git a/drivers/gpu/drm/i915/intel_quirks.h b/drivers/gpu/drm/i915/intel_quirks.h
new file mode 100644
index 000000..b0fcff
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_quirks.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_QUIRKS_H__
+#define __INTEL_QUIRKS_H__
+
+struct drm_i915_private;
+
+void intel_init_quirks(struct drm_i915_private *dev_priv);
+
+#endif /* __INTEL_QUIRKS_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 13/21] drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (11 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 12/21] drm/i915: extract intel_quirks.h from intel_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 14/21] drm/i915: extract intel_vdsc.h " Jani Nikula
` (15 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
drivers/gpu/drm/i915/i915_drv.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 6 -----
drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 10 --------
drivers/gpu/drm/i915/intel_overlay.c | 4 +++-
drivers/gpu/drm/i915/intel_overlay.h | 29 +++++++++++++++++++++++
9 files changed, 38 insertions(+), 18 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_overlay.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index aed673..03b33f 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -39,6 +39,7 @@ header_test := \
intel_hotplug.h \
intel_lspcon.h \
intel_lvds.h \
+ intel_overlay.h \
intel_panel.h \
intel_pipe_crc.h \
intel_pm.h \
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 760551..419b341 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -15,6 +15,7 @@
#include "intel_reset.h"
#include "intel_guc.h"
+#include "intel_overlay.h"
#define RESET_MAX_RETRIES 3
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b891a6..21dac5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -64,6 +64,7 @@
#include "intel_drv.h"
#include "intel_fbdev.h"
#include "intel_hotplug.h"
+#include "intel_overlay.h"
#include "intel_pm.h"
#include "intel_sprite.h"
#include "intel_uc.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f0cbd6b..c0c0e25 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3320,12 +3320,6 @@ void intel_dsc_disable(const struct intel_crtc_state *crtc_state);
int i915_reg_read_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
-/* overlay */
-extern struct intel_overlay_error_state *
-intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);
-extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,
- struct intel_overlay_error_state *error);
-
extern struct intel_display_error_state *
intel_display_capture_error_state(struct drm_i915_private *dev_priv);
extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index f51ff6..e32636 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -36,8 +36,9 @@
#include <drm/drm_print.h>
-#include "i915_gpu_error.h"
#include "i915_drv.h"
+#include "i915_gpu_error.h"
+#include "intel_overlay.h"
static inline const struct intel_engine_cs *
engine_lookup(const struct drm_i915_private *i915, unsigned int id)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9e4a381..1ec66d7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -64,6 +64,7 @@
#include "intel_hdmi.h"
#include "intel_hotplug.h"
#include "intel_lvds.h"
+#include "intel_overlay.h"
#include "intel_pipe_crc.h"
#include "intel_pm.h"
#include "intel_psr.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b2cdd7..1780699 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1779,16 +1779,6 @@ void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
-/* intel_overlay.c */
-void intel_overlay_setup(struct drm_i915_private *dev_priv);
-void intel_overlay_cleanup(struct drm_i915_private *dev_priv);
-int intel_overlay_switch_off(struct intel_overlay *overlay);
-int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-void intel_overlay_reset(struct drm_i915_private *dev_priv);
-
/* intel_runtime_pm.c */
void intel_runtime_pm_init_early(struct drm_i915_private *dev_priv);
int intel_power_domains_init(struct drm_i915_private *);
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 5c496b1..b64b45 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -25,13 +25,15 @@
*
* Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
*/
-#include <drm/i915_drm.h>
+
#include <drm/drm_fourcc.h>
+#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_reg.h"
#include "intel_drv.h"
#include "intel_frontbuffer.h"
+#include "intel_overlay.h"
/* Limits for overlay size. According to intel doc, the real limits are:
* Y width: 4095, UV width (planar): 2047, Y height: 2047,
diff --git a/drivers/gpu/drm/i915/intel_overlay.h b/drivers/gpu/drm/i915/intel_overlay.h
new file mode 100644
index 000000..a167c2
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_overlay.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_OVERLAY_H__
+#define __INTEL_OVERLAY_H__
+
+struct drm_device;
+struct drm_file;
+struct drm_i915_error_state_buf;
+struct drm_i915_private;
+struct intel_overlay;
+struct intel_overlay_error_state;
+
+void intel_overlay_setup(struct drm_i915_private *dev_priv);
+void intel_overlay_cleanup(struct drm_i915_private *dev_priv);
+int intel_overlay_switch_off(struct intel_overlay *overlay);
+int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+void intel_overlay_reset(struct drm_i915_private *dev_priv);
+struct intel_overlay_error_state *
+intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);
+void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,
+ struct intel_overlay_error_state *error);
+
+#endif /* __INTEL_OVERLAY_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 14/21] drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (12 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 13/21] drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 15/21] drm/i915: extract intel_dp_mst.h from intel_drv.h Jani Nikula
` (14 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_drv.h | 3 ---
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 6 ------
drivers/gpu/drm/i915/intel_vdsc.c | 2 ++
drivers/gpu/drm/i915/intel_vdsc.h | 21 +++++++++++++++++++++
8 files changed, 27 insertions(+), 9 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_vdsc.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 03b33f..3c7637 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -50,6 +50,7 @@ header_test := \
intel_sprite.h \
intel_tv.h \
intel_uncore.h \
+ intel_vdsc.h \
intel_wakeref.h
quiet_cmd_header_test = HDRTEST $@
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c0c0e25..d27e0d8 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3313,9 +3313,6 @@ extern void intel_rps_mark_interactive(struct drm_i915_private *i915,
bool interactive);
extern bool intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
bool enable);
-void intel_dsc_enable(struct intel_encoder *encoder,
- const struct intel_crtc_state *crtc_state);
-void intel_dsc_disable(const struct intel_crtc_state *crtc_state);
int i915_reg_read_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 4864f85..46473f 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -42,6 +42,7 @@
#include "intel_lspcon.h"
#include "intel_panel.h"
#include "intel_psr.h"
+#include "intel_vdsc.h"
struct ddi_buf_trans {
u32 trans1; /* balance leg enable, de-emph level */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1ec66d7..c72f951 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -73,6 +73,7 @@
#include "intel_sideband.h"
#include "intel_sprite.h"
#include "intel_tv.h"
+#include "intel_vdsc.h"
/* Primary plane formats for gen <= 3 */
static const u32 i8xx_primary_formats[] = {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a3bd69..4279f97 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -58,6 +58,7 @@
#include "intel_panel.h"
#include "intel_psr.h"
#include "intel_sideband.h"
+#include "intel_vdsc.h"
#define DP_DPRX_ESI_LEN 14
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1780699..0854c17 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1766,12 +1766,6 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane,
u32 pixel_format, u64 modifier,
unsigned int rotation);
-/* intel_vdsc.c */
-int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
- struct intel_crtc_state *pipe_config);
-enum intel_display_power_domain
-intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);
-
/* intel_dp_mst.c */
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/intel_vdsc.c
index 3f9921..ffec807 100644
--- a/drivers/gpu/drm/i915/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/intel_vdsc.c
@@ -7,8 +7,10 @@
*/
#include <drm/i915_drm.h>
+
#include "i915_drv.h"
#include "intel_drv.h"
+#include "intel_vdsc.h"
enum ROW_INDEX_BPP {
ROW_INDEX_6BPP = 0,
diff --git a/drivers/gpu/drm/i915/intel_vdsc.h b/drivers/gpu/drm/i915/intel_vdsc.h
new file mode 100644
index 000000..90d3f6
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_vdsc.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_VDSC_H__
+#define __INTEL_VDSC_H__
+
+struct intel_encoder;
+struct intel_crtc_state;
+struct intel_dp;
+
+void intel_dsc_enable(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state);
+void intel_dsc_disable(const struct intel_crtc_state *crtc_state);
+int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
+ struct intel_crtc_state *pipe_config);
+enum intel_display_power_domain
+intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);
+
+#endif /* __INTEL_VDSC_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 15/21] drm/i915: extract intel_dp_mst.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (13 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 14/21] drm/i915: extract intel_vdsc.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 16/21] drm/i915: extract intel_dsi_dcs_backlight.h " Jani Nikula
` (13 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
drivers/gpu/drm/i915/intel_dp_mst.h | 14 ++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 4 ----
5 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 3c7637..226c43 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -25,6 +25,7 @@ header_test := \
intel_dp.h \
intel_dp_aux_backlight.h \
intel_dp_link_training.h \
+ intel_dp_mst.h \
intel_dpll_mgr.h \
intel_drv.h \
intel_dsi.h \
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 4279f97..58f6d0 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -48,6 +48,7 @@
#include "intel_ddi.h"
#include "intel_dp.h"
#include "intel_dp_link_training.h"
+#include "intel_dp_mst.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 8839ea..46e8831 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -32,6 +32,7 @@
#include "intel_connector.h"
#include "intel_ddi.h"
#include "intel_dp.h"
+#include "intel_dp_mst.h"
#include "intel_drv.h"
static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.h b/drivers/gpu/drm/i915/intel_dp_mst.h
new file mode 100644
index 000000..1470c6
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dp_mst.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_DP_MST_H__
+#define __INTEL_DP_MST_H__
+
+struct intel_digital_port;
+
+int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
+void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
+
+#endif /* __INTEL_DP_MST_H__ */
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0854c17..91474a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1766,10 +1766,6 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane,
u32 pixel_format, u64 modifier,
unsigned int rotation);
-/* intel_dp_mst.c */
-int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
-void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
-
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 16/21] drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (14 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 15/21] drm/i915: extract intel_dp_mst.h from intel_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 17/21] drm/i915: extract intel_atomic.h " Jani Nikula
` (12 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_drv.h | 3 ---
drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 8 +++++---
drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h | 13 +++++++++++++
drivers/gpu/drm/i915/intel_panel.c | 1 +
5 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 226c43..fa7542a 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -29,6 +29,7 @@ header_test := \
intel_dpll_mgr.h \
intel_drv.h \
intel_dsi.h \
+ intel_dsi_dcs_backlight.h \
intel_dvo.h \
intel_dvo_dev.h \
intel_fbc.h \
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 91474a..71ae3be 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1766,9 +1766,6 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane,
u32 pixel_format, u64 modifier,
unsigned int rotation);
-/* intel_dsi_dcs_backlight.c */
-int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
-
/* intel_runtime_pm.c */
void intel_runtime_pm_init_early(struct drm_i915_private *dev_priv);
int intel_power_domains_init(struct drm_i915_private *);
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
index 150a15..8c33262 100644
--- a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
+++ b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
@@ -23,11 +23,13 @@
* Author: Deepak M <m.deepak at intel.com>
*/
+#include <drm/drm_mipi_dsi.h>
+#include <video/mipi_display.h>
+
+#include "i915_drv.h"
#include "intel_drv.h"
#include "intel_dsi.h"
-#include "i915_drv.h"
-#include <video/mipi_display.h>
-#include <drm/drm_mipi_dsi.h>
+#include "intel_dsi_dcs_backlight.h"
#define CONTROL_DISPLAY_BCTRL (1 << 5)
#define CONTROL_DISPLAY_DD (1 << 3)
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h
new file mode 100644
index 000000..eb0194
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_DSI_DCS_BACKLIGHT_H__
+#define __INTEL_DSI_DCS_BACKLIGHT_H__
+
+struct intel_connector;
+
+int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
+
+#endif /* __INTEL_DSI_DCS_BACKLIGHT_H__ */
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 5a3e0f..9cd4e3 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -37,6 +37,7 @@
#include "intel_connector.h"
#include "intel_dp_aux_backlight.h"
#include "intel_drv.h"
+#include "intel_dsi_dcs_backlight.h"
#include "intel_panel.h"
#define CRC_PMIC_PWM_PERIOD_NS 21333
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 17/21] drm/i915: extract intel_atomic.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (15 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 16/21] drm/i915: extract intel_dsi_dcs_backlight.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:53 ` [PATCH v2] " Jani Nikula
2019-04-29 12:29 ` [PATCH 18/21] drm/i915: extract intel_runtime_pm.h " Jani Nikula
` (11 subsequent siblings)
28 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
drivers/gpu/drm/i915/icl_dsi.c | 1 +
drivers/gpu/drm/i915/intel_atomic.c | 12 ++++++
drivers/gpu/drm/i915/intel_atomic.h | 49 +++++++++++++++++++++++
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 36 -----------------
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_lvds.c | 1 +
drivers/gpu/drm/i915/intel_pipe_crc.c | 1 +
drivers/gpu/drm/i915/intel_pm.c | 1 +
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/vlv_dsi.c | 1 +
15 files changed, 73 insertions(+), 36 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_atomic.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index fa7542a..bff153 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -13,6 +13,7 @@ header_test := \
i915_reg.h \
i915_scheduler_types.h \
i915_timeline_types.h \
+ intel_atomic.h \
intel_atomic_plane.h \
intel_audio.h \
intel_bios.h \
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index e32636..e1b858 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -38,6 +38,7 @@
#include "i915_drv.h"
#include "i915_gpu_error.h"
+#include "intel_atomic.h"
#include "intel_overlay.h"
static inline const struct intel_engine_cs *
diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
index 9d962e..c6ecc00 100644
--- a/drivers/gpu/drm/i915/icl_dsi.c
+++ b/drivers/gpu/drm/i915/icl_dsi.c
@@ -28,6 +28,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_mipi_dsi.h>
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_ddi.h"
#include "intel_dsi.h"
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 8c8fae..30a037 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -411,3 +411,15 @@ void intel_atomic_state_clear(struct drm_atomic_state *s)
drm_atomic_state_default_clear(&state->base);
state->dpll_set = state->modeset = false;
}
+
+struct intel_crtc_state *
+intel_atomic_get_crtc_state(struct drm_atomic_state *state,
+ struct intel_crtc *crtc)
+{
+ struct drm_crtc_state *crtc_state;
+ crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
+ if (IS_ERR(crtc_state))
+ return ERR_CAST(crtc_state);
+
+ return to_intel_crtc_state(crtc_state);
+}
diff --git a/drivers/gpu/drm/i915/intel_atomic.h b/drivers/gpu/drm/i915/intel_atomic.h
new file mode 100644
index 000000..1c8507
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_atomic.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_ATOMIC_H__
+#define __INTEL_ATOMIC_H__
+
+#include <linux/types.h>
+
+struct drm_atomic_state;
+struct drm_connector;
+struct drm_connector_state;
+struct drm_crtc;
+struct drm_crtc_state;
+struct drm_device;
+struct drm_i915_private;
+struct drm_property;
+struct intel_crtc;
+struct intel_crtc_state;
+
+int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
+ const struct drm_connector_state *state,
+ struct drm_property *property,
+ u64 *val);
+int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
+ struct drm_connector_state *state,
+ struct drm_property *property,
+ u64 val);
+int intel_digital_connector_atomic_check(struct drm_connector *conn,
+ struct drm_connector_state *new_state);
+struct drm_connector_state *
+intel_digital_connector_duplicate_state(struct drm_connector *connector);
+
+struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);
+void intel_crtc_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state);
+struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
+void intel_atomic_state_clear(struct drm_atomic_state *state);
+
+struct intel_crtc_state *
+intel_atomic_get_crtc_state(struct drm_atomic_state *state,
+ struct intel_crtc *crtc);
+
+int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
+ struct intel_crtc *intel_crtc,
+ struct intel_crtc_state *crtc_state);
+
+#endif /* __INTEL_ATOMIC_H__ */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c72f951..33fa0e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -47,6 +47,7 @@
#include "i915_drv.h"
#include "i915_gem_clflush.h"
#include "i915_trace.h"
+#include "intel_atomic.h"
#include "intel_atomic_plane.h"
#include "intel_color.h"
#include "intel_cdclk.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 58f6d0..4e7b8d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -43,6 +43,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 46e8831..725518 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -28,6 +28,7 @@
#include <drm/drm_probe_helper.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 71ae3be..aa5542d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1912,40 +1912,4 @@ void chv_phy_powergate_lanes(struct intel_encoder *encoder,
bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,
enum dpio_channel ch, bool override);
-/* intel_atomic.c */
-int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
- const struct drm_connector_state *state,
- struct drm_property *property,
- u64 *val);
-int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
- struct drm_connector_state *state,
- struct drm_property *property,
- u64 val);
-int intel_digital_connector_atomic_check(struct drm_connector *conn,
- struct drm_connector_state *new_state);
-struct drm_connector_state *
-intel_digital_connector_duplicate_state(struct drm_connector *connector);
-
-struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);
-void intel_crtc_destroy_state(struct drm_crtc *crtc,
- struct drm_crtc_state *state);
-struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
-void intel_atomic_state_clear(struct drm_atomic_state *);
-
-static inline struct intel_crtc_state *
-intel_atomic_get_crtc_state(struct drm_atomic_state *state,
- struct intel_crtc *crtc)
-{
- struct drm_crtc_state *crtc_state;
- crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
- if (IS_ERR(crtc_state))
- return ERR_CAST(crtc_state);
-
- return to_intel_crtc_state(crtc_state);
-}
-
-int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
- struct intel_crtc *intel_crtc,
- struct intel_crtc_state *crtc_state);
-
#endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 4d3e2c..f8440c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -40,6 +40,7 @@
#include <drm/intel_lpe_audio.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 51d1d59..dcfca4 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -40,6 +40,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_lvds.h"
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index e94b5b..337600f0 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -29,6 +29,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
+#include "intel_atomic.h"
#include "intel_drv.h"
#include "intel_pipe_crc.h"
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8eeea4..350a671 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -35,6 +35,7 @@
#include "i915_drv.h"
#include "i915_irq.h"
+#include "intel_atomic.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_pm.h"
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 66365b1..743e745 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -37,6 +37,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c
index 5d343a..bc5b78 100644
--- a/drivers/gpu/drm/i915/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/vlv_dsi.c
@@ -32,6 +32,7 @@
#include <drm/drm_mipi_dsi.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_dsi.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 18/21] drm/i915: extract intel_runtime_pm.h from intel_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (16 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 17/21] drm/i915: extract intel_atomic.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-05-21 18:38 ` [18/21] " Nathan Chancellor
2019-04-29 12:29 ` [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h Jani Nikula
` (10 subsequent siblings)
28 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_drv.h | 89 --------------------
drivers/gpu/drm/i915/intel_runtime_pm.h | 105 ++++++++++++++++++++++++
3 files changed, 106 insertions(+), 89 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.h
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d27e0d8..6cc749 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -72,6 +72,7 @@
#include "intel_dpll_mgr.h"
#include "intel_frontbuffer.h"
#include "intel_opregion.h"
+#include "intel_runtime_pm.h"
#include "intel_uc.h"
#include "intel_uncore.h"
#include "intel_wakeref.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index aa5542d..57ae396 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -28,7 +28,6 @@
#include <linux/async.h>
#include <linux/i2c.h>
#include <linux/sched/clock.h>
-#include <linux/stackdepot.h>
#include <drm/drm_atomic.h>
#include <drm/drm_crtc.h>
@@ -1714,12 +1713,7 @@ void intel_prepare_reset(struct drm_i915_private *dev_priv);
void intel_finish_reset(struct drm_i915_private *dev_priv);
void hsw_enable_pc8(struct drm_i915_private *dev_priv);
void hsw_disable_pc8(struct drm_i915_private *dev_priv);
-void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv);
-void bxt_enable_dc9(struct drm_i915_private *dev_priv);
-void bxt_disable_dc9(struct drm_i915_private *dev_priv);
-void gen9_enable_dc5(struct drm_i915_private *dev_priv);
unsigned int skl_cdclk_get_vco(unsigned int freq);
-void skl_enable_dc6(struct drm_i915_private *dev_priv);
void intel_dp_get_m_n(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config);
void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,
@@ -1767,55 +1761,6 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane,
unsigned int rotation);
/* intel_runtime_pm.c */
-void intel_runtime_pm_init_early(struct drm_i915_private *dev_priv);
-int intel_power_domains_init(struct drm_i915_private *);
-void intel_power_domains_cleanup(struct drm_i915_private *dev_priv);
-void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);
-void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv);
-void icl_display_core_init(struct drm_i915_private *dev_priv, bool resume);
-void icl_display_core_uninit(struct drm_i915_private *dev_priv);
-void intel_power_domains_enable(struct drm_i915_private *dev_priv);
-void intel_power_domains_disable(struct drm_i915_private *dev_priv);
-
-enum i915_drm_suspend_mode {
- I915_DRM_SUSPEND_IDLE,
- I915_DRM_SUSPEND_MEM,
- I915_DRM_SUSPEND_HIBERNATE,
-};
-
-void intel_power_domains_suspend(struct drm_i915_private *dev_priv,
- enum i915_drm_suspend_mode);
-void intel_power_domains_resume(struct drm_i915_private *dev_priv);
-void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume);
-void bxt_display_core_uninit(struct drm_i915_private *dev_priv);
-void intel_runtime_pm_enable(struct drm_i915_private *dev_priv);
-void intel_runtime_pm_disable(struct drm_i915_private *dev_priv);
-void intel_runtime_pm_cleanup(struct drm_i915_private *dev_priv);
-const char *
-intel_display_power_domain_str(enum intel_display_power_domain domain);
-
-bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain);
-bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain);
-intel_wakeref_t intel_display_power_get(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain);
-intel_wakeref_t
-intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain);
-void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain);
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
-void intel_display_power_put(struct drm_i915_private *dev_priv,
- enum intel_display_power_domain domain,
- intel_wakeref_t wakeref);
-#else
-#define intel_display_power_put(i915, domain, wakeref) \
- intel_display_power_put_unchecked(i915, domain)
-#endif
-void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,
- u8 req_slices);
-
static inline void
assert_rpm_device_not_suspended(struct i915_runtime_pm *rpm)
{
@@ -1878,38 +1823,4 @@ enable_rpm_wakeref_asserts(struct drm_i915_private *i915)
atomic_dec(&i915->runtime_pm.wakeref_count);
}
-intel_wakeref_t intel_runtime_pm_get(struct drm_i915_private *i915);
-intel_wakeref_t intel_runtime_pm_get_if_in_use(struct drm_i915_private *i915);
-intel_wakeref_t intel_runtime_pm_get_noresume(struct drm_i915_private *i915);
-
-#define with_intel_runtime_pm(i915, wf) \
- for ((wf) = intel_runtime_pm_get(i915); (wf); \
- intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-
-#define with_intel_runtime_pm_if_in_use(i915, wf) \
- for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
- intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-
-void intel_runtime_pm_put_unchecked(struct drm_i915_private *i915);
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
-void intel_runtime_pm_put(struct drm_i915_private *i915, intel_wakeref_t wref);
-#else
-#define intel_runtime_pm_put(i915, wref) intel_runtime_pm_put_unchecked(i915)
-#endif
-
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
-void print_intel_runtime_pm_wakeref(struct drm_i915_private *i915,
- struct drm_printer *p);
-#else
-static inline void print_intel_runtime_pm_wakeref(struct drm_i915_private *i915,
- struct drm_printer *p)
-{
-}
-#endif
-
-void chv_phy_powergate_lanes(struct intel_encoder *encoder,
- bool override, unsigned int mask);
-bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,
- enum dpio_channel ch, bool override);
-
#endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
new file mode 100644
index 000000..692277
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
@@ -0,0 +1,105 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_RUNTIME_PM_H__
+#define __INTEL_RUNTIME_PM_H__
+
+#include <linux/stackdepot.h>
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+typedef depot_stack_handle_t intel_wakeref_t;
+
+enum i915_drm_suspend_mode {
+ I915_DRM_SUSPEND_IDLE,
+ I915_DRM_SUSPEND_MEM,
+ I915_DRM_SUSPEND_HIBERNATE,
+};
+
+void skl_enable_dc6(struct drm_i915_private *dev_priv);
+void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv);
+void bxt_enable_dc9(struct drm_i915_private *dev_priv);
+void bxt_disable_dc9(struct drm_i915_private *dev_priv);
+void gen9_enable_dc5(struct drm_i915_private *dev_priv);
+
+void intel_runtime_pm_init_early(struct drm_i915_private *dev_priv);
+int intel_power_domains_init(struct drm_i915_private *);
+void intel_power_domains_cleanup(struct drm_i915_private *dev_priv);
+void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);
+void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv);
+void icl_display_core_init(struct drm_i915_private *dev_priv, bool resume);
+void icl_display_core_uninit(struct drm_i915_private *dev_priv);
+void intel_power_domains_enable(struct drm_i915_private *dev_priv);
+void intel_power_domains_disable(struct drm_i915_private *dev_priv);
+void intel_power_domains_suspend(struct drm_i915_private *dev_priv,
+ enum i915_drm_suspend_mode);
+void intel_power_domains_resume(struct drm_i915_private *dev_priv);
+void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume);
+void bxt_display_core_uninit(struct drm_i915_private *dev_priv);
+void intel_runtime_pm_enable(struct drm_i915_private *dev_priv);
+void intel_runtime_pm_disable(struct drm_i915_private *dev_priv);
+void intel_runtime_pm_cleanup(struct drm_i915_private *dev_priv);
+
+const char *
+intel_display_power_domain_str(enum intel_display_power_domain domain);
+
+bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain);
+bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain);
+intel_wakeref_t intel_display_power_get(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain);
+intel_wakeref_t
+intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain);
+void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain);
+#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
+void intel_display_power_put(struct drm_i915_private *dev_priv,
+ enum intel_display_power_domain domain,
+ intel_wakeref_t wakeref);
+#else
+#define intel_display_power_put(i915, domain, wakeref) \
+ intel_display_power_put_unchecked(i915, domain)
+#endif
+void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,
+ u8 req_slices);
+
+intel_wakeref_t intel_runtime_pm_get(struct drm_i915_private *i915);
+intel_wakeref_t intel_runtime_pm_get_if_in_use(struct drm_i915_private *i915);
+intel_wakeref_t intel_runtime_pm_get_noresume(struct drm_i915_private *i915);
+
+#define with_intel_runtime_pm(i915, wf) \
+ for ((wf) = intel_runtime_pm_get(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
+
+#define with_intel_runtime_pm_if_in_use(i915, wf) \
+ for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
+
+void intel_runtime_pm_put_unchecked(struct drm_i915_private *i915);
+#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
+void intel_runtime_pm_put(struct drm_i915_private *i915, intel_wakeref_t wref);
+#else
+#define intel_runtime_pm_put(i915, wref) intel_runtime_pm_put_unchecked(i915)
+#endif
+
+#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
+void print_intel_runtime_pm_wakeref(struct drm_i915_private *i915,
+ struct drm_printer *p);
+#else
+static inline void print_intel_runtime_pm_wakeref(struct drm_i915_private *i915,
+ struct drm_printer *p)
+{
+}
+#endif
+
+void chv_phy_powergate_lanes(struct intel_encoder *encoder,
+ bool override, unsigned int mask);
+bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,
+ enum dpio_channel ch, bool override);
+
+#endif /* __INTEL_RUNTIME_PM_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (17 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 18/21] drm/i915: extract intel_runtime_pm.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:45 ` Chris Wilson
2019-04-29 12:29 ` [PATCH 20/21] drm/i915: extract intel_combo_phy.h " Jani Nikula
` (9 subsequent siblings)
28 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Commit 696173b064c6 ("drm/i915: extract intel_pm.h from intel_drv.h")
missed the declarations in i915_drv.h.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 13 -------------
drivers/gpu/drm/i915/i915_pmu.c | 3 ++-
drivers/gpu/drm/i915/i915_sysfs.c | 3 ++-
drivers/gpu/drm/i915/intel_pm.c | 6 ++++++
drivers/gpu/drm/i915/intel_pm.h | 10 ++++++++++
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 6cc749..16b2ce7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3370,19 +3370,6 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv);
void cnl_combo_phys_init(struct drm_i915_private *dev_priv);
void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv);
-int intel_gpu_freq(struct drm_i915_private *dev_priv, int val);
-int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
-u64 intel_rc6_residency_ns(struct drm_i915_private *dev_priv,
- const i915_reg_t reg);
-
-u32 intel_get_cagf(struct drm_i915_private *dev_priv, u32 rpstat1);
-
-static inline u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv,
- const i915_reg_t reg)
-{
- return DIV_ROUND_UP_ULL(intel_rc6_residency_ns(dev_priv, reg), 1000);
-}
-
#define __I915_REG_OP(op__, dev_priv__, ...) \
intel_uncore_##op__(&(dev_priv__)->uncore, __VA_ARGS__)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 35e5024..1ccda0e 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -9,8 +9,9 @@
#include "gt/intel_engine.h"
-#include "i915_pmu.h"
#include "i915_drv.h"
+#include "i915_pmu.h"
+#include "intel_pm.h"
/* Frequency for the sampling timer for events which need it. */
#define FREQUENCY 200
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 9bb3a15..3ef07b 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -30,9 +30,10 @@
#include <linux/stat.h>
#include <linux/sysfs.h>
+#include "i915_drv.h"
#include "intel_drv.h"
+#include "intel_pm.h"
#include "intel_sideband.h"
-#include "i915_drv.h"
static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev)
{
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 350a671..7a7c5e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -9901,6 +9901,12 @@ u64 intel_rc6_residency_ns(struct drm_i915_private *dev_priv,
return mul_u64_u32_div(time_hw, mul, div);
}
+u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv,
+ i915_reg_t reg)
+{
+ return DIV_ROUND_UP_ULL(intel_rc6_residency_ns(dev_priv, reg), 1000);
+}
+
u32 intel_get_cagf(struct drm_i915_private *dev_priv, u32 rpstat)
{
u32 cagf;
diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h
index 674a3f..17339c 100644
--- a/drivers/gpu/drm/i915/intel_pm.h
+++ b/drivers/gpu/drm/i915/intel_pm.h
@@ -8,6 +8,8 @@
#include <linux/types.h>
+#include "i915_reg.h"
+
struct drm_atomic_state;
struct drm_device;
struct drm_i915_private;
@@ -68,4 +70,12 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,
void intel_init_ipc(struct drm_i915_private *dev_priv);
void intel_enable_ipc(struct drm_i915_private *dev_priv);
+int intel_gpu_freq(struct drm_i915_private *dev_priv, int val);
+int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
+u64 intel_rc6_residency_ns(struct drm_i915_private *dev_priv, i915_reg_t reg);
+u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, i915_reg_t reg);
+
+u32 intel_get_cagf(struct drm_i915_private *dev_priv, u32 rpstat1);
+
+
#endif /* __INTEL_PM_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 20/21] drm/i915: extract intel_combo_phy.h from i915_drv.h
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (18 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:29 ` [PATCH 21/21] drm/i915: add single combo phy init/unit functions Jani Nikula
` (8 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_drv.h | 6 ------
drivers/gpu/drm/i915/intel_combo_phy.c | 1 +
drivers/gpu/drm/i915/intel_combo_phy.h | 16 ++++++++++++++++
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
5 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index bff153..95e4ee 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -19,6 +19,7 @@ header_test := \
intel_bios.h \
intel_cdclk.h \
intel_color.h \
+ intel_combo_phy.h \
intel_connector.h \
intel_crt.h \
intel_csr.h \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 16b2ce7..886a30 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3364,12 +3364,6 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,
void vlv_phy_reset_lanes(struct intel_encoder *encoder,
const struct intel_crtc_state *old_crtc_state);
-/* intel_combo_phy.c */
-void icl_combo_phys_init(struct drm_i915_private *dev_priv);
-void icl_combo_phys_uninit(struct drm_i915_private *dev_priv);
-void cnl_combo_phys_init(struct drm_i915_private *dev_priv);
-void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv);
-
#define __I915_REG_OP(op__, dev_priv__, ...) \
intel_uncore_##op__(&(dev_priv__)->uncore, __VA_ARGS__)
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c
index 2bf4359d7..5c7eb6c 100644
--- a/drivers/gpu/drm/i915/intel_combo_phy.c
+++ b/drivers/gpu/drm/i915/intel_combo_phy.c
@@ -3,6 +3,7 @@
* Copyright © 2018 Intel Corporation
*/
+#include "intel_combo_phy.h"
#include "intel_drv.h"
#define for_each_combo_port(__dev_priv, __port) \
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.h b/drivers/gpu/drm/i915/intel_combo_phy.h
new file mode 100644
index 000000..f7f1e5
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_combo_phy.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_COMBO_PHY_H__
+#define __INTEL_COMBO_PHY_H__
+
+struct drm_i915_private;
+
+void icl_combo_phys_init(struct drm_i915_private *dev_priv);
+void icl_combo_phys_uninit(struct drm_i915_private *dev_priv);
+void cnl_combo_phys_init(struct drm_i915_private *dev_priv);
+void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv);
+
+#endif /* __INTEL_COMBO_PHY_H__ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 61b6fd..c5566e 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -34,6 +34,7 @@
#include "i915_drv.h"
#include "i915_irq.h"
#include "intel_cdclk.h"
+#include "intel_combo_phy.h"
#include "intel_crt.h"
#include "intel_csr.h"
#include "intel_dp.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 21/21] drm/i915: add single combo phy init/unit functions
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (19 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 20/21] drm/i915: extract intel_combo_phy.h " Jani Nikula
@ 2019-04-29 12:29 ` Jani Nikula
2019-04-29 12:55 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev2) Patchwork
` (7 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Work on the principle that files should prefer not to expose platform
specific functions.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_combo_phy.c | 24 ++++++++++++++++++++----
drivers/gpu/drm/i915/intel_combo_phy.h | 6 ++----
drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++-----
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c
index 5c7eb6c..a8660d 100644
--- a/drivers/gpu/drm/i915/intel_combo_phy.c
+++ b/drivers/gpu/drm/i915/intel_combo_phy.c
@@ -148,7 +148,7 @@ static bool cnl_combo_phy_verify_state(struct drm_i915_private *dev_priv)
return ret;
}
-void cnl_combo_phys_init(struct drm_i915_private *dev_priv)
+static void cnl_combo_phys_init(struct drm_i915_private *dev_priv)
{
u32 val;
@@ -168,7 +168,7 @@ void cnl_combo_phys_init(struct drm_i915_private *dev_priv)
I915_WRITE(CNL_PORT_CL1CM_DW5, val);
}
-void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv)
+static void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv)
{
u32 val;
@@ -204,7 +204,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,
return ret;
}
-void icl_combo_phys_init(struct drm_i915_private *dev_priv)
+static void icl_combo_phys_init(struct drm_i915_private *dev_priv)
{
enum port port;
@@ -233,7 +233,7 @@ void icl_combo_phys_init(struct drm_i915_private *dev_priv)
}
}
-void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
+static void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
{
enum port port;
@@ -254,3 +254,19 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
I915_WRITE(ICL_PORT_COMP_DW0(port), val);
}
}
+
+void intel_combo_phy_init(struct drm_i915_private *i915)
+{
+ if (INTEL_GEN(i915) >= 11)
+ icl_combo_phys_init(i915);
+ else if (IS_CANNONLAKE(i915))
+ cnl_combo_phys_init(i915);
+}
+
+void intel_combo_phy_uninit(struct drm_i915_private *i915)
+{
+ if (INTEL_GEN(i915) >= 11)
+ icl_combo_phys_uninit(i915);
+ else if (IS_CANNONLAKE(i915))
+ cnl_combo_phys_uninit(i915);
+}
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.h b/drivers/gpu/drm/i915/intel_combo_phy.h
index f7f1e5..3ecb1e 100644
--- a/drivers/gpu/drm/i915/intel_combo_phy.h
+++ b/drivers/gpu/drm/i915/intel_combo_phy.h
@@ -8,9 +8,7 @@
struct drm_i915_private;
-void icl_combo_phys_init(struct drm_i915_private *dev_priv);
-void icl_combo_phys_uninit(struct drm_i915_private *dev_priv);
-void cnl_combo_phys_init(struct drm_i915_private *dev_priv);
-void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv);
+void intel_combo_phy_init(struct drm_i915_private *dev_priv);
+void intel_combo_phy_uninit(struct drm_i915_private *dev_priv);
#endif /* __INTEL_COMBO_PHY_H__ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index c5566e..6d7370a 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -1140,7 +1140,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv,
* PHY's HW context for port B is lost after DC transitions,
* so we need to restore it manually.
*/
- icl_combo_phys_init(dev_priv);
+ intel_combo_phy_init(dev_priv);
}
static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv,
@@ -3779,7 +3779,7 @@ static void cnl_display_core_init(struct drm_i915_private *dev_priv, bool resume
intel_pch_reset_handshake(dev_priv, !HAS_PCH_NOP(dev_priv));
/* 2-3. */
- cnl_combo_phys_init(dev_priv);
+ intel_combo_phy_init(dev_priv);
/*
* 4. Enable Power Well 1 (PG1).
@@ -3828,7 +3828,7 @@ static void cnl_display_core_uninit(struct drm_i915_private *dev_priv)
usleep_range(10, 30); /* 10 us delay per Bspec */
/* 5. */
- cnl_combo_phys_uninit(dev_priv);
+ intel_combo_phy_uninit(dev_priv);
}
void icl_display_core_init(struct drm_i915_private *dev_priv,
@@ -3843,7 +3843,7 @@ void icl_display_core_init(struct drm_i915_private *dev_priv,
intel_pch_reset_handshake(dev_priv, !HAS_PCH_NOP(dev_priv));
/* 2-3. */
- icl_combo_phys_init(dev_priv);
+ intel_combo_phy_init(dev_priv);
/*
* 4. Enable Power Well 1 (PG1).
@@ -3893,7 +3893,7 @@ void icl_display_core_uninit(struct drm_i915_private *dev_priv)
mutex_unlock(&power_domains->lock);
/* 5. */
- icl_combo_phys_uninit(dev_priv);
+ intel_combo_phy_uninit(dev_priv);
}
static void chv_phy_control_init(struct drm_i915_private *dev_priv)
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h
2019-04-29 12:29 ` [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h Jani Nikula
@ 2019-04-29 12:45 ` Chris Wilson
2019-04-29 13:03 ` Jani Nikula
0 siblings, 1 reply; 40+ messages in thread
From: Chris Wilson @ 2019-04-29 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Quoting Jani Nikula (2019-04-29 13:29:37)
> Commit 696173b064c6 ("drm/i915: extract intel_pm.h from intel_drv.h")
> missed the declarations in i915_drv.h.
Fwiw, I want to pull these along with gt powermanagement and rps into
gt/intel_gt_pm.c and a few friends.
Doesn't make much difference for this patch; just planned obsolescence.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v2] drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
2019-04-29 12:29 ` [PATCH 10/21] drm/i915: extract intel_hotplug.h " Jani Nikula
@ 2019-04-29 12:50 ` Jani Nikula
0 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:50 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
v2: fix sparse warnings on undeclared global functions
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_drv.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 11 ---------
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/intel_crt.c | 1 +
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 5 ----
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_hotplug.c | 1 +
drivers/gpu/drm/i915/intel_hotplug.h | 30 +++++++++++++++++++++++
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/intel_tv.c | 1 +
15 files changed, 42 insertions(+), 16 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_hotplug.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index beda60e..dafaaa 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -36,6 +36,7 @@ header_test := \
intel_frontbuffer.h \
intel_hdcp.h \
intel_hdmi.h \
+ intel_hotplug.h \
intel_lspcon.h \
intel_lvds.h \
intel_panel.h \
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4cfdc27..b891a6 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -63,6 +63,7 @@
#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbdev.h"
+#include "intel_hotplug.h"
#include "intel_pm.h"
#include "intel_sprite.h"
#include "intel_uc.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index df9ac39..7a6c21 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2717,17 +2717,6 @@ int intel_engines_init(struct drm_i915_private *dev_priv);
u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv);
-/* intel_hotplug.c */
-void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
- u32 pin_mask, u32 long_mask);
-void intel_hpd_init(struct drm_i915_private *dev_priv);
-void intel_hpd_init_work(struct drm_i915_private *dev_priv);
-void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
-enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
- enum port port);
-bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
-void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
-
static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)
{
unsigned long delay;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4a6a374..e31137b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -42,6 +42,7 @@
#include "i915_trace.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
+#include "intel_hotplug.h"
#include "intel_psr.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 1d32af6..eb81b4 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -40,6 +40,7 @@
#include "intel_ddi.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
+#include "intel_hotplug.h"
/* Here's the desired hotplug mode */
#define ADPA_HOTPLUG_BITS (ADPA_CRT_HOTPLUG_PERIOD_128 | \
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 3ce421..4864f85 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -38,6 +38,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_panel.h"
#include "intel_psr.h"
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 03a2a7..9b184e7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -62,6 +62,7 @@
#include "intel_frontbuffer.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lvds.h"
#include "intel_pipe_crc.h"
#include "intel_pm.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index c5e104f..a3bd69 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -52,6 +52,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_lvds.h"
#include "intel_panel.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0fc726..f71a41 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1779,11 +1779,6 @@ void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
-/* intel_hotplug.c */
-void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
-bool intel_encoder_hotplug(struct intel_encoder *encoder,
- struct intel_connector *connector);
-
/* intel_overlay.c */
void intel_overlay_setup(struct drm_i915_private *dev_priv);
void intel_overlay_cleanup(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e2341d..4d3e2c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -48,6 +48,7 @@
#include "intel_fifo_underrun.h"
#include "intel_hdcp.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_lspcon.h"
#include "intel_sdvo.h"
#include "intel_panel.h"
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index b8937c..ff9eb3c 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -27,6 +27,7 @@
#include "i915_drv.h"
#include "intel_drv.h"
+#include "intel_hotplug.h"
/**
* DOC: Hotplug
diff --git a/drivers/gpu/drm/i915/intel_hotplug.h b/drivers/gpu/drm/i915/intel_hotplug.h
new file mode 100644
index 000000..805f89
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_hotplug.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_HOTPLUG_H__
+#define __INTEL_HOTPLUG_H__
+
+#include <linux/types.h>
+
+#include <drm/i915_drm.h>
+
+struct drm_i915_private;
+struct intel_connector;
+struct intel_encoder;
+
+void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
+bool intel_encoder_hotplug(struct intel_encoder *encoder,
+ struct intel_connector *connector);
+void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
+ u32 pin_mask, u32 long_mask);
+void intel_hpd_init(struct drm_i915_private *dev_priv);
+void intel_hpd_init_work(struct drm_i915_private *dev_priv);
+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
+enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
+ enum port port);
+bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
+void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
+
+#endif /* __INTEL_HOTPLUG_H__ */
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 2115ee..61b6fd 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -38,6 +38,7 @@
#include "intel_csr.h"
#include "intel_dp.h"
#include "intel_drv.h"
+#include "intel_hotplug.h"
#include "intel_sideband.h"
/**
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index ef2748..66365b1 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -41,6 +41,7 @@
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
#include "intel_hdmi.h"
+#include "intel_hotplug.h"
#include "intel_panel.h"
#include "intel_sdvo.h"
#include "intel_sdvo_regs.h"
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 5dbba3..5dc594e 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -38,6 +38,7 @@
#include "i915_drv.h"
#include "intel_connector.h"
#include "intel_drv.h"
+#include "intel_hotplug.h"
#include "intel_tv.h"
enum tv_margin {
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v2] drm/i915: extract intel_atomic.h from intel_drv.h
2019-04-29 12:29 ` [PATCH 17/21] drm/i915: extract intel_atomic.h " Jani Nikula
@ 2019-04-29 12:53 ` Jani Nikula
0 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 12:53 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
It used to be handy that we only had a couple of headers, but over time
intel_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.
Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.
No functional changes.
v2: fix sparse warnings on undeclared global functions
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
drivers/gpu/drm/i915/icl_dsi.c | 1 +
drivers/gpu/drm/i915/intel_atomic.c | 13 ++++++
drivers/gpu/drm/i915/intel_atomic.h | 49 +++++++++++++++++++++++
drivers/gpu/drm/i915/intel_display.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
drivers/gpu/drm/i915/intel_drv.h | 36 -----------------
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_lvds.c | 1 +
drivers/gpu/drm/i915/intel_pipe_crc.c | 1 +
drivers/gpu/drm/i915/intel_pm.c | 1 +
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/vlv_dsi.c | 1 +
15 files changed, 74 insertions(+), 36 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_atomic.h
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index fa7542a..bff153 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -13,6 +13,7 @@ header_test := \
i915_reg.h \
i915_scheduler_types.h \
i915_timeline_types.h \
+ intel_atomic.h \
intel_atomic_plane.h \
intel_audio.h \
intel_bios.h \
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index e32636..e1b858 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -38,6 +38,7 @@
#include "i915_drv.h"
#include "i915_gpu_error.h"
+#include "intel_atomic.h"
#include "intel_overlay.h"
static inline const struct intel_engine_cs *
diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
index 9d962e..c6ecc00 100644
--- a/drivers/gpu/drm/i915/icl_dsi.c
+++ b/drivers/gpu/drm/i915/icl_dsi.c
@@ -28,6 +28,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_mipi_dsi.h>
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_ddi.h"
#include "intel_dsi.h"
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 8c8fae..58b804 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -34,6 +34,7 @@
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
+#include "intel_atomic.h"
#include "intel_drv.h"
#include "intel_hdcp.h"
#include "intel_sprite.h"
@@ -411,3 +412,15 @@ void intel_atomic_state_clear(struct drm_atomic_state *s)
drm_atomic_state_default_clear(&state->base);
state->dpll_set = state->modeset = false;
}
+
+struct intel_crtc_state *
+intel_atomic_get_crtc_state(struct drm_atomic_state *state,
+ struct intel_crtc *crtc)
+{
+ struct drm_crtc_state *crtc_state;
+ crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
+ if (IS_ERR(crtc_state))
+ return ERR_CAST(crtc_state);
+
+ return to_intel_crtc_state(crtc_state);
+}
diff --git a/drivers/gpu/drm/i915/intel_atomic.h b/drivers/gpu/drm/i915/intel_atomic.h
new file mode 100644
index 000000..1c8507
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_atomic.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_ATOMIC_H__
+#define __INTEL_ATOMIC_H__
+
+#include <linux/types.h>
+
+struct drm_atomic_state;
+struct drm_connector;
+struct drm_connector_state;
+struct drm_crtc;
+struct drm_crtc_state;
+struct drm_device;
+struct drm_i915_private;
+struct drm_property;
+struct intel_crtc;
+struct intel_crtc_state;
+
+int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
+ const struct drm_connector_state *state,
+ struct drm_property *property,
+ u64 *val);
+int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
+ struct drm_connector_state *state,
+ struct drm_property *property,
+ u64 val);
+int intel_digital_connector_atomic_check(struct drm_connector *conn,
+ struct drm_connector_state *new_state);
+struct drm_connector_state *
+intel_digital_connector_duplicate_state(struct drm_connector *connector);
+
+struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);
+void intel_crtc_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state);
+struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
+void intel_atomic_state_clear(struct drm_atomic_state *state);
+
+struct intel_crtc_state *
+intel_atomic_get_crtc_state(struct drm_atomic_state *state,
+ struct intel_crtc *crtc);
+
+int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
+ struct intel_crtc *intel_crtc,
+ struct intel_crtc_state *crtc_state);
+
+#endif /* __INTEL_ATOMIC_H__ */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c72f951..33fa0e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -47,6 +47,7 @@
#include "i915_drv.h"
#include "i915_gem_clflush.h"
#include "i915_trace.h"
+#include "intel_atomic.h"
#include "intel_atomic_plane.h"
#include "intel_color.h"
#include "intel_cdclk.h"
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 58f6d0..4e7b8d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -43,6 +43,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 46e8831..725518 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -28,6 +28,7 @@
#include <drm/drm_probe_helper.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 71ae3be..aa5542d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1912,40 +1912,4 @@ void chv_phy_powergate_lanes(struct intel_encoder *encoder,
bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,
enum dpio_channel ch, bool override);
-/* intel_atomic.c */
-int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
- const struct drm_connector_state *state,
- struct drm_property *property,
- u64 *val);
-int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
- struct drm_connector_state *state,
- struct drm_property *property,
- u64 val);
-int intel_digital_connector_atomic_check(struct drm_connector *conn,
- struct drm_connector_state *new_state);
-struct drm_connector_state *
-intel_digital_connector_duplicate_state(struct drm_connector *connector);
-
-struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);
-void intel_crtc_destroy_state(struct drm_crtc *crtc,
- struct drm_crtc_state *state);
-struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
-void intel_atomic_state_clear(struct drm_atomic_state *);
-
-static inline struct intel_crtc_state *
-intel_atomic_get_crtc_state(struct drm_atomic_state *state,
- struct intel_crtc *crtc)
-{
- struct drm_crtc_state *crtc_state;
- crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
- if (IS_ERR(crtc_state))
- return ERR_CAST(crtc_state);
-
- return to_intel_crtc_state(crtc_state);
-}
-
-int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
- struct intel_crtc *intel_crtc,
- struct intel_crtc_state *crtc_state);
-
#endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 4d3e2c..f8440c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -40,6 +40,7 @@
#include <drm/intel_lpe_audio.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
#include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 51d1d59..dcfca4 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -40,6 +40,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_lvds.h"
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index e94b5b..337600f0 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -29,6 +29,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
+#include "intel_atomic.h"
#include "intel_drv.h"
#include "intel_pipe_crc.h"
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8eeea4..350a671 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -35,6 +35,7 @@
#include "i915_drv.h"
#include "i915_irq.h"
+#include "intel_atomic.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_pm.h"
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 66365b1..743e745 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -37,6 +37,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_fifo_underrun.h"
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c
index 5d343a..bc5b78 100644
--- a/drivers/gpu/drm/i915/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/vlv_dsi.c
@@ -32,6 +32,7 @@
#include <drm/drm_mipi_dsi.h>
#include "i915_drv.h"
+#include "intel_atomic.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_dsi.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 40+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev2)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (20 preceding siblings ...)
2019-04-29 12:29 ` [PATCH 21/21] drm/i915: add single combo phy init/unit functions Jani Nikula
@ 2019-04-29 12:55 ` Patchwork
2019-04-29 13:05 ` ✗ Fi.CI.SPARSE: " Patchwork
` (6 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 12:55 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev2)
URL : https://patchwork.freedesktop.org/series/60060/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
486873c042de drm/i915: ensure more headers remain self-contained
9067550af88f drm/i915: make intel_bios.h self-contained
76f4cb8b6126 drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
-:129: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#129:
rename from drivers/gpu/drm/i915/dvo.h
total: 0 errors, 1 warnings, 0 checks, 98 lines checked
6b6c81672757 drm/i915: make intel_dpll_mgr.h self-contained
22bea934f4a6 drm/i915: move dsi init functions to intel_dsi.h
451928785fb2 drm/i915: extract intel_fifo_underrun.h from intel_drv.h
-:129: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#129:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 116 lines checked
3ed1ec4a0604 drm/i915: extract intel_dp_link_training.h from intel_drv.h
-:69: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 52 lines checked
fa813aa55dec drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
-:45: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#45:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 43 lines checked
17ca92adf728 drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
-:168: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#168:
new file mode 100644
-:188: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
#188: FILE: drivers/gpu/drm/i915/i915_irq.h:16:
+extern void intel_irq_init(struct drm_i915_private *dev_priv);
-:189: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
#189: FILE: drivers/gpu/drm/i915/i915_irq.h:17:
+extern void intel_irq_fini(struct drm_i915_private *dev_priv);
-:217: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#217: FILE: drivers/gpu/drm/i915/i915_irq.h:45:
+}
+static inline void
-:222: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#222: FILE: drivers/gpu/drm/i915/i915_irq.h:50:
+}
+void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
-:231: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#231: FILE: drivers/gpu/drm/i915/i915_irq.h:59:
+}
+static inline void bdw_disable_pipe_irq(struct drm_i915_private *dev_priv,
-:236: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#236: FILE: drivers/gpu/drm/i915/i915_irq.h:64:
+}
+void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
-:244: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#244: FILE: drivers/gpu/drm/i915/i915_irq.h:72:
+}
+static inline void
total: 0 errors, 1 warnings, 7 checks, 293 lines checked
129df29d908a drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
-:170: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#170:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 142 lines checked
5aef8bea4119 drm/i915: extract intel_bios.h functions from i915_drv.h
e77846be2115 drm/i915: extract intel_quirks.h from intel_drv.h
-:74: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#74:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 46 lines checked
0f9f0bda1126 drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
-:144: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#144:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 111 lines checked
71097d4829db drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
-:116: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#116:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 80 lines checked
4265b8204985 drm/i915: extract intel_dp_mst.h from intel_drv.h
-:57: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#57:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 45 lines checked
6d4499d6ce86 drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
-:68: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#68:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 52 lines checked
49285af4c34f drm/i915: extract intel_atomic.h from intel_drv.h
-:70: WARNING:LINE_SPACING: Missing a blank line after declarations
#70: FILE: drivers/gpu/drm/i915/intel_atomic.c:420:
+ struct drm_crtc_state *crtc_state;
+ crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
-:77: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#77:
new file mode 100644
-:118: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#118: FILE: drivers/gpu/drm/i915/intel_atomic.h:37:
+void intel_crtc_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state);
total: 0 errors, 2 warnings, 1 checks, 188 lines checked
0364c28dd743 drm/i915: extract intel_runtime_pm.h from intel_drv.h
-:153: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#153:
new file mode 100644
-:171: WARNING:NEW_TYPEDEFS: do not add new typedefs
#171: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:14:
+typedef depot_stack_handle_t intel_wakeref_t;
-:186: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_i915_private *' should also have an identifier name
#186: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:29:
+int intel_power_domains_init(struct drm_i915_private *);
-:232: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects?
#232: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:75:
+#define with_intel_runtime_pm(i915, wf) \
+ for ((wf) = intel_runtime_pm_get(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:232: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'wf' - possible side-effects?
#232: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:75:
+#define with_intel_runtime_pm(i915, wf) \
+ for ((wf) = intel_runtime_pm_get(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:236: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects?
#236: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:79:
+#define with_intel_runtime_pm_if_in_use(i915, wf) \
+ for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:236: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'wf' - possible side-effects?
#236: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:79:
+#define with_intel_runtime_pm_if_in_use(i915, wf) \
+ for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
total: 0 errors, 3 warnings, 4 checks, 224 lines checked
bf1fc583279f drm/i915: move some leftovers to intel_pm.h from i915_drv.h
-:107: CHECK:LINE_SPACING: Please don't use multiple blank lines
#107: FILE: drivers/gpu/drm/i915/intel_pm.h:80:
+
+
total: 0 errors, 0 warnings, 1 checks, 72 lines checked
97c944f09a59 drm/i915: extract intel_combo_phy.h from i915_drv.h
-:62: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#62:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 49 lines checked
5c5d592b8cd1 drm/i915: add single combo phy init/unit functions
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h
2019-04-29 12:45 ` Chris Wilson
@ 2019-04-29 13:03 ` Jani Nikula
2019-04-30 7:24 ` Joonas Lahtinen
0 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-04-29 13:03 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Mon, 29 Apr 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2019-04-29 13:29:37)
>> Commit 696173b064c6 ("drm/i915: extract intel_pm.h from intel_drv.h")
>> missed the declarations in i915_drv.h.
>
> Fwiw, I want to pull these along with gt powermanagement and rps into
> gt/intel_gt_pm.c and a few friends.
>
> Doesn't make much difference for this patch; just planned obsolescence.
I'm fine either way, via this patch or directly.
In general I like how it's easier to look at the new headers and wonder
why on earth some functions are in the files they are, and try to come
up with better division into files.
---
I'm also trying to probe feedback on some style guidelines I might like
to enforce in the future:
1) A file and the non-static functions in it should have the same
prefix, i.e. intel_foo.c has functions prefixed intel_foo_*.
2) No file should have platform specific non-static functions, i.e. all
the non-static functions should be intel_foo_* and this should
internally split to platform_foo_* instead of leaving the if ladders
or function pointer initializations to the callers.
So, thoughts on naming the functions intel_gt_pm_* upon moving them?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: the great header refactoring, part two (rev2)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (21 preceding siblings ...)
2019-04-29 12:55 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev2) Patchwork
@ 2019-04-29 13:05 ` Patchwork
2019-04-29 13:23 ` ✓ Fi.CI.BAT: success " Patchwork
` (5 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 13:05 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev2)
URL : https://patchwork.freedesktop.org/series/60060/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: ensure more headers remain self-contained
-
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: make intel_bios.h self-contained
Okay!
Commit: drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
Okay!
Commit: drm/i915: make intel_dpll_mgr.h self-contained
Okay!
Commit: drm/i915: move dsi init functions to intel_dsi.h
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: extract intel_fifo_underrun.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dp_link_training.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
Okay!
Commit: drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3570:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3508:16: warning: expression using sizeof(void)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3508:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3497:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_bios.h functions from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3497:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3481:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_quirks.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3481:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3475:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3475:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3472:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_dp_mst.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_atomic.h from intel_drv.h
+drivers/gpu/drm/i915/intel_atomic.c:107:5: warning: symbol 'intel_digital_connector_atomic_check' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:149:28: warning: symbol 'intel_digital_connector_duplicate_state' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:171:23: warning: symbol 'intel_crtc_duplicate_state' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:205:1: warning: symbol 'intel_crtc_destroy_state' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:295:5: warning: symbol 'intel_atomic_setup_scalers' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:395:25: warning: symbol 'intel_atomic_state_alloc' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:408:6: warning: symbol 'intel_atomic_state_clear' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:415:25: warning: symbol 'intel_atomic_get_crtc_state' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:50:5: warning: symbol 'intel_digital_connector_atomic_get_property' was not declared. Should it be static?
+drivers/gpu/drm/i915/intel_atomic.c:82:5: warning: symbol 'intel_digital_connector_atomic_set_property' was not declared. Should it be static?
Commit: drm/i915: extract intel_runtime_pm.h from intel_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3472:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3473:16: warning: expression using sizeof(void)
Commit: drm/i915: move some leftovers to intel_pm.h from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3473:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3460:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_combo_phy.h from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3460:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3454:16: warning: expression using sizeof(void)
Commit: drm/i915: add single combo phy init/unit functions
Okay!
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: the great header refactoring, part two (rev2)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (22 preceding siblings ...)
2019-04-29 13:05 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-04-29 13:23 ` Patchwork
2019-04-29 13:26 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev3) Patchwork
` (4 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 13:23 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev2)
URL : https://patchwork.freedesktop.org/series/60060/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6012 -> Patchwork_12893
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/60060/revisions/2/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12893:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_chamelium@dp-hpd-fast:
- {fi-cml-u2}: [FAIL][1] ([fdo#108767]) -> [SKIP][2] +8 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-cml-u2/igt@kms_chamelium@dp-hpd-fast.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-cml-u2/igt@kms_chamelium@dp-hpd-fast.html
Known issues
------------
Here are the changes found in Patchwork_12893 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_create@basic:
- fi-icl-y: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-icl-y/igt@gem_exec_create@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-icl-y/igt@gem_exec_create@basic.html
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: [PASS][5] -> [DMESG-FAIL][6] ([fdo#110235])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [PASS][7] -> [DMESG-WARN][8] ([fdo#103841])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
#### Possible fixes ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: [DMESG-WARN][9] ([fdo#108965]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
* igt@gem_exec_basic@basic-blt:
- {fi-icl-u2}: [INCOMPLETE][11] ([fdo#107713] / [fdo#110246]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-icl-u2/igt@gem_exec_basic@basic-blt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/fi-icl-u2/igt@gem_exec_basic@basic-blt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103841]: https://bugs.freedesktop.org/show_bug.cgi?id=103841
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
Participating hosts (52 -> 40)
------------------------------
Missing (12): fi-kbl-soraka fi-ilk-m540 fi-bsw-n3050 fi-byt-j1900 fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-gdg-551 fi-pnv-d510 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6012 -> Patchwork_12893
CI_DRM_6012: e4882f199157e3fb73d1791352931096f6ecfcfd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4968: caed251990f35bfe45368f803980071a73e36315 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12893: 5c5d592b8cd178f888ab8680e903adb4eaf770ea @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5c5d592b8cd1 drm/i915: add single combo phy init/unit functions
97c944f09a59 drm/i915: extract intel_combo_phy.h from i915_drv.h
bf1fc583279f drm/i915: move some leftovers to intel_pm.h from i915_drv.h
0364c28dd743 drm/i915: extract intel_runtime_pm.h from intel_drv.h
49285af4c34f drm/i915: extract intel_atomic.h from intel_drv.h
6d4499d6ce86 drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
4265b8204985 drm/i915: extract intel_dp_mst.h from intel_drv.h
71097d4829db drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
0f9f0bda1126 drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
e77846be2115 drm/i915: extract intel_quirks.h from intel_drv.h
5aef8bea4119 drm/i915: extract intel_bios.h functions from i915_drv.h
129df29d908a drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
17ca92adf728 drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
fa813aa55dec drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
3ed1ec4a0604 drm/i915: extract intel_dp_link_training.h from intel_drv.h
451928785fb2 drm/i915: extract intel_fifo_underrun.h from intel_drv.h
22bea934f4a6 drm/i915: move dsi init functions to intel_dsi.h
6b6c81672757 drm/i915: make intel_dpll_mgr.h self-contained
76f4cb8b6126 drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
9067550af88f drm/i915: make intel_bios.h self-contained
486873c042de drm/i915: ensure more headers remain self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12893/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev3)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (23 preceding siblings ...)
2019-04-29 13:23 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-04-29 13:26 ` Patchwork
2019-04-29 13:37 ` ✗ Fi.CI.SPARSE: " Patchwork
` (3 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 13:26 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev3)
URL : https://patchwork.freedesktop.org/series/60060/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2505cc046d89 drm/i915: ensure more headers remain self-contained
2519e59bfa55 drm/i915: make intel_bios.h self-contained
339e512f1859 drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
-:129: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#129:
rename from drivers/gpu/drm/i915/dvo.h
total: 0 errors, 1 warnings, 0 checks, 98 lines checked
2292546de356 drm/i915: make intel_dpll_mgr.h self-contained
4e0a21377271 drm/i915: move dsi init functions to intel_dsi.h
2dcc56d461d3 drm/i915: extract intel_fifo_underrun.h from intel_drv.h
-:129: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#129:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 116 lines checked
5fd2a3caa0c7 drm/i915: extract intel_dp_link_training.h from intel_drv.h
-:69: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 52 lines checked
51eed658a60c drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
-:45: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#45:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 43 lines checked
4433af4d6057 drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
-:168: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#168:
new file mode 100644
-:188: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
#188: FILE: drivers/gpu/drm/i915/i915_irq.h:16:
+extern void intel_irq_init(struct drm_i915_private *dev_priv);
-:189: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
#189: FILE: drivers/gpu/drm/i915/i915_irq.h:17:
+extern void intel_irq_fini(struct drm_i915_private *dev_priv);
-:217: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#217: FILE: drivers/gpu/drm/i915/i915_irq.h:45:
+}
+static inline void
-:222: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#222: FILE: drivers/gpu/drm/i915/i915_irq.h:50:
+}
+void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
-:231: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#231: FILE: drivers/gpu/drm/i915/i915_irq.h:59:
+}
+static inline void bdw_disable_pipe_irq(struct drm_i915_private *dev_priv,
-:236: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#236: FILE: drivers/gpu/drm/i915/i915_irq.h:64:
+}
+void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
-:244: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#244: FILE: drivers/gpu/drm/i915/i915_irq.h:72:
+}
+static inline void
total: 0 errors, 1 warnings, 7 checks, 293 lines checked
ec6036c7c4df drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
-:170: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#170:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 142 lines checked
41a1ebe270b9 drm/i915: extract intel_bios.h functions from i915_drv.h
466f619fd083 drm/i915: extract intel_quirks.h from intel_drv.h
-:74: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#74:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 46 lines checked
d48f8b2660a6 drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
-:144: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#144:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 111 lines checked
36c6b9b871fa drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
-:116: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#116:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 80 lines checked
be18937f7a04 drm/i915: extract intel_dp_mst.h from intel_drv.h
-:57: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#57:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 45 lines checked
49f7818ffe49 drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
-:68: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#68:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 52 lines checked
1c720f4bb707 drm/i915: extract intel_atomic.h from intel_drv.h
-:80: WARNING:LINE_SPACING: Missing a blank line after declarations
#80: FILE: drivers/gpu/drm/i915/intel_atomic.c:421:
+ struct drm_crtc_state *crtc_state;
+ crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
-:87: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#87:
new file mode 100644
-:128: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#128: FILE: drivers/gpu/drm/i915/intel_atomic.h:37:
+void intel_crtc_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state);
total: 0 errors, 2 warnings, 1 checks, 195 lines checked
c51954e0fb9f drm/i915: extract intel_runtime_pm.h from intel_drv.h
-:153: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#153:
new file mode 100644
-:171: WARNING:NEW_TYPEDEFS: do not add new typedefs
#171: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:14:
+typedef depot_stack_handle_t intel_wakeref_t;
-:186: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_i915_private *' should also have an identifier name
#186: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:29:
+int intel_power_domains_init(struct drm_i915_private *);
-:232: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects?
#232: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:75:
+#define with_intel_runtime_pm(i915, wf) \
+ for ((wf) = intel_runtime_pm_get(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:232: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'wf' - possible side-effects?
#232: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:75:
+#define with_intel_runtime_pm(i915, wf) \
+ for ((wf) = intel_runtime_pm_get(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:236: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects?
#236: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:79:
+#define with_intel_runtime_pm_if_in_use(i915, wf) \
+ for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
-:236: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'wf' - possible side-effects?
#236: FILE: drivers/gpu/drm/i915/intel_runtime_pm.h:79:
+#define with_intel_runtime_pm_if_in_use(i915, wf) \
+ for ((wf) = intel_runtime_pm_get_if_in_use(i915); (wf); \
+ intel_runtime_pm_put((i915), (wf)), (wf) = 0)
total: 0 errors, 3 warnings, 4 checks, 224 lines checked
99417c6d3e94 drm/i915: move some leftovers to intel_pm.h from i915_drv.h
-:107: CHECK:LINE_SPACING: Please don't use multiple blank lines
#107: FILE: drivers/gpu/drm/i915/intel_pm.h:80:
+
+
total: 0 errors, 0 warnings, 1 checks, 72 lines checked
4c4daecb680c drm/i915: extract intel_combo_phy.h from i915_drv.h
-:62: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#62:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 49 lines checked
9b2338881b2b drm/i915: add single combo phy init/unit functions
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: the great header refactoring, part two (rev3)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (24 preceding siblings ...)
2019-04-29 13:26 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev3) Patchwork
@ 2019-04-29 13:37 ` Patchwork
2019-04-29 13:54 ` ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 13:37 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev3)
URL : https://patchwork.freedesktop.org/series/60060/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: ensure more headers remain self-contained
-
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: make intel_bios.h self-contained
Okay!
Commit: drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
Okay!
Commit: drm/i915: make intel_dpll_mgr.h self-contained
Okay!
Commit: drm/i915: move dsi init functions to intel_dsi.h
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: extract intel_fifo_underrun.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dp_link_training.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
Okay!
Commit: drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3570:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3508:16: warning: expression using sizeof(void)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3508:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3497:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_bios.h functions from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3497:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3481:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_quirks.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3481:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3475:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3475:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3472:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_dp_mst.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_atomic.h from intel_drv.h
Okay!
Commit: drm/i915: extract intel_runtime_pm.h from intel_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3472:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3473:16: warning: expression using sizeof(void)
Commit: drm/i915: move some leftovers to intel_pm.h from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3473:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3460:16: warning: expression using sizeof(void)
Commit: drm/i915: extract intel_combo_phy.h from i915_drv.h
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3460:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3454:16: warning: expression using sizeof(void)
Commit: drm/i915: add single combo phy init/unit functions
Okay!
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: the great header refactoring, part two (rev3)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (25 preceding siblings ...)
2019-04-29 13:37 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-04-29 13:54 ` Patchwork
2019-04-29 17:29 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-04-30 9:56 ` [PATCH 00/21] drm/i915: the great header refactoring, part two Chris Wilson
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 13:54 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev3)
URL : https://patchwork.freedesktop.org/series/60060/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6012 -> Patchwork_12894
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/60060/revisions/3/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12894:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_chamelium@dp-hpd-fast:
- {fi-cml-u2}: [FAIL][1] ([fdo#108767]) -> [SKIP][2] +8 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-cml-u2/igt@kms_chamelium@dp-hpd-fast.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-cml-u2/igt@kms_chamelium@dp-hpd-fast.html
Known issues
------------
Here are the changes found in Patchwork_12894 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [PASS][3] -> [DMESG-WARN][4] ([fdo#103841])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
- fi-glk-dsi: [PASS][5] -> [INCOMPLETE][6] ([fdo#103359] / [k.org#198133])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-glk-dsi/igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-glk-dsi/igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size.html
#### Possible fixes ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: [DMESG-WARN][7] ([fdo#108965]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
* igt@gem_exec_basic@basic-blt:
- {fi-icl-u2}: [INCOMPLETE][9] ([fdo#107713] / [fdo#110246]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-icl-u2/igt@gem_exec_basic@basic-blt.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-icl-u2/igt@gem_exec_basic@basic-blt.html
* igt@gem_exec_fence@basic-busy-default:
- fi-icl-y: [INCOMPLETE][11] ([fdo#107713]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-icl-y/igt@gem_exec_fence@basic-busy-default.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-icl-y/igt@gem_exec_fence@basic-busy-default.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-byt-clapper: [FAIL][13] ([fdo#103191]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/fi-byt-clapper/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/fi-byt-clapper/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103841]: https://bugs.freedesktop.org/show_bug.cgi?id=103841
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (52 -> 47)
------------------------------
Missing (5): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6012 -> Patchwork_12894
CI_DRM_6012: e4882f199157e3fb73d1791352931096f6ecfcfd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4968: caed251990f35bfe45368f803980071a73e36315 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12894: 9b2338881b2bc3bba5c8f8b0f80a872e324ba842 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
9b2338881b2b drm/i915: add single combo phy init/unit functions
4c4daecb680c drm/i915: extract intel_combo_phy.h from i915_drv.h
99417c6d3e94 drm/i915: move some leftovers to intel_pm.h from i915_drv.h
c51954e0fb9f drm/i915: extract intel_runtime_pm.h from intel_drv.h
1c720f4bb707 drm/i915: extract intel_atomic.h from intel_drv.h
49f7818ffe49 drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
be18937f7a04 drm/i915: extract intel_dp_mst.h from intel_drv.h
36c6b9b871fa drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
d48f8b2660a6 drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
466f619fd083 drm/i915: extract intel_quirks.h from intel_drv.h
41a1ebe270b9 drm/i915: extract intel_bios.h functions from i915_drv.h
ec6036c7c4df drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
4433af4d6057 drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
51eed658a60c drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
5fd2a3caa0c7 drm/i915: extract intel_dp_link_training.h from intel_drv.h
2dcc56d461d3 drm/i915: extract intel_fifo_underrun.h from intel_drv.h
4e0a21377271 drm/i915: move dsi init functions to intel_dsi.h
2292546de356 drm/i915: make intel_dpll_mgr.h self-contained
339e512f1859 drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
2519e59bfa55 drm/i915: make intel_bios.h self-contained
2505cc046d89 drm/i915: ensure more headers remain self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: the great header refactoring, part two (rev3)
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (26 preceding siblings ...)
2019-04-29 13:54 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-04-29 17:29 ` Patchwork
2019-04-30 9:56 ` [PATCH 00/21] drm/i915: the great header refactoring, part two Chris Wilson
28 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-04-29 17:29 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: the great header refactoring, part two (rev3)
URL : https://patchwork.freedesktop.org/series/60060/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6012_full -> Patchwork_12894_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12894_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_12894_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12894_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_plane_cursor@pipe-c-overlay-size-64:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl5/igt@kms_plane_cursor@pipe-c-overlay-size-64.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_plane_cursor@pipe-c-overlay-size-64.html
Known issues
------------
Here are the changes found in Patchwork_12894_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_param@basic:
- shard-apl: [PASS][3] -> [INCOMPLETE][4] ([fdo#103927]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-apl7/igt@gem_ctx_param@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-apl1/igt@gem_ctx_param@basic.html
* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +5 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-apl7/igt@gem_workarounds@suspend-resume.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-apl6/igt@gem_workarounds@suspend-resume.html
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#104108] / [fdo#107807])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl2/igt@i915_pm_rpm@system-suspend-modeset.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl2/igt@i915_pm_rpm@system-suspend-modeset.html
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#104108])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl6/igt@kms_cursor_crc@cursor-128x128-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl2/igt@kms_cursor_crc@cursor-128x128-suspend.html
* igt@kms_cursor_crc@cursor-64x21-offscreen:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#103232])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl2/igt@kms_cursor_crc@cursor-64x21-offscreen.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_cursor_crc@cursor-64x21-offscreen.html
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#103184] / [fdo#103232])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl8/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl10/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html
* igt@kms_flip@2x-flip-vs-dpms:
- shard-hsw: [PASS][15] -> [INCOMPLETE][16] ([fdo#103540]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-hsw5/igt@kms_flip@2x-flip-vs-dpms.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-hsw7/igt@kms_flip@2x-flip-vs-dpms.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [fdo#110403])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb4/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: [PASS][25] -> [INCOMPLETE][26] ([fdo#103665])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-kbl7/igt@kms_rotation_crc@multiplane-rotation.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-kbl1/igt@kms_rotation_crc@multiplane-rotation.html
* igt@kms_setmode@basic:
- shard-kbl: [PASS][27] -> [FAIL][28] ([fdo#99912])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-kbl5/igt@kms_setmode@basic.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-kbl5/igt@kms_setmode@basic.html
* igt@kms_sysfs_edid_timing:
- shard-iclb: [PASS][29] -> [FAIL][30] ([fdo#100047])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb6/igt@kms_sysfs_edid_timing.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb2/igt@kms_sysfs_edid_timing.html
#### Possible fixes ####
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [DMESG-WARN][31] ([fdo#108566]) -> [PASS][32] +3 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-apl2/igt@i915_suspend@fence-restore-untiled.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-apl2/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: [INCOMPLETE][33] ([fdo#104108]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl3/igt@kms_cursor_crc@cursor-64x64-suspend.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_cursor_crc@cursor-64x64-suspend.html
* igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: [FAIL][35] ([fdo#106509] / [fdo#107409]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-glk2/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-glk9/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][37] ([fdo#105363]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@modeset-vs-vblank-race:
- shard-glk: [FAIL][39] ([fdo#103060]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-glk8/igt@kms_flip@modeset-vs-vblank-race.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-glk6/igt@kms_flip@modeset-vs-vblank-race.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-render:
- shard-iclb: [FAIL][41] ([fdo#103167]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-render.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-skl: [INCOMPLETE][43] ([fdo#104108] / [fdo#106978]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-skl7/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-skl7/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
- shard-iclb: [INCOMPLETE][45] ([fdo#106978] / [fdo#107713]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
* igt@kms_psr@psr2_primary_render:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb6/igt@kms_psr@psr2_primary_render.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb2/igt@kms_psr@psr2_primary_render.html
* igt@tools_test@tools_test:
- shard-iclb: [SKIP][49] ([fdo#109352]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6012/shard-iclb8/igt@tools_test@tools_test.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/shard-iclb1/igt@tools_test@tools_test.html
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109352]: https://bugs.freedesktop.org/show_bug.cgi?id=109352
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6012 -> Patchwork_12894
CI_DRM_6012: e4882f199157e3fb73d1791352931096f6ecfcfd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4968: caed251990f35bfe45368f803980071a73e36315 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12894: 9b2338881b2bc3bba5c8f8b0f80a872e324ba842 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12894/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h
2019-04-29 13:03 ` Jani Nikula
@ 2019-04-30 7:24 ` Joonas Lahtinen
2019-04-30 9:55 ` Chris Wilson
0 siblings, 1 reply; 40+ messages in thread
From: Joonas Lahtinen @ 2019-04-30 7:24 UTC (permalink / raw)
To: Chris Wilson, Jani Nikula, intel-gfx
Quoting Jani Nikula (2019-04-29 16:03:33)
> On Mon, 29 Apr 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Quoting Jani Nikula (2019-04-29 13:29:37)
> >> Commit 696173b064c6 ("drm/i915: extract intel_pm.h from intel_drv.h")
> >> missed the declarations in i915_drv.h.
> >
> > Fwiw, I want to pull these along with gt powermanagement and rps into
> > gt/intel_gt_pm.c and a few friends.
> >
> > Doesn't make much difference for this patch; just planned obsolescence.
>
> I'm fine either way, via this patch or directly.
>
> In general I like how it's easier to look at the new headers and wonder
> why on earth some functions are in the files they are, and try to come
> up with better division into files.
>
> ---
>
> I'm also trying to probe feedback on some style guidelines I might like
> to enforce in the future:
>
> 1) A file and the non-static functions in it should have the same
> prefix, i.e. intel_foo.c has functions prefixed intel_foo_*.
>
> 2) No file should have platform specific non-static functions, i.e. all
> the non-static functions should be intel_foo_* and this should
> internally split to platform_foo_* instead of leaving the if ladders
> or function pointer initializations to the callers.
Agreed on these. GEM side has been moving to this direction slowly.
> So, thoughts on naming the functions intel_gt_pm_* upon moving them?
Sounds reasonable to me.
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h
2019-04-30 7:24 ` Joonas Lahtinen
@ 2019-04-30 9:55 ` Chris Wilson
0 siblings, 0 replies; 40+ messages in thread
From: Chris Wilson @ 2019-04-30 9:55 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, intel-gfx
Quoting Joonas Lahtinen (2019-04-30 08:24:07)
> Quoting Jani Nikula (2019-04-29 16:03:33)
> > On Mon, 29 Apr 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > > Quoting Jani Nikula (2019-04-29 13:29:37)
> > >> Commit 696173b064c6 ("drm/i915: extract intel_pm.h from intel_drv.h")
> > >> missed the declarations in i915_drv.h.
> > >
> > > Fwiw, I want to pull these along with gt powermanagement and rps into
> > > gt/intel_gt_pm.c and a few friends.
> > >
> > > Doesn't make much difference for this patch; just planned obsolescence.
> >
> > I'm fine either way, via this patch or directly.
> >
> > In general I like how it's easier to look at the new headers and wonder
> > why on earth some functions are in the files they are, and try to come
> > up with better division into files.
> >
> > ---
> >
> > I'm also trying to probe feedback on some style guidelines I might like
> > to enforce in the future:
> >
> > 1) A file and the non-static functions in it should have the same
> > prefix, i.e. intel_foo.c has functions prefixed intel_foo_*.
> >
> > 2) No file should have platform specific non-static functions, i.e. all
> > the non-static functions should be intel_foo_* and this should
> > internally split to platform_foo_* instead of leaving the if ladders
> > or function pointer initializations to the callers.
>
> Agreed on these. GEM side has been moving to this direction slowly.
>
> > So, thoughts on naming the functions intel_gt_pm_* upon moving them?
>
> Sounds reasonable to me.
And indeed the patches from last year where already making that
transformation :)
Next generation of patches are aiming to split up the different
functions under the intel_gt_pm umbrella, but still following the same
principle.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/21] drm/i915: the great header refactoring, part two
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
` (27 preceding siblings ...)
2019-04-29 17:29 ` ✗ Fi.CI.IGT: failure " Patchwork
@ 2019-04-30 9:56 ` Chris Wilson
2019-04-30 12:28 ` Jani Nikula
28 siblings, 1 reply; 40+ messages in thread
From: Chris Wilson @ 2019-04-30 9:56 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Quoting Jani Nikula (2019-04-29 13:29:18)
> Continue the header refactoring started in part one [1].
>
> BR,
> Jani.
>
> [1] https://patchwork.freedesktop.org/series/59022/
>
>
> Jani Nikula (21):
> drm/i915: ensure more headers remain self-contained
> drm/i915: make intel_bios.h self-contained
> drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
> drm/i915: make intel_dpll_mgr.h self-contained
> drm/i915: move dsi init functions to intel_dsi.h
> drm/i915: extract intel_fifo_underrun.h from intel_drv.h
> drm/i915: extract intel_dp_link_training.h from intel_drv.h
> drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
> drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
> drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
> drm/i915: extract intel_bios.h functions from i915_drv.h
> drm/i915: extract intel_quirks.h from intel_drv.h
> drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
> drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
> drm/i915: extract intel_dp_mst.h from intel_drv.h
> drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
> drm/i915: extract intel_atomic.h from intel_drv.h
> drm/i915: extract intel_runtime_pm.h from intel_drv.h
> drm/i915: move some leftovers to intel_pm.h from i915_drv.h
> drm/i915: extract intel_combo_phy.h from i915_drv.h
> drm/i915: add single combo phy init/unit functions
I read them all and they look sane. I trust the HDRTEST infrastructure
to spot any typos, so
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/21] drm/i915: the great header refactoring, part two
2019-04-30 9:56 ` [PATCH 00/21] drm/i915: the great header refactoring, part two Chris Wilson
@ 2019-04-30 12:28 ` Jani Nikula
0 siblings, 0 replies; 40+ messages in thread
From: Jani Nikula @ 2019-04-30 12:28 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Tue, 30 Apr 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2019-04-29 13:29:18)
>> Continue the header refactoring started in part one [1].
>>
>> BR,
>> Jani.
>>
>> [1] https://patchwork.freedesktop.org/series/59022/
>>
>>
>> Jani Nikula (21):
>> drm/i915: ensure more headers remain self-contained
>> drm/i915: make intel_bios.h self-contained
>> drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained
>> drm/i915: make intel_dpll_mgr.h self-contained
>> drm/i915: move dsi init functions to intel_dsi.h
>> drm/i915: extract intel_fifo_underrun.h from intel_drv.h
>> drm/i915: extract intel_dp_link_training.h from intel_drv.h
>> drm/i915: extract intel_dp_aux_backlight.h from intel_drv.h
>> drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h
>> drm/i915: extract intel_hotplug.h from intel_drv.h and i915_drv.h
>> drm/i915: extract intel_bios.h functions from i915_drv.h
>> drm/i915: extract intel_quirks.h from intel_drv.h
>> drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h
>> drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h
>> drm/i915: extract intel_dp_mst.h from intel_drv.h
>> drm/i915: extract intel_dsi_dcs_backlight.h from intel_drv.h
>> drm/i915: extract intel_atomic.h from intel_drv.h
>> drm/i915: extract intel_runtime_pm.h from intel_drv.h
>> drm/i915: move some leftovers to intel_pm.h from i915_drv.h
>> drm/i915: extract intel_combo_phy.h from i915_drv.h
>> drm/i915: add single combo phy init/unit functions
>
> I read them all and they look sane. I trust the HDRTEST infrastructure
> to spot any typos, so
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Thanks, pushed everything except the last one which conflicts. Will post
a rebased version.
I don't think any of these could cause the reported CI incompletes.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [18/21] drm/i915: extract intel_runtime_pm.h from intel_drv.h
2019-04-29 12:29 ` [PATCH 18/21] drm/i915: extract intel_runtime_pm.h " Jani Nikula
@ 2019-05-21 18:38 ` Nathan Chancellor
2019-05-22 10:38 ` Jani Nikula
0 siblings, 1 reply; 40+ messages in thread
From: Nathan Chancellor @ 2019-05-21 18:38 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
Hi Jani,
On Mon, Apr 29, 2019 at 03:29:36PM +0300, Jani Nikula wrote:
> It used to be handy that we only had a couple of headers, but over time
> intel_drv.h has become unwieldy. Extract declarations to a separate
> header file corresponding to the implementation module, clarifying the
> modularity of the driver.
>
> Ensure the new header is self-contained, and do so with minimal further
> includes, using forward declarations as needed. Include the new header
> only where needed, and sort the modified include directives while at it
> and as needed.
>
> No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
<snip>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
> new file mode 100644
> index 000000..692277
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
> @@ -0,0 +1,105 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2019 Intel Corporation
> + */
> +
> +#ifndef __INTEL_RUNTIME_PM_H__
> +#define __INTEL_RUNTIME_PM_H__
> +
> +#include <linux/stackdepot.h>
> +#include <linux/types.h>
> +
> +struct drm_i915_private;
> +
> +typedef depot_stack_handle_t intel_wakeref_t;
Just as an FYI, this particular change causes a slew of clang warnings:
https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/201754420#L2435
I am not sure how exactly you'd like this resolved so I didn't want to
provide a useless patch. I figured I would let you know about it and
leave it up to you.
Cheers,
Nathan
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [18/21] drm/i915: extract intel_runtime_pm.h from intel_drv.h
2019-05-21 18:38 ` [18/21] " Nathan Chancellor
@ 2019-05-22 10:38 ` Jani Nikula
2019-05-22 19:58 ` Nathan Chancellor
0 siblings, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-05-22 10:38 UTC (permalink / raw)
To: Nathan Chancellor; +Cc: intel-gfx
On Tue, 21 May 2019, Nathan Chancellor <natechancellor@gmail.com> wrote:
> Hi Jani,
>
> On Mon, Apr 29, 2019 at 03:29:36PM +0300, Jani Nikula wrote:
>> It used to be handy that we only had a couple of headers, but over time
>> intel_drv.h has become unwieldy. Extract declarations to a separate
>> header file corresponding to the implementation module, clarifying the
>> modularity of the driver.
>>
>> Ensure the new header is self-contained, and do so with minimal further
>> includes, using forward declarations as needed. Include the new header
>> only where needed, and sort the modified include directives while at it
>> and as needed.
>>
>> No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>
> <snip>
>
>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> new file mode 100644
>> index 000000..692277
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> @@ -0,0 +1,105 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2019 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_RUNTIME_PM_H__
>> +#define __INTEL_RUNTIME_PM_H__
>> +
>> +#include <linux/stackdepot.h>
>> +#include <linux/types.h>
>> +
>> +struct drm_i915_private;
>> +
>> +typedef depot_stack_handle_t intel_wakeref_t;
>
> Just as an FYI, this particular change causes a slew of clang warnings:
> https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/201754420#L2435
>
> I am not sure how exactly you'd like this resolved so I didn't want to
> provide a useless patch. I figured I would let you know about it and
> leave it up to you.
Thanks for the report, fix is [1].
I wonder why gcc allows dupe definitions. *shrug*
BR,
Jani.
[1] http://patchwork.freedesktop.org/patch/msgid/20190522103505.2082-1-jani.nikula@intel.com
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [18/21] drm/i915: extract intel_runtime_pm.h from intel_drv.h
2019-05-22 10:38 ` Jani Nikula
@ 2019-05-22 19:58 ` Nathan Chancellor
0 siblings, 0 replies; 40+ messages in thread
From: Nathan Chancellor @ 2019-05-22 19:58 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Wed, May 22, 2019 at 01:38:18PM +0300, Jani Nikula wrote:
> On Tue, 21 May 2019, Nathan Chancellor <natechancellor@gmail.com> wrote:
> > Hi Jani,
> >
> > On Mon, Apr 29, 2019 at 03:29:36PM +0300, Jani Nikula wrote:
> >> It used to be handy that we only had a couple of headers, but over time
> >> intel_drv.h has become unwieldy. Extract declarations to a separate
> >> header file corresponding to the implementation module, clarifying the
> >> modularity of the driver.
> >>
> >> Ensure the new header is self-contained, and do so with minimal further
> >> includes, using forward declarations as needed. Include the new header
> >> only where needed, and sort the modified include directives while at it
> >> and as needed.
> >>
> >> No functional changes.
> >>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> ---
> >
> > <snip>
> >
> >> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
> >> new file mode 100644
> >> index 000000..692277
> >> --- /dev/null
> >> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
> >> @@ -0,0 +1,105 @@
> >> +/* SPDX-License-Identifier: MIT */
> >> +/*
> >> + * Copyright © 2019 Intel Corporation
> >> + */
> >> +
> >> +#ifndef __INTEL_RUNTIME_PM_H__
> >> +#define __INTEL_RUNTIME_PM_H__
> >> +
> >> +#include <linux/stackdepot.h>
> >> +#include <linux/types.h>
> >> +
> >> +struct drm_i915_private;
> >> +
> >> +typedef depot_stack_handle_t intel_wakeref_t;
> >
> > Just as an FYI, this particular change causes a slew of clang warnings:
> > https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/201754420#L2435
> >
> > I am not sure how exactly you'd like this resolved so I didn't want to
> > provide a useless patch. I figured I would let you know about it and
> > leave it up to you.
>
> Thanks for the report, fix is [1].
Thanks for the quick fix!
>
> I wonder why gcc allows dupe definitions. *shrug*
I was briefly curious then I realized I'd probably have to look at the
GCC source to figure out why...
Cheers,
Nathan
>
> BR,
> Jani.
>
> [1] http://patchwork.freedesktop.org/patch/msgid/20190522103505.2082-1-jani.nikula@intel.com
>
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2019-05-22 19:58 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-29 12:29 [PATCH 00/21] drm/i915: the great header refactoring, part two Jani Nikula
2019-04-29 12:29 ` [PATCH 01/21] drm/i915: ensure more headers remain self-contained Jani Nikula
2019-04-29 12:29 ` [PATCH 02/21] drm/i915: make intel_bios.h self-contained Jani Nikula
2019-04-29 12:29 ` [PATCH 03/21] drm/i915/dvo: rename dvo.h to intel_dvo_dev.h and make self-contained Jani Nikula
2019-04-29 12:29 ` [PATCH 04/21] drm/i915: make intel_dpll_mgr.h self-contained Jani Nikula
2019-04-29 12:29 ` [PATCH 05/21] drm/i915: move dsi init functions to intel_dsi.h Jani Nikula
2019-04-29 12:29 ` [PATCH 06/21] drm/i915: extract intel_fifo_underrun.h from intel_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 07/21] drm/i915: extract intel_dp_link_training.h " Jani Nikula
2019-04-29 12:29 ` [PATCH 08/21] drm/i915: extract intel_dp_aux_backlight.h " Jani Nikula
2019-04-29 12:29 ` [PATCH 09/21] drm/i915: extract i915_irq.h from intel_drv.h and i915_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 10/21] drm/i915: extract intel_hotplug.h " Jani Nikula
2019-04-29 12:50 ` [PATCH v2] " Jani Nikula
2019-04-29 12:29 ` [PATCH 11/21] drm/i915: extract intel_bios.h functions from i915_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 12/21] drm/i915: extract intel_quirks.h from intel_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 13/21] drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 14/21] drm/i915: extract intel_vdsc.h " Jani Nikula
2019-04-29 12:29 ` [PATCH 15/21] drm/i915: extract intel_dp_mst.h from intel_drv.h Jani Nikula
2019-04-29 12:29 ` [PATCH 16/21] drm/i915: extract intel_dsi_dcs_backlight.h " Jani Nikula
2019-04-29 12:29 ` [PATCH 17/21] drm/i915: extract intel_atomic.h " Jani Nikula
2019-04-29 12:53 ` [PATCH v2] " Jani Nikula
2019-04-29 12:29 ` [PATCH 18/21] drm/i915: extract intel_runtime_pm.h " Jani Nikula
2019-05-21 18:38 ` [18/21] " Nathan Chancellor
2019-05-22 10:38 ` Jani Nikula
2019-05-22 19:58 ` Nathan Chancellor
2019-04-29 12:29 ` [PATCH 19/21] drm/i915: move some leftovers to intel_pm.h from i915_drv.h Jani Nikula
2019-04-29 12:45 ` Chris Wilson
2019-04-29 13:03 ` Jani Nikula
2019-04-30 7:24 ` Joonas Lahtinen
2019-04-30 9:55 ` Chris Wilson
2019-04-29 12:29 ` [PATCH 20/21] drm/i915: extract intel_combo_phy.h " Jani Nikula
2019-04-29 12:29 ` [PATCH 21/21] drm/i915: add single combo phy init/unit functions Jani Nikula
2019-04-29 12:55 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev2) Patchwork
2019-04-29 13:05 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-04-29 13:23 ` ✓ Fi.CI.BAT: success " Patchwork
2019-04-29 13:26 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: the great header refactoring, part two (rev3) Patchwork
2019-04-29 13:37 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-04-29 13:54 ` ✓ Fi.CI.BAT: success " Patchwork
2019-04-29 17:29 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-04-30 9:56 ` [PATCH 00/21] drm/i915: the great header refactoring, part two Chris Wilson
2019-04-30 12:28 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.