| Message ID | 20220716181750.3874838-10-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: move dri1 drivers to drm/dri1/ | expand |
On 7/16/22 20:17, Sam Ravnborg wrote: > drm/dri1 is the new home for all the legacy DRI1 drivers. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Suggested-by: Javier Martinez Canillas <javierm@redhat.com> > --- Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> I wonder if we should just squash patches 03/11 to 09/11 into a single patch. Although I guess having them in separate patches makes it easier to get the acks from the drivers' maintainers. [...] > index 73c0aa1c7b94..f639d5e0ae2e 100644 > --- a/drivers/gpu/drm/dri1/Makefile > +++ b/drivers/gpu/drm/dri1/Makefile > @@ -5,6 +5,7 @@ > obj-$(CONFIG_DRM_I810) += i810/ > obj-$(CONFIG_DRM_MGA) += mga/ > obj-$(CONFIG_DRM_R128) += r128/ > +obj-$(CONFIG_DRM_SAVAGE) += savage/ > obj-$(CONFIG_DRM_SIS) += sis/ > obj-$(CONFIG_DRM_TDFX) += tdfx/ > obj-$(CONFIG_DRM_VIA) += via/ Maybe we should call these CONFIG_DRM_DRI1_FOO to make more clear in kernel configs whether DRM or DRI1 drivers are being enabled? After all, the menuconfig now is called DRM_DRI1 and the drivers enabled when CONFIG_DRM_DRI1 is set.
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index bb3d8ffb9dd6..a3bd337bcab4 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -91,7 +91,6 @@ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/ -obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VGEM) += vgem/ obj-$(CONFIG_DRM_VKMS) += vkms/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index 73c0aa1c7b94..f639d5e0ae2e 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_R128) += r128/ +obj-$(CONFIG_DRM_SAVAGE) += savage/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_TDFX) += tdfx/ obj-$(CONFIG_DRM_VIA) += via/ diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/dri1/savage/Makefile similarity index 100% rename from drivers/gpu/drm/savage/Makefile rename to drivers/gpu/drm/dri1/savage/Makefile diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/dri1/savage/savage_bci.c similarity index 100% rename from drivers/gpu/drm/savage/savage_bci.c rename to drivers/gpu/drm/dri1/savage/savage_bci.c diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/dri1/savage/savage_drv.c similarity index 100% rename from drivers/gpu/drm/savage/savage_drv.c rename to drivers/gpu/drm/dri1/savage/savage_drv.c diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/dri1/savage/savage_drv.h similarity index 100% rename from drivers/gpu/drm/savage/savage_drv.h rename to drivers/gpu/drm/dri1/savage/savage_drv.h diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/dri1/savage/savage_state.c similarity index 100% rename from drivers/gpu/drm/savage/savage_state.c rename to drivers/gpu/drm/dri1/savage/savage_state.c
drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Suggested-by: Javier Martinez Canillas <javierm@redhat.com> --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/savage/Makefile | 0 drivers/gpu/drm/{ => dri1}/savage/savage_bci.c | 0 drivers/gpu/drm/{ => dri1}/savage/savage_drv.c | 0 drivers/gpu/drm/{ => dri1}/savage/savage_drv.h | 0 drivers/gpu/drm/{ => dri1}/savage/savage_state.c | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/savage/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_bci.c (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_drv.h (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_state.c (100%)