We have an upcoming openchrome driver for VIA where some of the files conflicts with the existing via driver. It is not acceptable to just delete the existing DRI1 based driver as there are most likely users out there, so a different approach was required. It was disccussed what to do and the least invasive solution was to keep the DRI1 driver in the current directory as a single file. Thomas Zimmermann already posted a patch to do the same but it attemped to have a single driver for the DRI1 and the upcoming new driver. This patchset embeds the files one by one to make the diffs remotely readable and end up with an independent DRI1 driver. The driver was built tested for each step. The driver is in the end renamed to via_dri1. Some feedback on this would be good as I do not know what impact it will have on users. The very last patch synchronize the via_3d_reg header file with the one used in the openchrome driver. This was added to verify that the new header would not break the DRI1 driver. Sam Sam Ravnborg (11): drm/via: Rename via_drv to via_dri1 drm/via: Embed via_dma in via_dri1 drm/via: Embed via_map in via_dri1 drm/via: Embed via_mm in via_dri1 drm/via: Embed via_video in via_dri1 drm/via: Embed via_irq in via_dri1 drm/via: Embed via_dmablit in via_dri1 drm/via: Embed via_verifier in via_dri1 drm/via: Embed via_drv.h in via_dri1 drm/via: Rename the via driver to via_dri1 drm/via: Update to the latest via_3d_reg file drivers/gpu/drm/via/Makefile | 4 +- drivers/gpu/drm/via/via_3d_reg.h | 395 +++- drivers/gpu/drm/via/via_dma.c | 744 -------- drivers/gpu/drm/via/via_dmablit.c | 807 -------- drivers/gpu/drm/via/via_dmablit.h | 140 -- drivers/gpu/drm/via/via_dri1.c | 3630 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/via/via_drv.c | 124 -- drivers/gpu/drm/via/via_drv.h | 229 --- drivers/gpu/drm/via/via_irq.c | 388 ---- drivers/gpu/drm/via/via_map.c | 132 -- drivers/gpu/drm/via/via_mm.c | 241 --- drivers/gpu/drm/via/via_verifier.c | 1110 ----------- drivers/gpu/drm/via/via_verifier.h | 62 - drivers/gpu/drm/via/via_video.c | 94 - 14 files changed, 3935 insertions(+), 4165 deletions(-)