Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
I was asking about winsys/amdgpu/sw. I had no problem with moving radeon_winsys.h. Marek On Tue, Apr 28, 2015 at 9:08 AM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 07:51, Chia-I Wu olva...@gmail.com wrote: On Tue, Apr 28, 2015 at 2:19 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 03:30, Michel Dänzer mic...@daenzer.net wrote: On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) Well said Michel - this is exactly what I meant. ilo moved its intel_winsys.h to src/gallium/drivers/ilo because Emil wouldn't let me put it in src/gallium/winsys/intel, which is exactly what this patch tries to do for radeon :) Here we (will) have two different winsys implementations (radeon, amdgpu), providing the same interface for the same radeon driver(s). I hope that my suggestion for consistency did not come as pushy. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
amdgpu/sw was just a (not so good) example. The only user that I can think of is fbdev, although with st/egl gone we're rather far from it. -Emil On 28 April 2015 at 09:37, Marek Olšák mar...@gmail.com wrote: I was asking about winsys/amdgpu/sw. I had no problem with moving radeon_winsys.h. Marek On Tue, Apr 28, 2015 at 9:08 AM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 07:51, Chia-I Wu olva...@gmail.com wrote: On Tue, Apr 28, 2015 at 2:19 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 03:30, Michel Dänzer mic...@daenzer.net wrote: On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) Well said Michel - this is exactly what I meant. ilo moved its intel_winsys.h to src/gallium/drivers/ilo because Emil wouldn't let me put it in src/gallium/winsys/intel, which is exactly what this patch tries to do for radeon :) Here we (will) have two different winsys implementations (radeon, amdgpu), providing the same interface for the same radeon driver(s). I hope that my suggestion for consistency did not come as pushy. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
On Tue, Apr 28, 2015 at 2:19 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 03:30, Michel Dänzer mic...@daenzer.net wrote: On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) Well said Michel - this is exactly what I meant. ilo moved its intel_winsys.h to src/gallium/drivers/ilo because Emil wouldn't let me put it in src/gallium/winsys/intel, which is exactly what this patch tries to do for radeon :) -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev -- o...@lunarg.com ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
On 28 April 2015 at 07:51, Chia-I Wu olva...@gmail.com wrote: On Tue, Apr 28, 2015 at 2:19 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 28 April 2015 at 03:30, Michel Dänzer mic...@daenzer.net wrote: On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) Well said Michel - this is exactly what I meant. ilo moved its intel_winsys.h to src/gallium/drivers/ilo because Emil wouldn't let me put it in src/gallium/winsys/intel, which is exactly what this patch tries to do for radeon :) Here we (will) have two different winsys implementations (radeon, amdgpu), providing the same interface for the same radeon driver(s). I hope that my suggestion for consistency did not come as pushy. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
On 28 April 2015 at 03:30, Michel Dänzer mic...@daenzer.net wrote: On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) Well said Michel - this is exactly what I meant. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
On 28.04.2015 03:57, Marek Olšák wrote: Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. I think Emil's main point (which I agree with) is that radeon_winsys.h should live somewhere under src/gallium/drivers/, probably src/gallium/drivers/radeon/, because the winsys interface is defined by the drivers, not the winsys. All other drivers have their *_winsys.h headers there. Maybe amdgpu/sw wasn't a good example, but at some point there might be e.g. amdgpu/haiku. ;) -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
Can you elaborate on what amdgpu/sw would be good for? Frankly I don't see a point, therefore we don't need the drm subdirectory. Marek On Tue, Apr 21, 2015 at 4:40 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 20/04/15 22:23, Marek Olšák wrote: From: Marek Olšák marek.ol...@amd.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 6 +- src/gallium/drivers/r300/r300_chipset.c| 2 +- src/gallium/drivers/r300/r300_context.h| 1 - src/gallium/drivers/r300/r300_screen.h | 2 +- src/gallium/drivers/radeon/r600_pipe_common.h | 2 +- src/gallium/drivers/radeon/radeon_uvd.c| 1 - src/gallium/drivers/radeon/radeon_uvd.h| 2 +- src/gallium/drivers/radeon/radeon_vce.c| 1 - src/gallium/drivers/radeon/radeon_vce_40_2_2.c | 1 - src/gallium/drivers/radeon/radeon_video.c | 1 - src/gallium/drivers/radeon/radeon_video.h | 2 +- src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/targets/pipe-loader/pipe_r300.c| 2 +- src/gallium/targets/pipe-loader/pipe_r600.c| 2 +- src/gallium/targets/pipe-loader/pipe_radeonsi.c| 2 +- src/gallium/winsys/radeon/drm/Makefile.sources | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 2 +- src/gallium/winsys/radeon/drm/radeon_winsys.h | 604 - src/gallium/winsys/radeon/radeon_winsys.h | 604 + 19 files changed, 618 insertions(+), 623 deletions(-) delete mode 100644 src/gallium/winsys/radeon/drm/radeon_winsys.h create mode 100644 src/gallium/winsys/radeon/radeon_winsys.h Another solution would be to move it in gallium/drivers/radeon. This one might be better (and more consistent with every other driver) as the file defines the interface that the driver(s) require, while there can be many different providers for it - radeon/drm, amdgpu/drm or even amdgpu/sw :-) You might need to change two/three lines in the makefiles though :-\ -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
On 20/04/15 22:23, Marek Olšák wrote: From: Marek Olšák marek.ol...@amd.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 6 +- src/gallium/drivers/r300/r300_chipset.c| 2 +- src/gallium/drivers/r300/r300_context.h| 1 - src/gallium/drivers/r300/r300_screen.h | 2 +- src/gallium/drivers/radeon/r600_pipe_common.h | 2 +- src/gallium/drivers/radeon/radeon_uvd.c| 1 - src/gallium/drivers/radeon/radeon_uvd.h| 2 +- src/gallium/drivers/radeon/radeon_vce.c| 1 - src/gallium/drivers/radeon/radeon_vce_40_2_2.c | 1 - src/gallium/drivers/radeon/radeon_video.c | 1 - src/gallium/drivers/radeon/radeon_video.h | 2 +- src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/targets/pipe-loader/pipe_r300.c| 2 +- src/gallium/targets/pipe-loader/pipe_r600.c| 2 +- src/gallium/targets/pipe-loader/pipe_radeonsi.c| 2 +- src/gallium/winsys/radeon/drm/Makefile.sources | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 2 +- src/gallium/winsys/radeon/drm/radeon_winsys.h | 604 - src/gallium/winsys/radeon/radeon_winsys.h | 604 + 19 files changed, 618 insertions(+), 623 deletions(-) delete mode 100644 src/gallium/winsys/radeon/drm/radeon_winsys.h create mode 100644 src/gallium/winsys/radeon/radeon_winsys.h Another solution would be to move it in gallium/drivers/radeon. This one might be better (and more consistent with every other driver) as the file defines the interface that the driver(s) require, while there can be many different providers for it - radeon/drm, amdgpu/drm or even amdgpu/sw :-) You might need to change two/three lines in the makefiles though :-\ -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 01/18] winsys/radeon: move radeon_winsys.h up one directory
From: Marek Olšák marek.ol...@amd.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 6 +- src/gallium/drivers/r300/r300_chipset.c| 2 +- src/gallium/drivers/r300/r300_context.h| 1 - src/gallium/drivers/r300/r300_screen.h | 2 +- src/gallium/drivers/radeon/r600_pipe_common.h | 2 +- src/gallium/drivers/radeon/radeon_uvd.c| 1 - src/gallium/drivers/radeon/radeon_uvd.h| 2 +- src/gallium/drivers/radeon/radeon_vce.c| 1 - src/gallium/drivers/radeon/radeon_vce_40_2_2.c | 1 - src/gallium/drivers/radeon/radeon_video.c | 1 - src/gallium/drivers/radeon/radeon_video.h | 2 +- src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/targets/pipe-loader/pipe_r300.c| 2 +- src/gallium/targets/pipe-loader/pipe_r600.c| 2 +- src/gallium/targets/pipe-loader/pipe_radeonsi.c| 2 +- src/gallium/winsys/radeon/drm/Makefile.sources | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 2 +- src/gallium/winsys/radeon/drm/radeon_winsys.h | 604 - src/gallium/winsys/radeon/radeon_winsys.h | 604 + 19 files changed, 618 insertions(+), 623 deletions(-) delete mode 100644 src/gallium/winsys/radeon/drm/radeon_winsys.h create mode 100644 src/gallium/winsys/radeon/radeon_winsys.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 542ad43..d3c331d 100644 --- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h @@ -28,19 +28,19 @@ #endif #if GALLIUM_R300 -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include radeon/drm/radeon_drm_public.h #include r300/r300_public.h #endif #if GALLIUM_R600 -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include radeon/drm/radeon_drm_public.h #include r600/r600_public.h #endif #if GALLIUM_RADEONSI -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include radeon/drm/radeon_drm_public.h #include radeonsi/si_public.h #endif diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c index 7a83611..c1c7ce3 100644 --- a/src/gallium/drivers/r300/r300_chipset.c +++ b/src/gallium/drivers/r300/r300_chipset.c @@ -22,7 +22,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include r300_chipset.h -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include util/u_debug.h #include util/u_memory.h diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 4d2b153..3873c9a 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -36,7 +36,6 @@ #include r300_defines.h #include r300_screen.h #include compiler/radeon_regalloc.h -#include radeon/drm/radeon_winsys.h struct u_upload_mgr; struct r300_context; diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h index f0dd3c6..7bba39b 100644 --- a/src/gallium/drivers/r300/r300_screen.h +++ b/src/gallium/drivers/r300/r300_screen.h @@ -25,7 +25,7 @@ #define R300_SCREEN_H #include r300_chipset.h -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include pipe/p_screen.h #include util/u_slab.h #include os/os_thread.h diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 384a9a6..b7df001 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -34,7 +34,7 @@ #include stdio.h -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include util/u_blitter.h #include util/u_double_list.h diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index 9668d7d..4d4b54b 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -45,7 +45,6 @@ #include vl/vl_defines.h #include vl/vl_mpeg12_decoder.h -#include radeon/drm/radeon_winsys.h #include r600_pipe_common.h #include radeon_video.h #include radeon_uvd.h diff --git a/src/gallium/drivers/radeon/radeon_uvd.h b/src/gallium/drivers/radeon/radeon_uvd.h index 462b101..41a6fb4 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.h +++ b/src/gallium/drivers/radeon/radeon_uvd.h @@ -34,7 +34,7 @@ #ifndef RADEON_UVD_H #define RADEON_UVD_H -#include radeon/drm/radeon_winsys.h +#include radeon/radeon_winsys.h #include vl/vl_video_buffer.h /* UVD uses PM4 packet type 0 and 2 */ diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 6d34bd3..5f710e6 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -40,7 +40,6 @@
