drivers/gpu/drm/openchrome/openchrome_analog.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_clocks.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_crtc.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_display.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_drv.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_fb.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_fence.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_fp.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_gem.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_h1_cmdbuf.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_h1_dma.c | 5 ++++-
drivers/gpu/drm/openchrome/openchrome_hdmi.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_i2c.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_ioc32.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_irq.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_pm.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_sgdma.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_tmds.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_ttm.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_verifier.c | 4 +++-
20 files changed, 43 insertions(+), 20 deletions(-)
New commits:
commit 5d2b8c7e2ba6a905808f96e6f8413cc978ef222b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Apr 29 17:39:17 2018 -0700
drm/openchrome: Rename via_drv.h to openchrome_drv.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c
b/drivers/gpu/drm/openchrome/openchrome_analog.c
index 32a15a2f1537..45fca805023a 100644
--- a/drivers/gpu/drm/openchrome/openchrome_analog.c
+++ b/drivers/gpu/drm/openchrome/openchrome_analog.c
@@ -23,8 +23,9 @@
* Authors:
* James Simmons <jsimm...@infradead.org>
*/
-#include "via_drv.h"
+
#include "openchrome_crtc_hw.h"
+#include "openchrome_drv.h"
/*
diff --git a/drivers/gpu/drm/openchrome/openchrome_clocks.c
b/drivers/gpu/drm/openchrome/openchrome_clocks.c
index e693cbc94a1e..6fd128ddc947 100644
--- a/drivers/gpu/drm/openchrome/openchrome_clocks.c
+++ b/drivers/gpu/drm/openchrome/openchrome_clocks.c
@@ -20,7 +20,8 @@
*/
#include "drmP.h"
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
#define CSR_VCO_UP 600000000
#define CSR_VCO_DOWN 300000000
diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c
b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 48da348abaa5..601a0ac11643 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -26,7 +26,7 @@
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
-#include "via_drv.h"
+#include "openchrome_drv.h"
#include "openchrome_disp_reg.h"
static struct vga_regset vpit_table[] = {
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c
b/drivers/gpu/drm/openchrome/openchrome_display.c
index 6738273f2827..60b1b7fcf7f9 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -26,7 +26,7 @@
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
-#include "via_drv.h"
+#include "openchrome_drv.h"
/*
* Shared encoder routines.
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 7446e1b81072..c001c8230f48 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -33,7 +33,7 @@
#include <drm/via_drm.h>
#include <drm/drm_pciids.h>
-#include "via_drv.h"
+#include "openchrome_drv.h"
int via_modeset = 1;
diff --git a/drivers/gpu/drm/openchrome/via_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
similarity index 100%
rename from drivers/gpu/drm/openchrome/via_drv.h
rename to drivers/gpu/drm/openchrome/openchrome_drv.h
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c
b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 0dd19f5763dc..ca122c71535f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -21,10 +21,11 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "drmP.h"
-#include "via_drv.h"
#include "drm_fb_helper.h"
#include "drm_crtc_helper.h"
+#include "openchrome_drv.h"
+
static int
cle266_mem_type(struct via_device *dev_priv, struct pci_dev *bridge)
{
diff --git a/drivers/gpu/drm/openchrome/openchrome_fence.c
b/drivers/gpu/drm/openchrome/openchrome_fence.c
index e466a38d0bf4..307240a44d08 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fence.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fence.c
@@ -23,7 +23,7 @@
#include <linux/random.h>
#include "drmP.h"
-#include "via_drv.h"
+#include "openchrome_drv.h"
static void
via_fence_destroy(struct kref *kref)
diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c
b/drivers/gpu/drm/openchrome/openchrome_fp.c
index 67ec868af7e6..2966f1cef06f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fp.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fp.c
@@ -26,7 +26,7 @@
#include <linux/dmi.h>
#include <asm/olpc.h>
-#include "via_drv.h"
+#include "openchrome_drv.h"
#define TD0 200
#define TD1 25
diff --git a/drivers/gpu/drm/openchrome/openchrome_gem.c
b/drivers/gpu/drm/openchrome/openchrome_gem.c
index 0ce52146909c..f2a53df4babd 100644
--- a/drivers/gpu/drm/openchrome/openchrome_gem.c
+++ b/drivers/gpu/drm/openchrome/openchrome_gem.c
@@ -21,7 +21,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "drmP.h"
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
/*
* initialize the gem buffer object
diff --git a/drivers/gpu/drm/openchrome/openchrome_h1_cmdbuf.c
b/drivers/gpu/drm/openchrome/openchrome_h1_cmdbuf.c
index 2e3d54753a80..efec57522a5b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_h1_cmdbuf.c
+++ b/drivers/gpu/drm/openchrome/openchrome_h1_cmdbuf.c
@@ -35,8 +35,9 @@
*/
#include <drm/drmP.h>
-#include "via_drv.h"
+
#include "openchrome_3d_reg.h"
+#include "openchrome_drv.h"
#define CMDBUF_ALIGNMENT_SIZE (0x100)
#define CMDBUF_ALIGNMENT_MASK (0x0ff)
diff --git a/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
b/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
index f1a43be37961..925dde99080b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
+++ b/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
@@ -25,8 +25,11 @@
* Thomas Hellstrom.
* Partially based on code obtained from Digeo Inc.
*/
+
#include <drm/drmP.h>
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
+
/*
* Fire a blit engine.
diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index c209606d8607..9f87856c5316 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -23,7 +23,9 @@
* Authors:
* James Simmons <jsimm...@infradead.org>
*/
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
+
#define HDMI_AUDIO_ENABLED BIT(0)
#define HDMI_COLOR_RANGE BIT(1)
diff --git a/drivers/gpu/drm/openchrome/openchrome_i2c.c
b/drivers/gpu/drm/openchrome/openchrome_i2c.c
index 15361edc5be8..08a2648d86d4 100644
--- a/drivers/gpu/drm/openchrome/openchrome_i2c.c
+++ b/drivers/gpu/drm/openchrome/openchrome_i2c.c
@@ -15,7 +15,8 @@
* This part was influenced by the via i2c code written for the viafb
* driver by VIA Technologies and S3 Graphics
*/
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
enum viafb_i2c_adap;
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioc32.c
b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
index f3a335a1ac57..a7850df54203 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioc32.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
@@ -24,8 +24,10 @@
/*
* Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/
+
#include "drmP.h"
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
static int
via_getparam(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/openchrome/openchrome_irq.c
b/drivers/gpu/drm/openchrome/openchrome_irq.c
index 6cfd269dab22..deb574cfaae2 100644
--- a/drivers/gpu/drm/openchrome/openchrome_irq.c
+++ b/drivers/gpu/drm/openchrome/openchrome_irq.c
@@ -34,7 +34,9 @@
*/
#include "drmP.h"
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
+
/* HW Interrupt Register Setting */
#define INTERRUPT_CTRL_REG1 0x200
diff --git a/drivers/gpu/drm/openchrome/openchrome_pm.c
b/drivers/gpu/drm/openchrome/openchrome_pm.c
index 8dcffdf6410b..971286c11d9c 100644
--- a/drivers/gpu/drm/openchrome/openchrome_pm.c
+++ b/drivers/gpu/drm/openchrome/openchrome_pm.c
@@ -22,7 +22,9 @@
*/
#include "drmP.h"
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
+
static void
via_init_2d(struct via_device *dev_priv, int pci_device)
diff --git a/drivers/gpu/drm/openchrome/openchrome_sgdma.c
b/drivers/gpu/drm/openchrome/openchrome_sgdma.c
index e6fcbf79836f..352de056ab90 100644
--- a/drivers/gpu/drm/openchrome/openchrome_sgdma.c
+++ b/drivers/gpu/drm/openchrome/openchrome_sgdma.c
@@ -23,7 +23,9 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "via_drv.h"
+
+#include "openchrome_drv.h"
+
static int
via_pcie_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c
b/drivers/gpu/drm/openchrome/openchrome_tmds.c
index 535ebcfa1bc6..4eda7904a861 100644
--- a/drivers/gpu/drm/openchrome/openchrome_tmds.c
+++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c
@@ -26,7 +26,8 @@
* James Simmons <jsimm...@infradead.org>
*/
-#include "via_drv.h"
+#include "openchrome_drv.h"
+
static void via_tmds_power(struct via_device *dev_priv,
bool power_state)
diff --git a/drivers/gpu/drm/openchrome/openchrome_ttm.c
b/drivers/gpu/drm/openchrome/openchrome_ttm.c
index f6fe989269bc..33f7754b9297 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ttm.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ttm.c
@@ -26,7 +26,8 @@
#include <linux/swiotlb.h>
#endif
-#include "via_drv.h"
+#include "openchrome_drv.h"
+
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
diff --git a/drivers/gpu/drm/openchrome/openchrome_verifier.c
b/drivers/gpu/drm/openchrome/openchrome_verifier.c
index 158293fbaea9..4fa554032562 100644
--- a/drivers/gpu/drm/openchrome/openchrome_verifier.c
+++ b/drivers/gpu/drm/openchrome/openchrome_verifier.c
@@ -27,12 +27,14 @@
* Don't run this code directly on an AGP buffer. Due to cache problems it will
* be very slow.
*/
+
#include <drm/drmP.h>
#include <drm/via_drm.h>
#include "openchrome_3d_reg.h"
#include "openchrome_verifier.h"
-#include "via_drv.h"
+#include "openchrome_drv.h"
+
enum verifier_state {
state_command,
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
