Re: [Mesa-dev] [PATCH 1/2] radeonsi: add support for Mullins asics.

2014-05-01 Thread Tom Stellard 
On Wed, Apr 30, 2014 at 07:30:15PM -0400, Alex Deucher wrote:
 From: Samuel Li samuel...@amd.com
 
 Signed-off-by: Samuel Li samuel...@amd.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 ---
  src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++
  src/gallium/drivers/radeonsi/si_state.c   | 2 ++
  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 +
  src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 +
  4 files changed, 6 insertions(+)
 
 diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c 
 b/src/gallium/drivers/radeon/r600_pipe_common.c
 index 957186a..600f89b 100644
 --- a/src/gallium/drivers/radeon/r600_pipe_common.c
 +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
 @@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* 
 pscreen)
   case CHIP_KAVERI: return AMD KAVERI;
   case CHIP_KABINI: return AMD KABINI;
   case CHIP_HAWAII: return AMD HAWAII;
 + case CHIP_MULLINS: return AMD MULLINS;
   default: return AMD unknown;
   }
  }
 @@ -410,6 +411,7 @@ const char *r600_get_llvm_processor_name(enum 
 radeon_family family)
   case CHIP_KABINI: return kabini;
   case CHIP_KAVERI: return kaveri;
   case CHIP_HAWAII: return hawaii;
 + case CHIP_MULLINS: return mullins;

There will only be a mullins GPU defined in LLVM 3.5 and newer, so we
need to wrap this in:

#if HAVE_LLVM = 0x0305
return mullins;
#else
return kabini;  // Or whatever already supported Sea Islands
  // chip is the closest match for mullins.
#endif

-Tom
   default: return ;
  #endif
   }
 diff --git a/src/gallium/drivers/radeonsi/si_state.c 
 b/src/gallium/drivers/radeonsi/si_state.c
 index 80f54e2..6d5408b 100644
 --- a/src/gallium/drivers/radeonsi/si_state.c
 +++ b/src/gallium/drivers/radeonsi/si_state.c
 @@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
   /* XXX todo */
   case CHIP_KABINI:
   /* XXX todo */
 + case CHIP_MULLINS:
 + /* XXX todo */
   default:
   si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 
 0x);
   si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 
 0x);
 diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c 
 b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 index 7618316..e54e79e 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 @@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys 
 *ws)
  case CHIP_KAVERI:
  case CHIP_KABINI:
  case CHIP_HAWAII:
 +case CHIP_MULLINS:
  ws-info.chip_class = CIK;
  break;
  }
 diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h 
 b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 index 1cb17bb..2d13550 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
 +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 @@ -130,6 +130,7 @@ enum radeon_family {
  CHIP_KAVERI,
  CHIP_KABINI,
  CHIP_HAWAII,
 +CHIP_MULLINS,
  CHIP_LAST,
  };
  
 -- 
 1.8.3.1
 
 ___
 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

[Mesa-dev] [PATCH 1/2] radeonsi: add support for Mullins asics.

2014-04-30 Thread Alex Deucher 
From: Samuel Li samuel...@amd.com

Signed-off-by: Samuel Li samuel...@amd.com
Signed-off-by: Alex Deucher alexander.deuc...@amd.com
---
 src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++
 src/gallium/drivers/radeonsi/si_state.c   | 2 ++
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 +
 src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c 
b/src/gallium/drivers/radeon/r600_pipe_common.c
index 957186a..600f89b 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* 
pscreen)
case CHIP_KAVERI: return AMD KAVERI;
case CHIP_KABINI: return AMD KABINI;
case CHIP_HAWAII: return AMD HAWAII;
+   case CHIP_MULLINS: return AMD MULLINS;
default: return AMD unknown;
}
 }
@@ -410,6 +411,7 @@ const char *r600_get_llvm_processor_name(enum radeon_family 
family)
case CHIP_KABINI: return kabini;
case CHIP_KAVERI: return kaveri;
case CHIP_HAWAII: return hawaii;
+   case CHIP_MULLINS: return mullins;
default: return ;
 #endif
}
diff --git a/src/gallium/drivers/radeonsi/si_state.c 
b/src/gallium/drivers/radeonsi/si_state.c
index 80f54e2..6d5408b 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
/* XXX todo */
case CHIP_KABINI:
/* XXX todo */
+   case CHIP_MULLINS:
+   /* XXX todo */
default:
si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 
0x);
si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 
0x);
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c 
b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index 7618316..e54e79e 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws)
 case CHIP_KAVERI:
 case CHIP_KABINI:
 case CHIP_HAWAII:
+case CHIP_MULLINS:
 ws-info.chip_class = CIK;
 break;
 }
diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h 
b/src/gallium/winsys/radeon/drm/radeon_winsys.h
index 1cb17bb..2d13550 100644
--- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
@@ -130,6 +130,7 @@ enum radeon_family {
 CHIP_KAVERI,
 CHIP_KABINI,
 CHIP_HAWAII,
+CHIP_MULLINS,
 CHIP_LAST,
 };
 
-- 
1.8.3.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] radeonsi: add support for Mullins asics.

2014-04-30 Thread Marek Olšák 
For the series:

Reviewed-by: Marek Olšák marek.ol...@amd.com

Marek

On Thu, May 1, 2014 at 1:30 AM, Alex Deucher alexdeuc...@gmail.com wrote:
 From: Samuel Li samuel...@amd.com

 Signed-off-by: Samuel Li samuel...@amd.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 ---
  src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++
  src/gallium/drivers/radeonsi/si_state.c   | 2 ++
  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 +
  src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 +
  4 files changed, 6 insertions(+)

 diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c 
 b/src/gallium/drivers/radeon/r600_pipe_common.c
 index 957186a..600f89b 100644
 --- a/src/gallium/drivers/radeon/r600_pipe_common.c
 +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
 @@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* 
 pscreen)
 case CHIP_KAVERI: return AMD KAVERI;
 case CHIP_KABINI: return AMD KABINI;
 case CHIP_HAWAII: return AMD HAWAII;
 +   case CHIP_MULLINS: return AMD MULLINS;
 default: return AMD unknown;
 }
  }
 @@ -410,6 +411,7 @@ const char *r600_get_llvm_processor_name(enum 
 radeon_family family)
 case CHIP_KABINI: return kabini;
 case CHIP_KAVERI: return kaveri;
 case CHIP_HAWAII: return hawaii;
 +   case CHIP_MULLINS: return mullins;
 default: return ;
  #endif
 }
 diff --git a/src/gallium/drivers/radeonsi/si_state.c 
 b/src/gallium/drivers/radeonsi/si_state.c
 index 80f54e2..6d5408b 100644
 --- a/src/gallium/drivers/radeonsi/si_state.c
 +++ b/src/gallium/drivers/radeonsi/si_state.c
 @@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
 /* XXX todo */
 case CHIP_KABINI:
 /* XXX todo */
 +   case CHIP_MULLINS:
 +   /* XXX todo */
 default:
 si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 
 0x);
 si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 
 0x);
 diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c 
 b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 index 7618316..e54e79e 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 @@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys 
 *ws)
  case CHIP_KAVERI:
  case CHIP_KABINI:
  case CHIP_HAWAII:
 +case CHIP_MULLINS:
  ws-info.chip_class = CIK;
  break;
  }
 diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h 
 b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 index 1cb17bb..2d13550 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
 +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 @@ -130,6 +130,7 @@ enum radeon_family {
  CHIP_KAVERI,
  CHIP_KABINI,
  CHIP_HAWAII,
 +CHIP_MULLINS,
  CHIP_LAST,
  };

 --
 1.8.3.1

 ___
 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 1/2] radeonsi: add support for Mullins asics.

2014-04-30 Thread Marek Olšák 
BTW, we may need to release libdrm_radeon first before we can commit this.

Marek

On Thu, May 1, 2014 at 1:30 AM, Alex Deucher alexdeuc...@gmail.com wrote:
 From: Samuel Li samuel...@amd.com

 Signed-off-by: Samuel Li samuel...@amd.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 ---
  src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++
  src/gallium/drivers/radeonsi/si_state.c   | 2 ++
  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 +
  src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 +
  4 files changed, 6 insertions(+)

 diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c 
 b/src/gallium/drivers/radeon/r600_pipe_common.c
 index 957186a..600f89b 100644
 --- a/src/gallium/drivers/radeon/r600_pipe_common.c
 +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
 @@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* 
 pscreen)
 case CHIP_KAVERI: return AMD KAVERI;
 case CHIP_KABINI: return AMD KABINI;
 case CHIP_HAWAII: return AMD HAWAII;
 +   case CHIP_MULLINS: return AMD MULLINS;
 default: return AMD unknown;
 }
  }
 @@ -410,6 +411,7 @@ const char *r600_get_llvm_processor_name(enum 
 radeon_family family)
 case CHIP_KABINI: return kabini;
 case CHIP_KAVERI: return kaveri;
 case CHIP_HAWAII: return hawaii;
 +   case CHIP_MULLINS: return mullins;
 default: return ;
  #endif
 }
 diff --git a/src/gallium/drivers/radeonsi/si_state.c 
 b/src/gallium/drivers/radeonsi/si_state.c
 index 80f54e2..6d5408b 100644
 --- a/src/gallium/drivers/radeonsi/si_state.c
 +++ b/src/gallium/drivers/radeonsi/si_state.c
 @@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
 /* XXX todo */
 case CHIP_KABINI:
 /* XXX todo */
 +   case CHIP_MULLINS:
 +   /* XXX todo */
 default:
 si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 
 0x);
 si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 
 0x);
 diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c 
 b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 index 7618316..e54e79e 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
 @@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys 
 *ws)
  case CHIP_KAVERI:
  case CHIP_KABINI:
  case CHIP_HAWAII:
 +case CHIP_MULLINS:
  ws-info.chip_class = CIK;
  break;
  }
 diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h 
 b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 index 1cb17bb..2d13550 100644
 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
 +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
 @@ -130,6 +130,7 @@ enum radeon_family {
  CHIP_KAVERI,
  CHIP_KABINI,
  CHIP_HAWAII,
 +CHIP_MULLINS,
  CHIP_LAST,
  };

 --
 1.8.3.1

 ___
 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