drm/tegra: dc: Move some declarations to dc.h

Move the DC related declarations in drm.h to dc.h where they belong.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 2b5e052fb8d393925393d51bac1f28f65eafcc6b..fd31974e2218b48f9d7b3a2fc850010e63484a96 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -24,16 +24,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 
-struct tegra_dc_soc_info {
-       bool supports_border_color;
-       bool supports_interlacing;
-       bool supports_cursor;
-       bool supports_block_linear;
-       unsigned int pitch_align;
-       bool has_powergate;
-       bool broken_reset;
-};
-
 struct tegra_plane {
        struct drm_plane base;
        unsigned int index;

diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
index 4a268635749bdc667ef3ec86b3c7e3774f1faf09..cb100b6e32821efb5cf9d2242f4cb0021044b0ea 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.h
+++ b/drivers/gpu/drm/tegra/dc.h
@@ -10,6 +10,126 @@
 #ifndef TEGRA_DC_H
 #define TEGRA_DC_H 1
 
+#include <linux/host1x.h>
+
+#include <drm/drm_crtc.h>
+
+#include "drm.h"
+
+struct tegra_output;
+
+struct tegra_dc_stats {
+       unsigned long frames;
+       unsigned long vblank;
+       unsigned long underflow;
+       unsigned long overflow;
+};
+
+struct tegra_dc_soc_info {
+       bool supports_border_color;
+       bool supports_interlacing;
+       bool supports_cursor;
+       bool supports_block_linear;
+       unsigned int pitch_align;
+       bool has_powergate;
+       bool broken_reset;
+};
+
+struct tegra_dc {
+       struct host1x_client client;
+       struct host1x_syncpt *syncpt;
+       struct device *dev;
+       spinlock_t lock;
+
+       struct drm_crtc base;
+       unsigned int powergate;
+       int pipe;
+
+       struct clk *clk;
+       struct reset_control *rst;
+       void __iomem *regs;
+       int irq;
+
+       struct tegra_output *rgb;
+
+       struct tegra_dc_stats stats;
+       struct list_head list;
+
+       struct drm_info_list *debugfs_files;
+       struct drm_minor *minor;
+       struct dentry *debugfs;
+
+       /* page-flip handling */
+       struct drm_pending_vblank_event *event;
+
+       const struct tegra_dc_soc_info *soc;
+
+       struct iommu_domain *domain;
+};
+
+static inline struct tegra_dc *
+host1x_client_to_dc(struct host1x_client *client)
+{
+       return container_of(client, struct tegra_dc, client);
+}
+
+static inline struct tegra_dc *to_tegra_dc(struct drm_crtc *crtc)
+{
+       return crtc ? container_of(crtc, struct tegra_dc, base) : NULL;
+}
+
+static inline void tegra_dc_writel(struct tegra_dc *dc, u32 value,
+                                  unsigned int offset)
+{
+       trace_dc_writel(dc->dev, offset, value);
+       writel(value, dc->regs + (offset << 2));
+}
+
+static inline u32 tegra_dc_readl(struct tegra_dc *dc, unsigned int offset)
+{
+       u32 value = readl(dc->regs + (offset << 2));
+
+       trace_dc_readl(dc->dev, offset, value);
+
+       return value;
+}
+
+struct tegra_dc_window {
+       struct {
+               unsigned int x;
+               unsigned int y;
+               unsigned int w;
+               unsigned int h;
+       } src;
+       struct {
+               unsigned int x;
+               unsigned int y;
+               unsigned int w;
+               unsigned int h;
+       } dst;
+       unsigned int bits_per_pixel;
+       unsigned int stride[2];
+       unsigned long base[3];
+       bool bottom_up;
+
+       struct tegra_bo_tiling tiling;
+       u32 format;
+       u32 swap;
+};
+
+/* from dc.c */
+void tegra_dc_commit(struct tegra_dc *dc);
+int tegra_dc_state_setup_clock(struct tegra_dc *dc,
+                              struct drm_crtc_state *crtc_state,
+                              struct clk *clk, unsigned long pclk,
+                              unsigned int div);
+
+/* from rgb.c */
+int tegra_dc_rgb_probe(struct tegra_dc *dc);
+int tegra_dc_rgb_remove(struct tegra_dc *dc);
+int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc);
+int tegra_dc_rgb_exit(struct tegra_dc *dc);
+
 #define DC_CMD_GENERAL_INCR_SYNCPT             0x000
 #define DC_CMD_GENERAL_INCR_SYNCPT_CNTRL       0x001
 #define  SYNCPT_CNTRL_NO_STALL   (1 << 8)

diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 063f5d397526c10af3eb7f4d160f111a11a8124f..9bb6e8ebe40c16692e68af0dff92b5ab7a508bf8 100644 (file)
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -119,105 +119,6 @@ void *tegra_drm_alloc(struct tegra_drm *tegra, size_t size, dma_addr_t *iova);
 void tegra_drm_free(struct tegra_drm *tegra, size_t size, void *virt,
                    dma_addr_t iova);
 
-struct tegra_dc_soc_info;
-struct tegra_output;
-
-struct tegra_dc_stats {
-       unsigned long frames;
-       unsigned long vblank;
-       unsigned long underflow;
-       unsigned long overflow;
-};
-
-struct tegra_dc {
-       struct host1x_client client;
-       struct host1x_syncpt *syncpt;
-       struct device *dev;
-       spinlock_t lock;
-
-       struct drm_crtc base;
-       unsigned int powergate;
-       int pipe;
-
-       struct clk *clk;
-       struct reset_control *rst;
-       void __iomem *regs;
-       int irq;
-
-       struct tegra_output *rgb;
-
-       struct tegra_dc_stats stats;
-       struct list_head list;
-
-       struct drm_info_list *debugfs_files;
-       struct drm_minor *minor;
-       struct dentry *debugfs;
-
-       /* page-flip handling */
-       struct drm_pending_vblank_event *event;
-
-       const struct tegra_dc_soc_info *soc;
-
-       struct iommu_domain *domain;
-};
-
-static inline struct tegra_dc *
-host1x_client_to_dc(struct host1x_client *client)
-{
-       return container_of(client, struct tegra_dc, client);
-}
-
-static inline struct tegra_dc *to_tegra_dc(struct drm_crtc *crtc)
-{
-       return crtc ? container_of(crtc, struct tegra_dc, base) : NULL;
-}
-
-static inline void tegra_dc_writel(struct tegra_dc *dc, u32 value,
-                                  unsigned int offset)
-{
-       trace_dc_writel(dc->dev, offset, value);
-       writel(value, dc->regs + (offset << 2));
-}
-
-static inline u32 tegra_dc_readl(struct tegra_dc *dc, unsigned int offset)
-{
-       u32 value = readl(dc->regs + (offset << 2));
-
-       trace_dc_readl(dc->dev, offset, value);
-
-       return value;
-}
-
-struct tegra_dc_window {
-       struct {
-               unsigned int x;
-               unsigned int y;
-               unsigned int w;
-               unsigned int h;
-       } src;
-       struct {
-               unsigned int x;
-               unsigned int y;
-               unsigned int w;
-               unsigned int h;
-       } dst;
-       unsigned int bits_per_pixel;
-       unsigned int stride[2];
-       unsigned long base[3];
-       bool bottom_up;
-
-       struct tegra_bo_tiling tiling;
-       u32 format;
-       u32 swap;
-};
-
-/* from dc.c */
-void tegra_dc_commit(struct tegra_dc *dc);
-int tegra_dc_state_setup_clock(struct tegra_dc *dc,
-                              struct drm_crtc_state *crtc_state,
-                              struct clk *clk, unsigned long pclk,
-                              unsigned int div);
-
 struct tegra_output {
        struct device_node *of_node;
        struct device *dev;
@@ -243,12 +144,6 @@ static inline struct tegra_output *connector_to_output(struct drm_connector *c)
        return container_of(c, struct tegra_output, connector);
 }
 
-/* from rgb.c */
-int tegra_dc_rgb_probe(struct tegra_dc *dc);
-int tegra_dc_rgb_remove(struct tegra_dc *dc);
-int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc);
-int tegra_dc_rgb_exit(struct tegra_dc *dc);
-
 /* from output.c */
 int tegra_output_probe(struct tegra_output *output);
 void tegra_output_remove(struct tegra_output *output);