Finally add support for regeneration of the shipped autogenerated register headers. Pass DRM_MSM_GENERATE_HEADERS=1 to make to force regeneration. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> --- drivers/gpu/drm/msm/Makefile | 27 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/registers/.gitignore | 5 +++++ 2 files changed, 32 insertions(+) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 89c9f5f93b85..a19ad02bd701 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -180,3 +180,30 @@ msm-$(CONFIG_DRM_MSM_DSI) += $(msm-dsi) $(msm-dsi-y) $(addprefix $(obj)/,$(msm-dsi) $(msm-dsi-y)): $(obj)/registers/dsi.xml.h obj-$(CONFIG_DRM_MSM) += msm.o + +ifdef DRM_MSM_GENERATE_HEADERS + +hostprogs += hg2 + +hg2-objs = \ + headergen2/colors.o \ + headergen2/path.o \ + headergen2/rnn.o \ + headergen2/rnndec.o \ + headergen2/headergen2.o + +HOST_EXTRACFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags libxml-2.0) -DRNN_DEF_PATH='"$(srctree)/$(src)/registers/xml"' +HOSTLDLIBS_hg2 = $(shell pkg-config --libs libxml-2.0) + +HEADERGEN = $(objtree)/$(obj)/hg2 + +quiet_cmd_headergen = HG2 $@ + cmd_headergen = $(HEADERGEN) $(shell basename $<) $(srctree)/$(src)/registers/ + +$(src)/registers/%.xml.h_shipped: msm.xml.h + $(Q): + +msm.xml.h: $(src)/registers/xml/msm.xml $(HEADERGEN) FORCE + $(call cmd,headergen) + +endif diff --git a/drivers/gpu/drm/msm/registers/.gitignore b/drivers/gpu/drm/msm/registers/.gitignore new file mode 100644 index 000000000000..2e422e71e590 --- /dev/null +++ b/drivers/gpu/drm/msm/registers/.gitignore @@ -0,0 +1,5 @@ +# ignore empty files +msm.xml.h_shipped +freedreno_copyright.xml.h_shipped +# unused files +edp.xml.h_shipped -- 2.39.2