| Message ID | 1412618205-18750-1-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 06, 2014 at 06:56:43PM +0100, Damien Lespiau wrote: > SKL will have a whole separate display regs file, so merge > base_display.txt into each platform file. Please drop it from vlv/chv. It's not appropriate for those platforms. > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > --- > tools/quick_dump/broadwell | 1 + > tools/quick_dump/cherryview | 1 + > tools/quick_dump/{base_display.txt => common_display.txt} | 0 > tools/quick_dump/haswell | 1 + > tools/quick_dump/ivybridge | 1 + > tools/quick_dump/sandybridge | 1 + > tools/quick_dump/valleyview | 1 + > 7 files changed, 6 insertions(+) > rename tools/quick_dump/{base_display.txt => common_display.txt} (100%) > > diff --git a/tools/quick_dump/broadwell b/tools/quick_dump/broadwell > index 35c5cc7..7888a36 100644 > --- a/tools/quick_dump/broadwell > +++ b/tools/quick_dump/broadwell > @@ -1,3 +1,4 @@ > +common_display.txt > gen7_other.txt > haswell_other.txt > gen8_interrupt.txt > diff --git a/tools/quick_dump/cherryview b/tools/quick_dump/cherryview > index a86abe2..069dc86 100644 > --- a/tools/quick_dump/cherryview > +++ b/tools/quick_dump/cherryview > @@ -1,3 +1,4 @@ > +common_display.txt > vlv_pipe_a.txt > vlv_pipe_b.txt > chv_pipe_c.txt > diff --git a/tools/quick_dump/base_display.txt b/tools/quick_dump/common_display.txt > similarity index 100% > rename from tools/quick_dump/base_display.txt > rename to tools/quick_dump/common_display.txt > diff --git a/tools/quick_dump/haswell b/tools/quick_dump/haswell > index d449843..94ffb7c 100644 > --- a/tools/quick_dump/haswell > +++ b/tools/quick_dump/haswell > @@ -1,3 +1,4 @@ > +common_display.txt > gen7_other.txt > haswell_other.txt > audio_config_haswell_plus.txt > diff --git a/tools/quick_dump/ivybridge b/tools/quick_dump/ivybridge > index 4637b42..79bda9b 100644 > --- a/tools/quick_dump/ivybridge > +++ b/tools/quick_dump/ivybridge > @@ -1 +1,2 @@ > +common_display.txt > gen7_other.txt > diff --git a/tools/quick_dump/sandybridge b/tools/quick_dump/sandybridge > index 6ece0fd..a0a4474 100644 > --- a/tools/quick_dump/sandybridge > +++ b/tools/quick_dump/sandybridge > @@ -1 +1,2 @@ > +common_display.txt > gen6_other.txt > diff --git a/tools/quick_dump/valleyview b/tools/quick_dump/valleyview > index 2611a98..64f0cac 100644 > --- a/tools/quick_dump/valleyview > +++ b/tools/quick_dump/valleyview > @@ -1,3 +1,4 @@ > +common_display.txt > vlv_pipe_a.txt > vlv_pipe_b.txt > vlv_display_base.txt > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Oct 07, 2014 at 01:26:37PM +0300, Ville Syrjälä wrote: > On Mon, Oct 06, 2014 at 06:56:43PM +0100, Damien Lespiau wrote: > > SKL will have a whole separate display regs file, so merge > > base_display.txt into each platform file. > > Please drop it from vlv/chv. It's not appropriate for those platforms. Ah I wondered about that and decided to not break the existing stuff (to maintain the possibility to diff without noise). But if you're happy with dropping that, I certainly am as well. Pushed the corresponding commit.
diff --git a/tools/quick_dump/broadwell b/tools/quick_dump/broadwell index 35c5cc7..7888a36 100644 --- a/tools/quick_dump/broadwell +++ b/tools/quick_dump/broadwell @@ -1,3 +1,4 @@ +common_display.txt gen7_other.txt haswell_other.txt gen8_interrupt.txt diff --git a/tools/quick_dump/cherryview b/tools/quick_dump/cherryview index a86abe2..069dc86 100644 --- a/tools/quick_dump/cherryview +++ b/tools/quick_dump/cherryview @@ -1,3 +1,4 @@ +common_display.txt vlv_pipe_a.txt vlv_pipe_b.txt chv_pipe_c.txt diff --git a/tools/quick_dump/base_display.txt b/tools/quick_dump/common_display.txt similarity index 100% rename from tools/quick_dump/base_display.txt rename to tools/quick_dump/common_display.txt diff --git a/tools/quick_dump/haswell b/tools/quick_dump/haswell index d449843..94ffb7c 100644 --- a/tools/quick_dump/haswell +++ b/tools/quick_dump/haswell @@ -1,3 +1,4 @@ +common_display.txt gen7_other.txt haswell_other.txt audio_config_haswell_plus.txt diff --git a/tools/quick_dump/ivybridge b/tools/quick_dump/ivybridge index 4637b42..79bda9b 100644 --- a/tools/quick_dump/ivybridge +++ b/tools/quick_dump/ivybridge @@ -1 +1,2 @@ +common_display.txt gen7_other.txt diff --git a/tools/quick_dump/sandybridge b/tools/quick_dump/sandybridge index 6ece0fd..a0a4474 100644 --- a/tools/quick_dump/sandybridge +++ b/tools/quick_dump/sandybridge @@ -1 +1,2 @@ +common_display.txt gen6_other.txt diff --git a/tools/quick_dump/valleyview b/tools/quick_dump/valleyview index 2611a98..64f0cac 100644 --- a/tools/quick_dump/valleyview +++ b/tools/quick_dump/valleyview @@ -1,3 +1,4 @@ +common_display.txt vlv_pipe_a.txt vlv_pipe_b.txt vlv_display_base.txt
SKL will have a whole separate display regs file, so merge base_display.txt into each platform file. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- tools/quick_dump/broadwell | 1 + tools/quick_dump/cherryview | 1 + tools/quick_dump/{base_display.txt => common_display.txt} | 0 tools/quick_dump/haswell | 1 + tools/quick_dump/ivybridge | 1 + tools/quick_dump/sandybridge | 1 + tools/quick_dump/valleyview | 1 + 7 files changed, 6 insertions(+) rename tools/quick_dump/{base_display.txt => common_display.txt} (100%)