[openchrome-devel] drm-openchrome: Branch 'drm-next-5.18' - 12 commits - drivers/gpu/drm

Kevin Brace kevinbrace at kemper.freedesktop.org
Tue Feb 1 20:27:20 UTC 2022 

 drivers/gpu/drm/openchrome/openchrome_analog.c  |    2 
 drivers/gpu/drm/openchrome/openchrome_clocks.c  |    2 
 drivers/gpu/drm/openchrome/openchrome_crtc.c    |   52 ++++++++++++------------
 drivers/gpu/drm/openchrome/openchrome_cursor.c  |    1 
 drivers/gpu/drm/openchrome/openchrome_display.c |    2 
 drivers/gpu/drm/openchrome/openchrome_drv.c     |    5 +-
 drivers/gpu/drm/openchrome/openchrome_drv.h     |   23 ----------
 drivers/gpu/drm/openchrome/openchrome_encoder.c |    2 
 drivers/gpu/drm/openchrome/openchrome_fp.c      |    1 
 drivers/gpu/drm/openchrome/openchrome_hdmi.c    |    2 
 drivers/gpu/drm/openchrome/openchrome_init.c    |    4 -
 drivers/gpu/drm/openchrome/openchrome_ioctl.c   |    2 
 drivers/gpu/drm/openchrome/openchrome_pm.c      |    1 
 drivers/gpu/drm/openchrome/openchrome_tmds.c    |    2 
 14 files changed, 46 insertions(+), 55 deletions(-)

New commits:
commit 94bb7d9935900b29fa034012ffbbf1552cc1b550
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Feb 1 14:03:22 2022 -0600

    drm/openchrome: Version bumped to 3.4.17
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 3f46b47aef84..b63c08bb39c0 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -54,10 +54,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		4
-#define DRIVER_PATCHLEVEL	16
+#define DRIVER_PATCHLEVEL	17
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20220125"
+#define DRIVER_DATE		"20220201"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 1a8e0e9ba54110ae0d1b9aaf6a6c6a79ef943cd7
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Feb 1 13:53:59 2022 -0600

    drm/openchrome: Consolidate access to SR1A in openchrome_gamma_set()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 22f8166f7b38..ce23075bb9e6 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -192,25 +192,26 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 	struct via_crtc *iga = container_of(crtc,
 						struct via_crtc, base);
 	int end = (size > 256) ? 256 : size, i;
-	u8 val = 0, sr1a;
+	u8 val = 0;
 	int ret = 0;
 
 	DRM_DEBUG_KMS("Entered %s.\n", __func__);
 
-	sr1a = vga_rseq(VGABASE, 0x1A);
-
 	if ((!crtc->enabled) || (!crtc->primary->fb)) {
 		ret = -EINVAL;
 		goto exit;
 	}
 
 	if (!iga->index) {
+		/*
+		 * Access IGA1's pallette LUT.
+		 */
+		svga_wseq_mask(VGABASE, 0x1A, 0x00, BIT(0));
+
 		/*
 		 * Is it an 8-bit color mode?
 		 */
 		if (crtc->primary->fb->format->cpp[0] == 1) {
-			/* Prepare for initialize IGA1's LUT: */
-			vga_wseq(VGABASE, 0x1A, sr1a & 0xFE);
 			/* Change to Primary Display's LUT */
 			val = vga_rseq(VGABASE, 0x1B);
 			vga_wseq(VGABASE, 0x1B, val);
@@ -233,12 +234,9 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 			 * previously
 			 */
 			svga_wcrt_mask(VGABASE, 0x33, 0x00, BIT(7));
-			/* access Primary Display's LUT */
-			vga_wseq(VGABASE, 0x1A, sr1a & 0xFE);
 		} else {
 			/* Enable Gamma */
 			svga_wcrt_mask(VGABASE, 0x33, BIT(7), BIT(7));
-			svga_wseq_mask(VGABASE, 0x1A, 0x00, BIT(0));
 
 			/* Fill in IGA1's gamma */
 			for (i = 0; i < end; i++) {
@@ -249,15 +247,17 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 				vga_w(VGABASE, VGA_PEL_D, g[i] >> 8);
 				vga_w(VGABASE, VGA_PEL_D, b[i] >> 8);
 			}
-			vga_wseq(VGABASE, 0x1A, sr1a);
 		}
 	} else {
+		/*
+		 * Access IGA2's pallette LUT.
+		 */
+		svga_wseq_mask(VGABASE, 0x1A, BIT(0), BIT(0));
+
 		/*
 		 * Is it an 8-bit color mode?
 		 */
 		if (crtc->primary->fb->format->cpp[0] == 1) {
-			/* Change Shadow to Secondary Display's LUT */
-			svga_wseq_mask(VGABASE, 0x1A, BIT(0), BIT(0));
 			/* Enable Secondary Display Engine */
 			svga_wseq_mask(VGABASE, 0x1B, BIT(7), BIT(7));
 			/* Second Display Color Depth, 8bpp */
@@ -284,13 +284,9 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 			 * previously
 			 */
 			svga_wcrt_mask(VGABASE, 0x6A, 0x00, BIT(1));
-
-			/* access Primary Display's LUT */
-			vga_wseq(VGABASE, 0x1A, sr1a & 0xFE);
 		} else {
 			u8 reg_bits = BIT(1);
 
-			svga_wseq_mask(VGABASE, 0x1A, BIT(0), BIT(0));
 			/* Bit 1 enables gamma */
 			svga_wcrt_mask(VGABASE, 0x6A, BIT(1), BIT(1));
 
@@ -331,8 +327,6 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 				vga_w(VGABASE, VGA_PEL_D, g[i] >> 8);
 				vga_w(VGABASE, VGA_PEL_D, b[i] >> 8);
 			}
-			/* access Primary Display's LUT */
-			vga_wseq(VGABASE, 0x1A, sr1a);
 		}
 	}
 
commit d92734a49ff7b3b5f3e5f4da6b6577e6c72b1d5b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Feb 1 13:15:38 2022 -0600

    drm/openchrome: Remove unnecessary multiply by 8 of cpp
    
    These multiply by 8 of cpp (Color Per Pixel) operations are not
    really necessary, so stop doing it.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 19f7919341ee..22f8166f7b38 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -205,7 +205,10 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 	}
 
 	if (!iga->index) {
-		if (crtc->primary->fb->format->cpp[0] * 8 == 8) {
+		/*
+		 * Is it an 8-bit color mode?
+		 */
+		if (crtc->primary->fb->format->cpp[0] == 1) {
 			/* Prepare for initialize IGA1's LUT: */
 			vga_wseq(VGABASE, 0x1A, sr1a & 0xFE);
 			/* Change to Primary Display's LUT */
@@ -249,7 +252,10 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 			vga_wseq(VGABASE, 0x1A, sr1a);
 		}
 	} else {
-		if (crtc->primary->fb->format->cpp[0] * 8 == 8) {
+		/*
+		 * Is it an 8-bit color mode?
+		 */
+		if (crtc->primary->fb->format->cpp[0] == 1) {
 			/* Change Shadow to Secondary Display's LUT */
 			svga_wseq_mask(VGABASE, 0x1A, BIT(0), BIT(0));
 			/* Enable Secondary Display Engine */
@@ -1913,7 +1919,7 @@ void openchrome_primary_atomic_update(struct drm_plane *plane,
 	struct drm_crtc *crtc = new_state->crtc;
 	struct drm_framebuffer *fb = new_state->fb;
 	uint32_t pitch = (new_state->crtc_y * fb->pitches[0]) +
-			(new_state->crtc_x * ((fb->format->cpp[0] * 8) >> 3));
+			(new_state->crtc_x * fb->format->cpp[0]);
 	uint32_t addr;
 	struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
 	struct openchrome_drm_private *dev_private =
@@ -1950,7 +1956,8 @@ void openchrome_primary_atomic_update(struct drm_plane *plane,
 		vga_wcrt(VGABASE, 0x34, (addr >> 16) & 0xFF);
 
 		/* Load fetch count registers */
-		pitch = ALIGN(crtc->mode.hdisplay * (fb->format->cpp[0] * 8) >> 3, 16);
+		pitch = ALIGN(crtc->mode.hdisplay * fb->format->cpp[0],
+				16);
 		load_value_to_registers(VGABASE, &iga->fetch, pitch >> 4);
 
 		/* Set the primary pitch */
commit 9429d264040a824f6caa1ef4a17d61ab37bc7f97
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 27 16:40:14 2022 -0600

    drm/openchrome: Remove disable_second_display_channel()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 7dff30f76b29..3f46b47aef84 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -344,12 +344,6 @@ via_unlock_crtc(void __iomem *regs, int pci_id)
 	svga_wcrt_mask(regs, 0x47, 0, mask);
 }
 
-static inline void
-disable_second_display_channel(void __iomem *regs)
-{
-	svga_wcrt_mask(regs, 0x6A, 0x00, BIT(7));
-}
-
 
 extern int openchrome_driver_num_ioctls;
 
commit ca5161acadf9123fafc17820849f6076cf8a43a3
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 27 16:39:56 2022 -0600

    drm/openchrome: Remove enable_second_display_channel()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index ab4ceb53d846..19f7919341ee 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -261,7 +261,8 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 			 * Enable second display channel just in case.
 			 */
 			if (!(vga_rcrt(VGABASE, 0x6A) & BIT(7)))
-				enable_second_display_channel(VGABASE);
+				svga_wcrt_mask(VGABASE, 0x6A,
+						BIT(7), BIT(7));
 
 			/* Fill in IGA2's LUT */
 			for (i = 0; i < end; i++) {
@@ -312,7 +313,8 @@ static int openchrome_gamma_set(struct drm_crtc *crtc,
 			 * again.
 			 */
 			if (!(vga_rcrt(VGABASE, 0x6A) & BIT(7)))
-				enable_second_display_channel(VGABASE);
+				svga_wcrt_mask(VGABASE, 0x6A,
+						BIT(7), BIT(7));
 
 			/* Fill in IGA2's gamma */
 			for (i = 0; i < end; i++) {
@@ -1797,7 +1799,7 @@ void openchrome_mode_set_nofb(struct drm_crtc *crtc)
 		/* Set palette LUT to 8-bit mode. */
 		via_iga2_set_palette_lut_resolution(VGABASE, true);
 
-		enable_second_display_channel(VGABASE);
+		svga_wcrt_mask(VGABASE, 0x6A, BIT(7), BIT(7));
 	}
 
 exit:
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index f388724c7063..7dff30f76b29 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -344,12 +344,6 @@ via_unlock_crtc(void __iomem *regs, int pci_id)
 	svga_wcrt_mask(regs, 0x47, 0, mask);
 }
 
-static inline void
-enable_second_display_channel(void __iomem *regs)
-{
-	svga_wcrt_mask(regs, 0x6A, BIT(7), BIT(7));
-}
-
 static inline void
 disable_second_display_channel(void __iomem *regs)
 {
commit e2b823d387fe9cd730c1925ff1a8e3a5bdd8d45b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:26:34 2022 -0600

    drm/openchrome: Remove unnecessary drm/drm_ioctl.h inclusion
    
    Also, extern reference openchrome_driver_ioctls[] only from
    openchrome_drv.c, and not from openchrome_drv.h.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_clocks.c b/drivers/gpu/drm/openchrome/openchrome_clocks.c
index 8e5ed4ca378e..ac7cfb6802ae 100644
--- a/drivers/gpu/drm/openchrome/openchrome_clocks.c
+++ b/drivers/gpu/drm/openchrome/openchrome_clocks.c
@@ -23,8 +23,6 @@
 #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_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 8047be5b92d2..ab4ceb53d846 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -40,7 +40,6 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_gem.h>
-#include <drm/drm_ioctl.h>
 #include <drm/drm_mode.h>
 #include <drm/drm_modeset_helper_vtables.h>
 #include <drm/drm_plane.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index f92c8f00730c..d5c131bb05c8 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -34,6 +34,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_pciids.h>
 #include <drm/drm_prime.h>
 
@@ -42,6 +43,8 @@
 #include "openchrome_drv.h"
 
 
+extern const struct drm_ioctl_desc openchrome_driver_ioctls[];
+
 /*
  * For now, this device driver will be disabled, unless the
  * user decides to enable it.
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 856efc6d728d..f388724c7063 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -42,7 +42,6 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_fb_helper.h>
-#include <drm/drm_ioctl.h>
 #include <drm/drm_plane.h>
 
 #include <drm/ttm/ttm_bo_api.h>
@@ -358,7 +357,6 @@ disable_second_display_channel(void __iomem *regs)
 }
 
 
-extern const struct drm_ioctl_desc openchrome_driver_ioctls[];
 extern int openchrome_driver_num_ioctls;
 
 extern struct ttm_device_funcs openchrome_bo_driver;
diff --git a/drivers/gpu/drm/openchrome/openchrome_encoder.c b/drivers/gpu/drm/openchrome/openchrome_encoder.c
index c2f6c11f7efd..583107953146 100644
--- a/drivers/gpu/drm/openchrome/openchrome_encoder.c
+++ b/drivers/gpu/drm/openchrome/openchrome_encoder.c
@@ -30,8 +30,6 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 
-#include <drm/drm_ioctl.h>
-
 #include "openchrome_drv.h"
 
 
commit 5a4b28752258b0324af643d198c5bc552213b40e
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:50 2022 -0600

    drm/openchrome: Include linux/pci.h from each .c file
    
    Do this instead of doing it from the main header file, openchrome_drv.h.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c b/drivers/gpu/drm/openchrome/openchrome_analog.c
index b55f5ea75e0f..e00d2119eb04 100644
--- a/drivers/gpu/drm/openchrome/openchrome_analog.c
+++ b/drivers/gpu/drm/openchrome/openchrome_analog.c
@@ -24,6 +24,8 @@
  * James Simmons <jsimmons at infradead.org>
  */
 
+#include <linux/pci.h>
+
 #include <drm/drm_atomic_state_helper.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_cursor.c b/drivers/gpu/drm/openchrome/openchrome_cursor.c
index 058f935a517a..e822b287c1e0 100644
--- a/drivers/gpu/drm/openchrome/openchrome_cursor.c
+++ b/drivers/gpu/drm/openchrome/openchrome_cursor.c
@@ -30,6 +30,7 @@
  * James Simmons <jsimmons at infradead.org>
  */
 
+#include <linux/pci.h>
 #include <linux/pci_ids.h>
 
 #include <drm/drm_atomic.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c b/drivers/gpu/drm/openchrome/openchrome_display.c
index 7592037b042c..04e472ea5e00 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -22,6 +22,8 @@
  *	James Simmons <jsimmons at infradead.org>
  */
 
+#include <linux/pci.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_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index e9785d5c69ea..f92c8f00730c 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -27,6 +27,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/pci.h>
+
 #include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index a7dae246b403..856efc6d728d 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -34,7 +34,6 @@
 #define _OPENCHROME_DRV_H
 
 
-#include <linux/pci.h>
 #include <linux/pci_ids.h>
 
 #include <video/vga.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_fp.c b/drivers/gpu/drm/openchrome/openchrome_fp.c
index 7f86133b05d6..b05004ec60c7 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fp.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fp.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/pci.h>
 
 #include <asm/olpc.h>
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index a4d86308f3b7..416b8b9a060f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/pci.h>
 
 #include <drm/drm_atomic_state_helper.h>
 #include <drm/drm_print.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index b364cd91d79e..17d376586b70 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -25,6 +25,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/pci.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_mode_config.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_pm.c b/drivers/gpu/drm/openchrome/openchrome_pm.c
index 18adb8f50abb..f0d837d7c1d1 100644
--- a/drivers/gpu/drm/openchrome/openchrome_pm.c
+++ b/drivers/gpu/drm/openchrome/openchrome_pm.c
@@ -30,6 +30,7 @@
 
 
 #include <linux/console.h>
+#include <linux/pci.h>
 
 #include "openchrome_drv.h"
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c b/drivers/gpu/drm/openchrome/openchrome_tmds.c
index b4b3a9301cd2..8253bc0e4b72 100644
--- a/drivers/gpu/drm/openchrome/openchrome_tmds.c
+++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c
@@ -26,6 +26,8 @@
  *	James Simmons <jsimmons at infradead.org>
  */
 
+#include <linux/pci.h>
+
 #include <drm/drm_atomic_state_helper.h>
 #include <drm/drm_probe_helper.h>
 
commit c129824447f54c0b603ff195163967f525af8681
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:48 2022 -0600

    drm/openchrome: Remove unnecessary drm/drm_framebuffer.h inclusion
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index b35213b5d2e3..a7dae246b403 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -43,7 +43,6 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_fb_helper.h>
-#include <drm/drm_framebuffer.h>
 #include <drm/drm_ioctl.h>
 #include <drm/drm_plane.h>
 
commit 5a13b570c10e5e026db55aa9de2c759b1e54ba56
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:46 2022 -0600

    drm/openchrome: Remove unnecessary drm/drm_drv.h inclusion
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index b437addc9583..a4d86308f3b7 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -27,7 +27,6 @@
 #include <linux/delay.h>
 
 #include <drm/drm_atomic_state_helper.h>
-#include <drm/drm_drv.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index 6a7f71bf3555..b364cd91d79e 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -26,7 +26,6 @@
  */
 
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_drv.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_mode_config.h>
 
commit 1e5c96cd66250e59fc78d11d4807a53bc9bd9f53
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:16 2022 -0600

    drm/openchrome: Remove unnecessary linux/module.h inclusion
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 84eaf9787ee3..e9785d5c69ea 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -27,8 +27,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/module.h>
-
 #include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index baf2ccc10692..b35213b5d2e3 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -34,7 +34,6 @@
 #define _OPENCHROME_DRV_H
 
 
-#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index d907d86b4c72..6a7f71bf3555 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -25,8 +25,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/module.h>
-
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_gem_framebuffer_helper.h>
commit 3f9ab8b328e7e945faddc094c5fd8c1d32edf9cc
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:15 2022 -0600

    drm/openchrome: Remove unnecessary linux/console.h inclusion
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index 80d8d7a61d5f..d907d86b4c72 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -26,7 +26,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/console.h>
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_drv.h>
commit 1f461a7547cfda23c3eb34a6906af09afe3da5d7
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 26 17:10:13 2022 -0600

    drm/openchrome: Refer to UAPI header inside openchrome_ioctl.c
    
    Also, refer to the correct path for the UAPI header.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 15624d9eb84b..baf2ccc10692 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -52,8 +52,6 @@
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
 
-#include <drm/openchrome_drm.h>
-
 #include "openchrome_crtc_hw.h"
 #include "openchrome_regs.h"
 
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
index bf56513565c9..1b8581151972 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
@@ -33,6 +33,8 @@
 
 #include <drm/ttm/ttm_bo_api.h>
 
+#include <uapi/drm/openchrome_drm.h>
+
 #include "openchrome_drv.h"

More information about the openchrome-devel mailing list