drivers/gpu/drm/openchrome/openchrome_clocks.c | 7 ++++++-
drivers/gpu/drm/openchrome/openchrome_crtc.c | 10 ++++++++--
drivers/gpu/drm/openchrome/openchrome_crtc_hw.h | 2 +-
drivers/gpu/drm/openchrome/openchrome_display.c | 1 -
drivers/gpu/drm/openchrome/openchrome_display.h | 8 ++++++--
drivers/gpu/drm/openchrome/openchrome_drv.c | 8 +++++---
drivers/gpu/drm/openchrome/openchrome_drv.h | 4 ++--
drivers/gpu/drm/openchrome/openchrome_encoder.c | 5 +++++
drivers/gpu/drm/openchrome/openchrome_fb.c | 6 ++++--
drivers/gpu/drm/openchrome/openchrome_fp.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_hdmi.c | 3 +++
drivers/gpu/drm/openchrome/openchrome_i2c.c | 2 ++
drivers/gpu/drm/openchrome/openchrome_init.c | 3 +--
drivers/gpu/drm/openchrome/openchrome_ioc32.c | 3 ++-
14 files changed, 48 insertions(+), 18 deletions(-)
New commits:
commit b3427a21172a7d1e0bf18b92e3ec8f7d058cd1d1
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Mar 18 11:26:42 2019 -0700
drm/openchrome: Rename via_vram_detect()
The new name is openchrome_vram_detect().
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 31bdab29cc08..99f1a0a17ef4 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -273,7 +273,7 @@ extern void via_engine_init(struct drm_device *dev);
int openchrome_dev_pm_ops_suspend(struct device *dev);
int openchrome_dev_pm_ops_resume(struct device *dev);
-extern int via_vram_detect(struct openchrome_drm_private *dev_private);
+int openchrome_vram_detect(struct openchrome_drm_private *dev_private);
extern int openchrome_vram_init(
struct openchrome_drm_private *dev_private);
extern void openchrome_vram_fini(
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c
b/drivers/gpu/drm/openchrome/openchrome_fb.c
index a9c567c9dbca..22072669b4b3 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -689,7 +689,7 @@ static int vx900_mem_type(struct openchrome_drm_private
*dev_private,
return ret;
}
-int via_vram_detect(struct openchrome_drm_private *dev_private)
+int openchrome_vram_detect(struct openchrome_drm_private *dev_private)
{
struct drm_device *dev = dev_private->dev;
struct pci_dev *bridge = NULL;
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c
b/drivers/gpu/drm/openchrome/openchrome_init.c
index 1b5b53e5b483..861cdaa4ea89 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -278,7 +278,7 @@ int openchrome_device_init(struct openchrome_drm_private
*dev_private)
openchrome_flag_init(dev_private);
- ret = via_vram_detect(dev_private);
+ ret = openchrome_vram_detect(dev_private);
if (ret) {
DRM_ERROR("Failed to detect video RAM.\n");
goto exit;
commit c740d74cca106e6bd06660b9396cbe2a2f3e234f
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Mar 18 11:23:16 2019 -0700
drm/openchrome: Removal of including linux/dmi.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c
b/drivers/gpu/drm/openchrome/openchrome_fp.c
index 2da9442bcba0..4c7c130c60df 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fp.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fp.c
@@ -25,7 +25,7 @@
*/
#include <linux/delay.h>
-#include <linux/dmi.h>
+
#include <asm/olpc.h>
#include <drm/drm_probe_helper.h>
commit 416bffb3910f58646ffc7066147ec531c7b6734a
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Mar 18 11:20:39 2019 -0700
drm/openchrome: Removal of including drm/drmP.h
Apparently, DRM maintainers want this to happen.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_clocks.c
b/drivers/gpu/drm/openchrome/openchrome_clocks.c
index 1e783e0889bd..12e6be079fce 100644
--- a/drivers/gpu/drm/openchrome/openchrome_clocks.c
+++ b/drivers/gpu/drm/openchrome/openchrome_clocks.c
@@ -19,10 +19,15 @@
* for more details.
*/
-#include <drm/drmP.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+
+#include <drm/drm_ioctl.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 9427b6ad163f..59681e110131 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -21,14 +21,20 @@
* Authors:
* James Simmons <jsimm...@infradead.org>
*/
-#include <drm/drm_mode.h>
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_mode.h>
#include "openchrome_drv.h"
#include "openchrome_disp_reg.h"
+
static struct vga_regset vpit_table[] = {
{VGA_SEQ_I, 0x01, 0xFF, 0x01 },
{VGA_SEQ_I, 0x02, 0xFF, 0x0F },
diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
b/drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
index 91bbf34c7793..9f186f81d918 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
@@ -27,7 +27,7 @@
#include <video/vga.h>
-#include <drm/drmP.h>
+#include <drm/drm_print.h>
/* To be used with via_analog_set_dpms_control inline function. */
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c
b/drivers/gpu/drm/openchrome/openchrome_display.c
index d15fcd3b1155..7f3993b07149 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -22,7 +22,6 @@
* James Simmons <jsimm...@infradead.org>
*/
-#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_probe_helper.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.h
b/drivers/gpu/drm/openchrome/openchrome_display.h
index 29e7e8046ef8..8e001d4a48b5 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.h
+++ b/drivers/gpu/drm/openchrome/openchrome_display.h
@@ -23,16 +23,20 @@
#ifndef _VIA_DISPLAY_H_
#define _VIA_DISPLAY_H_
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+
#include <video/vga.h>
-#include <drm/drm_edid.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
-#include <drm/drm_plane_helper.h>
+#include <drm/drm_edid.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_plane_helper.h>
#include "openchrome_crtc_hw.h"
+
/* IGA Scaling disable */
#define VIA_NO_SCALING 0
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 1a23111dbde9..f5045c9f520d 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -27,13 +27,15 @@
* DEALINGS IN THE SOFTWARE.
*/
-
#include <linux/module.h>
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_pci.h>
#include <drm/drm_pciids.h>
+#include <drm/via_drm.h>
+
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 9a78de1ad4f2..31bdab29cc08 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -36,8 +36,8 @@
#include <video/vga.h>
-#include <drm/drmP.h>
#include <drm/drm_gem.h>
+#include <drm/drm_ioctl.h>
#include "ttm/ttm_bo_api.h"
#include "ttm/ttm_bo_driver.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_encoder.c
b/drivers/gpu/drm/openchrome/openchrome_encoder.c
index d3728e83ab0c..c2f6c11f7efd 100644
--- a/drivers/gpu/drm/openchrome/openchrome_encoder.c
+++ b/drivers/gpu/drm/openchrome/openchrome_encoder.c
@@ -27,6 +27,11 @@
*
*/
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+
+#include <drm/drm_ioctl.h>
+
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c
b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 2b4981ae23ab..a9c567c9dbca 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -20,8 +20,10 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-#include <drm/drmP.h>
+
+#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_crtc_helper.h>
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c
b/drivers/gpu/drm/openchrome/openchrome_fp.c
index 3e5213d6e66f..2da9442bcba0 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fp.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fp.c
@@ -23,6 +23,8 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
+
+#include <linux/delay.h>
#include <linux/dmi.h>
#include <asm/olpc.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index 35fa43b917ea..45c087ae33f5 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -24,6 +24,9 @@
* James Simmons <jsimm...@infradead.org>
*/
+#include <linux/delay.h>
+
+#include <drm/drm_drv.h>
#include <drm/drm_probe_helper.h>
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_i2c.c
b/drivers/gpu/drm/openchrome/openchrome_i2c.c
index 158ec88a963c..48ec7af8b154 100644
--- a/drivers/gpu/drm/openchrome/openchrome_i2c.c
+++ b/drivers/gpu/drm/openchrome/openchrome_i2c.c
@@ -16,6 +16,8 @@
* driver by VIA Technologies and S3 Graphics
*/
+#include <linux/delay.h>
+
#include "openchrome_drv.h"
enum viafb_i2c_adap;
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c
b/drivers/gpu/drm/openchrome/openchrome_init.c
index 9b5aaef09640..1b5b53e5b483 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -27,7 +27,6 @@
#include <linux/module.h>
#include <linux/console.h>
-#include <drm/drmP.h>
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioc32.c
b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
index 42bc54238da4..4f88e614ecd0 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioc32.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
@@ -25,10 +25,11 @@
* Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/
-#include <drm/drmP.h>
+#include <drm/drm_ioctl.h>
#include "openchrome_drv.h"
+
static int
via_getparam(struct drm_device *dev, void *data,
struct drm_file *filp)
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
