diff mbox series

[1/1] package/mesa3d: add support for dri r200 driver

Message ID 20200209153053.128369-1-james.hilliard1@gmail.com
State Changes Requested
Headers show
Series [1/1] package/mesa3d: add support for dri r200 driver | expand

Commit Message

James Hilliard Feb. 9, 2020, 3:30 p.m. UTC
Renamed r100 driver to be consistent with r200 driver.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/mesa3d/Config.in | 11 +++++++++--
 package/mesa3d/mesa3d.mk |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN Feb. 9, 2020, 4:15 p.m. UTC | #1
James, All,

On 2020-02-09 08:30 -0700, James Hilliard spake thusly:
> Renamed r100 driver to be consistent with r200 driver.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/mesa3d/Config.in | 11 +++++++++--
>  package/mesa3d/mesa3d.mk |  3 ++-
>  2 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 9965b0e972..882ae8d1d3 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -343,13 +343,20 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	help
>  	  Support for Nvidia-based GPUs.
>  
> -config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
> -	bool "DRI radeon driver"
> +config BR2_PACKAGE_MESA3D_DRI_DRIVER_R100

You forgot to handle the legacy option (in top-level Config.in.legacy).

However, I wonder how important that rename is; I believe we can keep
the existing option as-is, and just adjust the prompt to make it
explicit this is about r100.

Besides, a siple config doesn ot build:

    BR2_x86_64=y
    BR2_x86_steamroller=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_INIT_NONE=y
    BR2_SYSTEM_BIN_SH_NONE=y
    # BR2_PACKAGE_BUSYBOX is not set
    BR2_PACKAGE_MESA3D=y
    BR2_PACKAGE_MESA3D_DRI_DRIVER_R200=y

which fails with:

    meson.build:449:4: ERROR: Problem encountered: building dri drivers
    require at least one windowing system or classic osmesa

Care to have a look and respin, please?

Regards,
Yann E. MORIN.

> +	bool "DRI radeon r100 driver"
>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER
>  	select BR2_PACKAGE_LIBDRM_RADEON
>  	help
>  	  Legacy Radeon driver for R100 series GPUs.
>  
> +config BR2_PACKAGE_MESA3D_DRI_DRIVER_R200
> +	bool "DRI radeon r200 driver"
> +	select BR2_PACKAGE_MESA3D_DRI_DRIVER
> +	select BR2_PACKAGE_LIBDRM_RADEON
> +	help
> +	  Legacy Radeon driver for R200 series GPUs.
> +
>  comment "Vulkan drivers"
>  
>  config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index 7fb07ae05c..fb178e0622 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -93,7 +93,8 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965)   += i965
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau
> -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R100)   += r100
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R200)   += r200
>  # Vulkan Drivers
>  MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)   += intel
>  
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN Feb. 9, 2020, 4:21 p.m. UTC | #2
James, All,

On 2020-02-09 08:30 -0700, James Hilliard spake thusly:
> Renamed r100 driver to be consistent with r200 driver.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/mesa3d/Config.in | 11 +++++++++--
>  package/mesa3d/mesa3d.mk |  3 ++-
>  2 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 9965b0e972..882ae8d1d3 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -343,13 +343,20 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	help
>  	  Support for Nvidia-based GPUs.
>  
> -config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
> -	bool "DRI radeon driver"
> +config BR2_PACKAGE_MESA3D_DRI_DRIVER_R100
> +	bool "DRI radeon r100 driver"
>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER
>  	select BR2_PACKAGE_LIBDRM_RADEON
>  	help
>  	  Legacy Radeon driver for R100 series GPUs.
>  
> +config BR2_PACKAGE_MESA3D_DRI_DRIVER_R200
> +	bool "DRI radeon r200 driver"
> +	select BR2_PACKAGE_MESA3D_DRI_DRIVER
> +	select BR2_PACKAGE_LIBDRM_RADEON

You forgot to propagate the dependency of BR2_PACKAGE_LIBDRM_RADEON,
which depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC.

Note that r100 has the same issue, too, so maybe fix it too (as a
separate preliminary patch).

Regards,
Yann E. MORIN.

> +	help
> +	  Legacy Radeon driver for R200 series GPUs.
> +
>  comment "Vulkan drivers"
>  
>  config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index 7fb07ae05c..fb178e0622 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -93,7 +93,8 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965)   += i965
>  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau
> -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R100)   += r100
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R200)   += r200
>  # Vulkan Drivers
>  MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)   += intel
>  
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 9965b0e972..882ae8d1d3 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -343,13 +343,20 @@  config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
 	help
 	  Support for Nvidia-based GPUs.
 
-config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
-	bool "DRI radeon driver"
+config BR2_PACKAGE_MESA3D_DRI_DRIVER_R100
+	bool "DRI radeon r100 driver"
 	select BR2_PACKAGE_MESA3D_DRI_DRIVER
 	select BR2_PACKAGE_LIBDRM_RADEON
 	help
 	  Legacy Radeon driver for R100 series GPUs.
 
+config BR2_PACKAGE_MESA3D_DRI_DRIVER_R200
+	bool "DRI radeon r200 driver"
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER
+	select BR2_PACKAGE_LIBDRM_RADEON
+	help
+	  Legacy Radeon driver for R200 series GPUs.
+
 comment "Vulkan drivers"
 
 config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 7fb07ae05c..fb178e0622 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -93,7 +93,8 @@  MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965)   += i965
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau
-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R100)   += r100
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_R200)   += r200
 # Vulkan Drivers
 MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)   += intel