drm/{mga,mgag200}: drop use of drmP.h
Subsystems (3)
cover drm/{mga,mgag200}: drop use of drmP.h
Drop use of the deprecated drmP.h header file. Also drop use of drm_os_linux.h as it is deprecated too, and was pulled in via drmP.h
Build tested with allmodconfig, allyesconfig on
various architectures.
Sam Ravnborg (4):
drm/mga: drop dependency on drm_os_linux.h
drm/mga: make header file self contained
drm/mga: drop use of drmP.h
drm/mgag200: drop use of drmP.h
drivers/gpu/drm/mga/mga_dma.c | 14 ++++++++------ drivers/gpu/drm/mga/mga_drv.c | 7 +++---- drivers/gpu/drm/mga/mga_drv.h | 25 +++++++++++++++++++++---- drivers/gpu/drm/mga/mga_ioc32.c | 3 +-- drivers/gpu/drm/mga/mga_irq.c | 10 ++++------ drivers/gpu/drm/mga/mga_state.c | 8 +++----- drivers/gpu/drm/mga/mga_warp.c | 4 +--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +++++++--- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +++----- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +++++--- drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 ++++-- drivers/gpu/drm/mgag200/mgag200_main.c | 4 +++- drivers/gpu/drm/mgag200/mgag200_mode.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++- 15 files changed, 69 insertions(+), 47 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/4 drm/mga: drop dependency on drm_os_linux.h
Opencode all macros used from the deprecated drm_os_linux.h header file. The DRM_WAIT_ON used 3 * HZ as timeout.
This was translated to 30 msec.
--- drivers/gpu/drm/mga/mga_dma.c | 12 ++++++++---- drivers/gpu/drm/mga/mga_drv.h | 12 ++++++++---- drivers/gpu/drm/mga/mga_irq.c | 8 ++++---- drivers/gpu/drm/mga/mga_state.c | 6 +++--- 4 files changed, 23 insertions(+), 15 deletions(-)
drivers/gpu/drm/mga/mga_dma.c +8 -4
@@ -35,6 +35,8 @@* \author Gareth Hughes <[email protected]> */ +#include <linux/delay.h> +#include <drm/drmP.h> #include <drm/mga_drm.h> #include "mga_drv.h"
@@ -62,7 +64,7 @@ int mga_do_wait_for_idle(drm_mga_private_t *dev_priv)MGA_WRITE8 (MGA_CRTC_INDEX ,0 );return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }#if MGA_DMA_DEBUG
@@ -114,7 +116,7 @@ void mga_do_dma_flush(drm_mga_private_t *dev_priv) status =MGA_READ (MGA_STATUS ) &MGA_ENGINE_IDLE_MASK ;if (status ==MGA_ENDPRDMASTS )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (primary->tail == primary->last_flush) {
@@ -1120,7 +1122,7 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->send_count !=0 ) {DRM_ERROR ("Process %d trying to send %d buffers via drmDMA\n" , -DRM_CURRENTPID , d->send_count); +task_pid_nr (current), d->send_count);return -EINVAL ; }
@@ -1128,7 +1130,9 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->request_count <0 || d->request_count > dma->buf_count) {DRM_ERROR ("Process %d trying to get %d buffers (of %d max)\n" , -DRM_CURRENTPID , d->request_count, dma->buf_count); +task_pid_nr (current), + d->request_count, + dma->buf_count);return -EINVAL ; }
drivers/gpu/drm/mga/mga_drv.h +8 -4
@@ -199,10 +199,14 @@ extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,#define mga_flush_write_combine () wmb() -#define MGA_READ8 (reg) DRM_READ8(dev_priv->mmio, (reg)) -#define MGA_READ (reg) DRM_READ32(dev_priv->mmio, (reg)) -#define MGA_WRITE8 (reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val)) -#define MGA_WRITE (reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val)) +#define MGA_READ8 (reg) \ + readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_READ (reg) \ + readl(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE8 (reg, val) \ + writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE (reg, val) \ + writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))#define DWGREG0 0x1c00#define DWGREG0_END 0x1dff
drivers/gpu/drm/mga/mga_irq.c +4 -4
@@ -122,19 +122,19 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence) {drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;unsigned int cur_fence; -int ret =0 ;/* Assume that the user has missed the current sequence number * by about a day rather than she wants to wait for years * using fences. */ -DRM_WAIT_ON (ret, dev_priv->fence_queue,3 *HZ , +wait_event_timeout (dev_priv->fence_queue, (((cur_fence =atomic_read (&dev_priv->last_fence_retired)) - - *sequence) <= (1 <<23 ))); + - *sequence) <= (1 <<23 )), +msecs_to_jiffies (30 )); *sequence = cur_fence; -return ret; +return 0 ; }void mga_driver_irq_preinstall (struct drm_device *dev)
drivers/gpu/drm/mga/mga_state.c +3 -3
@@ -1016,7 +1016,7 @@ int mga_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));switch (param->param) {case MGA_PARAM_IRQ_NR :
@@ -1048,7 +1048,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fireturn -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));/* I would normal do this assignment in the declaration of fence, * but dev_priv may be NULL.
@@ -1077,7 +1077,7 @@ file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));mga_driver_fence_wait (dev, fence);return 0 ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v1 1/4] drm/mga: drop dependency on drm_os_linux.h
Hi
Am 08.06.19 um 10:19 schrieb Sam Ravnborg:
Quoted 76 lines
Opencode all macros used from the deprecated
drm_os_linux.hheader file. TheDRM_WAIT_ONused 3 * HZ as timeout.
This was translated to 30 msec.Signed-off-by Sam Ravnborg <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Daniel Vetter <[email protected]>Cc David Airlie <[email protected]>--- drivers/gpu/drm/mga/mga_dma.c | 12 ++++++++---- drivers/gpu/drm/mga/mga_drv.h | 12 ++++++++---- drivers/gpu/drm/mga/mga_irq.c | 8 ++++---- drivers/gpu/drm/mga/mga_state.c | 6 +++--- 4 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/mga/mga_dma.c +8
-4@@ -35,6 +35,8 @@* \author Gareth Hughes <[email protected]> */ +#include <linux/delay.h> +#include <drm/drmP.h> #include <drm/mga_drm.h> #include "mga_drv.h" @@ -62,7 +64,7 @@ int mga_do_wait_for_idle(drm_mga_private_t *dev_priv)MGA_WRITE8 (MGA_CRTC_INDEX ,0 );return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }#if MGA_DMA_DEBUG @@ -114,7 +116,7 @@ void mga_do_dma_flush(drm_mga_private_t *dev_priv) status =MGA_READ (MGA_STATUS ) &MGA_ENGINE_IDLE_MASK ;if (status ==MGA_ENDPRDMASTS )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (primary->tail == primary->last_flush) {@@ -1120,7 +1122,7 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->send_count !=0 ) {DRM_ERROR ("Process %d trying to send %d buffers via drmDMA\n" , -DRM_CURRENTPID , d->send_count); +task_pid_nr (current), d->send_count);return -EINVAL ; }@@ -1128,7 +1130,9 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->request_count <0 || d->request_count > dma->buf_count) {DRM_ERROR ("Process %d trying to get %d buffers (of %d max)\n" , -DRM_CURRENTPID , d->request_count, dma->buf_count); +task_pid_nr (current), + d->request_count, + dma->buf_count);return -EINVAL ; }drivers/gpu/drm/mga/mga_drv.h +0
-2@@ -199,10 +199,14 @@ extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,#define mga_flush_write_combine () wmb() -#define MGA_READ8 (reg) DRM_READ8(dev_priv->mmio, (reg)) -#define MGA_READ (reg) DRM_READ32(dev_priv->mmio, (reg))
drivers/gpu/drm/mga/mga_drv.h extern long mga_compat_ioctl(struct file *filp, unsigned int cmd, · line 209
Quoted 10 lines
drivers/gpu/drm/mga/mga_drv.h +8
-2-#define MGA_WRITE8 (reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val)) -#define MGA_WRITE (reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val)) +#define MGA_READ8 (reg) \ + readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_READ (reg) \ + readl(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE8 (reg, val) \ + writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE (reg, val) \ + writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
Addition is not defined or implementation specific for type void* IIRC. Compilers tend to treat it like u8*. Maybe cast mmio->handle to (u8 __iomem *) instead?
Best regards
Thomas
Quoted 63 lines
drivers/gpu/drm/mga/mga_drv.h +0
-0#define DWGREG0 0x1c00#define DWGREG0_END 0x1dffdrivers/gpu/drm/mga/mga_irq.c +4
-4@@ -122,19 +122,19 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence) {drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;unsigned int cur_fence; -int ret =0 ;/* Assume that the user has missed the current sequence number * by about a day rather than she wants to wait for years * using fences. */ -DRM_WAIT_ON (ret, dev_priv->fence_queue,3 *HZ , +wait_event_timeout (dev_priv->fence_queue, (((cur_fence =atomic_read (&dev_priv->last_fence_retired)) - - *sequence) <= (1 <<23 ))); + - *sequence) <= (1 <<23 )), +msecs_to_jiffies (30 )); *sequence = cur_fence; -return ret; +return 0 ; }void mga_driver_irq_preinstall (struct drm_device *dev)drivers/gpu/drm/mga/mga_state.c +3
-3@@ -1016,7 +1016,7 @@ int mga_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));switch (param->param) {case MGA_PARAM_IRQ_NR :@@ -1048,7 +1048,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fireturn -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));/* I would normal do this assignment in the declaration of fence, * but dev_priv may be NULL. @@ -1077,7 +1077,7 @@ file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));mga_driver_fence_wait (dev, fence);return 0 ;
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v1 1/4] drm/mga: drop dependency on drm_os_linux.h
Quoted 77 lines · Thomas Zimmermann
Hi
Am 08.06.19 um 10:19 schrieb Sam Ravnborg:
Quoted 74 lines
Opencode all macros used from the deprecated
drm_os_linux.hheader file. TheDRM_WAIT_ONused 3 * HZ as timeout.
This was translated to 30 msec.Signed-off-by Sam Ravnborg <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Daniel Vetter <[email protected]>Cc David Airlie <[email protected]>--- drivers/gpu/drm/mga/mga_dma.c | 12 ++++++++---- drivers/gpu/drm/mga/mga_drv.h | 12 ++++++++---- drivers/gpu/drm/mga/mga_irq.c | 8 ++++---- drivers/gpu/drm/mga/mga_state.c | 6 +++--- 4 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/mga/mga_dma.c +8
-4@@ -35,6 +35,8 @@* \author Gareth Hughes <[email protected]> */ +#include <linux/delay.h> +#include <drm/drmP.h> #include <drm/mga_drm.h> #include "mga_drv.h" @@ -62,7 +64,7 @@ int mga_do_wait_for_idle(drm_mga_private_t *dev_priv)MGA_WRITE8 (MGA_CRTC_INDEX ,0 );return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }#if MGA_DMA_DEBUG @@ -114,7 +116,7 @@ void mga_do_dma_flush(drm_mga_private_t *dev_priv) status =MGA_READ (MGA_STATUS ) &MGA_ENGINE_IDLE_MASK ;if (status ==MGA_ENDPRDMASTS )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (primary->tail == primary->last_flush) {@@ -1120,7 +1122,7 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->send_count !=0 ) {DRM_ERROR ("Process %d trying to send %d buffers via drmDMA\n" , -DRM_CURRENTPID , d->send_count); +task_pid_nr (current), d->send_count);return -EINVAL ; }@@ -1128,7 +1130,9 @@ int mga_dma_buffers(struct drm_device *dev, void *data,*/ if (d->request_count <0 || d->request_count > dma->buf_count) {DRM_ERROR ("Process %d trying to get %d buffers (of %d max)\n" , -DRM_CURRENTPID , d->request_count, dma->buf_count); +task_pid_nr (current), + d->request_count, + dma->buf_count);return -EINVAL ; }drivers/gpu/drm/mga/mga_drv.h +0
-0@@ -199,10 +199,14 @@ extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,#define mga_flush_write_combine () wmb()
Quoted 16 lines
drivers/gpu/drm/mga/mga_drv.h extern long mga_compat_ioctl(struct file *filp, unsigned int cmd, · line 209
Quoted 12 lines
drivers/gpu/drm/mga/mga_drv.h +8
-4-#define MGA_READ8 (reg) DRM_READ8(dev_priv->mmio, (reg)) -#define MGA_READ (reg) DRM_READ32(dev_priv->mmio, (reg)) -#define MGA_WRITE8 (reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val)) -#define MGA_WRITE (reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val)) +#define MGA_READ8 (reg) \ + readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_READ (reg) \ + readl(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE8 (reg, val) \ + writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE (reg, val) \ + writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))Addition is not defined or implementation specific for type void* IIRC. Compilers tend to treat it like u8*. Maybe cast
mmio->handleto (u8__iomem*) instead?
drm_os_linux.h has depended upon this gcc-ism since decades by now, I think it's ok to leave this as-is :-)
-Daniel
Quoted 75 lines
Best regards
ThomasQuoted 63 lines
drivers/gpu/drm/mga/mga_drv.h +0
-0#define DWGREG0 0x1c00#define DWGREG0_END 0x1dffdrivers/gpu/drm/mga/mga_irq.c +4
-4@@ -122,19 +122,19 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence) {drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;unsigned int cur_fence; -int ret =0 ;/* Assume that the user has missed the current sequence number * by about a day rather than she wants to wait for years * using fences. */ -DRM_WAIT_ON (ret, dev_priv->fence_queue,3 *HZ , +wait_event_timeout (dev_priv->fence_queue, (((cur_fence =atomic_read (&dev_priv->last_fence_retired)) - - *sequence) <= (1 <<23 ))); + - *sequence) <= (1 <<23 )), +msecs_to_jiffies (30 )); *sequence = cur_fence; -return ret; +return 0 ; }void mga_driver_irq_preinstall (struct drm_device *dev)drivers/gpu/drm/mga/mga_state.c +3
-3@@ -1016,7 +1016,7 @@ int mga_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));switch (param->param) {case MGA_PARAM_IRQ_NR :@@ -1048,7 +1048,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fireturn -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));/* I would normal do this assignment in the declaration of fence, * but dev_priv may be NULL. @@ -1077,7 +1077,7 @@ file_priv)return -EINVAL ; } -DRM_DEBUG ("pid=%d\n" ,DRM_CURRENTPID ); +DRM_DEBUG ("pid=%d\n" ,task_pid_nr (current));mga_driver_fence_wait (dev, fence);return 0 ;Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v1 1/4] drm/mga: drop dependency on drm_os_linux.h
In reply to Thomas ZimmermannHi Thomas.
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/mga/mga_drv.h +4
-0+#define MGA_READ8 (reg) \ + readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_READ (reg) \ + readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
Quoted 8 lines
drivers/gpu/drm/mga/mga_drv.h extern long mga_compat_ioctl(struct file *filp, unsigned int cmd, · line 209
Quoted 4 lines
drivers/gpu/drm/mga/mga_drv.h +4
-0+#define MGA_WRITE8 (reg, val) \ + writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE (reg, val) \ + writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))Addition is not defined or implementation specific for type void* IIRC. Compilers tend to treat it like u8*. Maybe cast
mmio->handleto (u8__iomem*) instead?
I briefly looked at changing the type of mmio->handle
Today:
void *handle; /**< User-space: "Handle" to pass to mmap() */
Proposal:
void __iomem *handle; /**< User-space: "Handle" to pass to mmap() */
This would allow me to drop the cast in the code above, that is only added to make sparse happy.
But the above triggered other sparse warnings and I ended up dropping this.
As for (void *) versus (u8 *), then (void *) is what we do today. [What Daniel also says in another mail].
Should we change the type I would prepfer a follow-up patch to do it.
If you could test it I can type the patch, or you could do so when working with the driver.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v1 1/4] drm/mga: drop dependency on drm_os_linux.h
Hi
Am 11.06.19 um 12:44 schrieb Sam Ravnborg:
Quoted 28 lines
Hi Thomas.
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/mga/mga_drv.h +4
-0+#define MGA_READ8 (reg) \ + readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_READ (reg) \ + readl(((void __iomem *)dev_priv->mmio->handle) + (reg))Quoted 8 lines
drivers/gpu/drm/mga/mga_drv.h extern long mga_compat_ioctl(struct file *filp, unsigned int cmd, · line 209
Quoted 4 lines
drivers/gpu/drm/mga/mga_drv.h +4
-0+#define MGA_WRITE8 (reg, val) \ + writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) +#define MGA_WRITE (reg, val) \ + writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))Addition is not defined or implementation specific for type void* IIRC. Compilers tend to treat it like u8*. Maybe cast
mmio->handleto (u8__iomem*) instead?I briefly looked at changing the type of
mmio->handleToday:
void *handle; /**< User-space: "Handle" to pass to
mmap()*/Proposal:
void__iomem*handle; /**< User-space: "Handle" to pass tommap()*/This would allow me to drop the cast in the code above, that is only added to make sparse happy.
But the above triggered other sparse warnings and I ended up dropping this.
Quoted 7 lines
As for (void *) versus (u8 *), then (void *) is what we do today. [What Daniel also says in another mail].
Should we change the type I would prepfer a follow-up patch to do it.
If you could test it I can type the patch, or you could do so when working with the driver.
I don't really do anything with mga, so my testing is as good as anyone's. But it's not that important. Don't make this patch set depend on such mostly cosmetic issues.
Best regards
Thomas
Quoted 7 lines
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/4 drm/mga: make header file self contained
In reply to Sam RavnborgThis makes migration away from drmP.h simple
as we do not need to duplicate dependencies required by mga_drv.h
--- drivers/gpu/drm/mga/mga_drv.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/mga/mga_drv.h +13 -0
@@ -31,7 +31,20 @@#ifndef __MGA_DRV_H__#define __MGA_DRV_H__ +#include <linux/irqreturn.h> +#include <linux/slab.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h> #include <drm/drm_legacy.h> +#include <drm/drm_pci.h> +#include <drm/drm_print.h> +#include <drm/drm_sarea.h> +#include <drm/drm_vblank.h> +#include <drm/mga_drm.h> /* General customization: */
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/4 drm/mga: drop use of drmP.h
In reply to Sam RavnborgDrop the use of the deprecated drmP.h header file. Clean up list of include files and sort them.
--- drivers/gpu/drm/mga/mga_dma.c | 2 -- drivers/gpu/drm/mga/mga_drv.c | 7 +++---- drivers/gpu/drm/mga/mga_ioc32.c | 3 +-- drivers/gpu/drm/mga/mga_irq.c | 2 -- drivers/gpu/drm/mga/mga_state.c | 2 -- drivers/gpu/drm/mga/mga_warp.c | 4 +--- 6 files changed, 5 insertions(+), 15 deletions(-)
drivers/gpu/drm/mga/mga_dma.c +0 -2
@@ -37,8 +37,6 @@#include <linux/delay.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000
drivers/gpu/drm/mga/mga_drv.c +3 -4
@@ -31,12 +31,11 @@#include <linux/module.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> -#include "mga_drv.h" - +#include <drm/drm_drv.h> #include <drm/drm_pciids.h> +#include "mga_drv.h" +static struct pci_device_id pciidlist[] = { mga_PCI_IDS };
drivers/gpu/drm/mga/mga_ioc32.c +1 -2
@@ -30,10 +30,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include <linux/compat.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" typedef struct drm32_mga_init {
drivers/gpu/drm/mga/mga_irq.c +0 -2
@@ -31,8 +31,6 @@* Eric Anholt <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" u32 mga_get_vblank_counter (struct drm_device *dev,unsigned int pipe)
drivers/gpu/drm/mga/mga_state.c +0 -2
@@ -32,8 +32,6 @@* Gareth Hughes <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" /* ================================================================
drivers/gpu/drm/mga/mga_warp.c +1 -3
@@ -29,11 +29,9 @@#include <linux/firmware.h> #include <linux/ihex.h> -#include <linux/platform_device.h> #include <linux/module.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define FIRMWARE_G200 "matrox/g200_warp.fw"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v1 3/4] drm/mga: drop use of drmP.h
Hi
Am 08.06.19 um 10:19 schrieb Sam Ravnborg:
Quoted 36 lines
Drop the use of the deprecated
drmP.hheader file. Clean up list of include files and sort them.Signed-off-by Sam Ravnborg <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Daniel Vetter <[email protected]>Cc David Airlie <[email protected]>--- drivers/gpu/drm/mga/mga_dma.c | 2 -- drivers/gpu/drm/mga/mga_drv.c | 7 +++---- drivers/gpu/drm/mga/mga_ioc32.c | 3 +-- drivers/gpu/drm/mga/mga_irq.c | 2 -- drivers/gpu/drm/mga/mga_state.c | 2 -- drivers/gpu/drm/mga/mga_warp.c | 4 +--- 6 files changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/mga/mga_dma.c +0
-2@@ -37,8 +37,6 @@#include <linux/delay.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000drivers/gpu/drm/mga/mga_drv.c +0
-0@@ -31,12 +31,11 @@#include <linux/module.h>
drivers/gpu/drm/mga/mga_drv.c line 38
Quoted 10 lines
drivers/gpu/drm/mga/mga_drv.c +3
-4-#include <drm/drmP.h> -#include <drm/mga_drm.h> -#include "mga_drv.h" - +#include <drm/drm_drv.h> #include <drm/drm_pciids.h> +#include "mga_drv.h" +
Unless it violates an existing convention, I'd suggest the following order for headers (here and in the other patches):
c file header ("mga_foo.h" for mga_foo.c)
driver header ("mga_drv.h")
public linux/drm headers
other driver headers ("mga_nonfoo.h", etc)
I know that it's nitpicking, but this maximizes the chance that the driver's header files include all dependencies they need.
Best regards
Thomas
Quoted 63 lines
drivers/gpu/drm/mga/mga_drv.c +0
-0static struct pci_device_id pciidlist[] = { mga_PCI_IDS };drivers/gpu/drm/mga/mga_ioc32.c +1
-2@@ -30,10 +30,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include <linux/compat.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" typedef struct drm32_mga_init {drivers/gpu/drm/mga/mga_irq.c +0
-2@@ -31,8 +31,6 @@* Eric Anholt <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" u32 mga_get_vblank_counter (struct drm_device *dev,unsigned int pipe)drivers/gpu/drm/mga/mga_state.c +0
-2@@ -32,8 +32,6 @@* Gareth Hughes <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" /* ================================================================ drivers/gpu/drm/mga/mga_warp.c +1
-3@@ -29,11 +29,9 @@#include <linux/firmware.h> #include <linux/ihex.h> -#include <linux/platform_device.h> #include <linux/module.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define FIRMWARE_G200 "matrox/g200_warp.fw"
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v1 3/4] drm/mga: drop use of drmP.h
Quoted 53 lines · Thomas Zimmermann
Hi
Am 08.06.19 um 10:19 schrieb Sam Ravnborg:
Quoted 36 lines
Drop the use of the deprecated
drmP.hheader file. Clean up list of include files and sort them.Signed-off-by Sam Ravnborg <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Daniel Vetter <[email protected]>Cc David Airlie <[email protected]>--- drivers/gpu/drm/mga/mga_dma.c | 2 -- drivers/gpu/drm/mga/mga_drv.c | 7 +++---- drivers/gpu/drm/mga/mga_ioc32.c | 3 +-- drivers/gpu/drm/mga/mga_irq.c | 2 -- drivers/gpu/drm/mga/mga_state.c | 2 -- drivers/gpu/drm/mga/mga_warp.c | 4 +--- 6 files changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/mga/mga_dma.c +0
-2@@ -37,8 +37,6 @@#include <linux/delay.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000drivers/gpu/drm/mga/mga_drv.c +0
-0@@ -31,12 +31,11 @@#include <linux/module.h> drivers/gpu/drm/mga/mga_drv.c line 38
Quoted 10 lines
drivers/gpu/drm/mga/mga_drv.c +3
-4-#include <drm/drmP.h> -#include <drm/mga_drm.h> -#include "mga_drv.h" - +#include <drm/drm_drv.h> #include <drm/drm_pciids.h> +#include "mga_drv.h" +Unless it violates an existing convention, I'd suggest the following order for headers (here and in the other patches):
Quoted 7 lines
c file header ("
mga_foo.h" formga_foo.c)
driver header ("mga_drv.h")
public linux/drm headers
other driver headers ("mga_nonfoo.h", etc)I know that it's nitpicking, but this maximizes the chance that the driver's header files include all dependencies they need.
Hm I think generally we go the other way round in linux:
#include <asm/*.h>
#include <linux/*.h>
#include <drm/*.h>
#include "*.h"
Cheers, Daniel
Quoted 76 lines
Best regards
ThomasQuoted 63 lines
drivers/gpu/drm/mga/mga_drv.c +0
-0static struct pci_device_id pciidlist[] = { mga_PCI_IDS };drivers/gpu/drm/mga/mga_ioc32.c +1
-2@@ -30,10 +30,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include <linux/compat.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" typedef struct drm32_mga_init {drivers/gpu/drm/mga/mga_irq.c +0
-2@@ -31,8 +31,6 @@* Eric Anholt <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" u32 mga_get_vblank_counter (struct drm_device *dev,unsigned int pipe)drivers/gpu/drm/mga/mga_state.c +0
-2@@ -32,8 +32,6 @@* Gareth Hughes <[email protected]> */ -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" /* ================================================================ drivers/gpu/drm/mga/mga_warp.c +1
-3@@ -29,11 +29,9 @@#include <linux/firmware.h> #include <linux/ihex.h> -#include <linux/platform_device.h> #include <linux/module.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> -#include <drm/mga_drm.h> #include "mga_drv.h" #define FIRMWARE_G200 "matrox/g200_warp.fw"Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/4 drm/mgag200: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file. Replace with necessary includ files to fix build.
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +++++++--- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +++----- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +++++--- drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 ++++-- drivers/gpu/drm/mgag200/mgag200_main.c | 4 +++- drivers/gpu/drm/mgag200/mgag200_mode.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++- 8 files changed, 28 insertions(+), 17 deletions(-)
drivers/gpu/drm/mgag200/mgag200_cursor.c +2 -1
@@ -8,7 +8,8 @@* Author: Christopher Harvey <[email protected]> */ -#include <drm/drmP.h> +#include <drm/drm_pci.h> +#include "mgag200_drv.h" static bool warn_transparent = true;
drivers/gpu/drm/mgag200/mgag200_drv.c +7 -3
@@ -8,14 +8,18 @@* Authors: Matthew Garrett * Dave Airlie */ +#include <linux/module.h> #include <linux/console.h> -#include <drm/drmP.h> - -#include "mgag200_drv.h" +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_pci.h> #include <drm/drm_pciids.h> +#include "mgag200_drv.h" +/* * This is the generic driver code. This binds the driver to the drm core, * which then performs further device association and calls our graphics init
drivers/gpu/drm/mgag200/mgag200_drv.h +3 -5
@@ -13,19 +13,17 @@#ifndef __MGAG200_DRV_H__#define __MGAG200_DRV_H__ +#include <linux/i2c-algo-bit.h> +#include <linux/i2c.h> +#include <video/vga.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/drm_vram_mm_helper.h> -#include <linux/i2c.h> -#include <linux/i2c-algo-bit.h> -#include "mgag200_reg.h" #define DRIVER_AUTHOR "Matthew Garrett"
drivers/gpu/drm/mgag200/mgag200_fb.c +5 -3
@@ -10,11 +10,13 @@* Matt Turner * Dave Airlie */ +#include <linux/module.h> -#include <drm/drmP.h> -#include <drm/drm_util.h> -#include <drm/drm_fb_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_util.h> #include "mgag200_drv.h"
drivers/gpu/drm/mgag200/mgag200_i2c.c +4 -2
@@ -25,10 +25,12 @@/* * Authors: Dave Airlie <[email protected]> */ +#include <linux/export.h> -#include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <drm/drmP.h> +#include <linux/i2c.h> + +#include <drm/drm_pci.h> #include "mgag200_drv.h"
drivers/gpu/drm/mgag200/mgag200_main.c +3 -1
@@ -10,8 +10,10 @@* Matt Turner * Dave Airlie */ -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_pci.h> +#include "mgag200_drv.h" static void mga_user_framebuffer_destroy (struct drm_framebuffer *fb)
drivers/gpu/drm/mgag200/mgag200_mode.c +2 -1
@@ -13,8 +13,9 @@#include <linux/delay.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_pci.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/mgag200/mgag200_ttm.c +2 -1
@@ -25,7 +25,8 @@/* * Authors: Dave Airlie <[email protected]> */ -#include <drm/drmP.h> + +#include <drm/drm_pci.h> #include "mgag200_drv.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi
Thanks a lot. There's some bike shedding in my other replies, but generally
Best regard
Thomas
Am 08.06.19 um 10:19 schrieb Sam Ravnborg:
Quoted 33 lines
Drop use of the deprecated
drmP.hheader file. Also drop use ofdrm_os_linux.has it is deprecated too, and was pulled in viadrmP.hBuild tested with allmodconfig, allyesconfig on
various architectures.Signed-off-by Sam Ravnborg <[email protected]>Sam Ravnborg (4):
drm/mga: drop dependency ondrm_os_linux.h
drm/mga: make header file self contained
drm/mga: drop use ofdrmP.h
drm/mgag200: drop use ofdrmP.hdrivers/gpu/drm/mga/mga_dma.c | 14 ++++++++------ drivers/gpu/drm/mga/mga_drv.c | 7 +++---- drivers/gpu/drm/mga/mga_drv.h | 25 +++++++++++++++++++++---- drivers/gpu/drm/mga/mga_ioc32.c | 3 +-- drivers/gpu/drm/mga/mga_irq.c | 10 ++++------ drivers/gpu/drm/mga/mga_state.c | 8 +++----- drivers/gpu/drm/mga/mga_warp.c | 4 +--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +++++++--- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +++----- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +++++--- drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 ++++-- drivers/gpu/drm/mgag200/mgag200_main.c | 4 +++- drivers/gpu/drm/mgag200/mgag200_mode.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++- 15 files changed, 69 insertions(+), 47 deletions(-)
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel