drm/i915: Add feature flag for platforms with DRAM
diff mbox series

Message ID 20190925210727.38413-1-stuart.summers@intel.com
State New
Headers show
Series
  • drm/i915: Add feature flag for platforms with DRAM
Related show

Commit Message

Summers, Stuart Sept. 25, 2019, 9:07 p.m. UTC
Signed-off-by: Stuart Summers <stuart.summers@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          | 2 +-
 drivers/gpu/drm/i915/i915_drv.h          | 2 ++
 drivers/gpu/drm/i915/i915_pci.c          | 3 ++-
 drivers/gpu/drm/i915/intel_device_info.h | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

Comments

Ville Syrjälä Sept. 26, 2019, 12:36 p.m. UTC | #1
On Wed, Sep 25, 2019 at 02:07:27PM -0700, Stuart Summers wrote:

No commit message.

> Signed-off-by: Stuart Summers <stuart.summers@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c          | 2 +-
>  drivers/gpu/drm/i915/i915_drv.h          | 2 ++
>  drivers/gpu/drm/i915/i915_pci.c          | 3 ++-
>  drivers/gpu/drm/i915/intel_device_info.h | 1 +
>  4 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index a9ee73b61f4d..552ba7607e9a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1128,7 +1128,7 @@ intel_get_dram_info(struct drm_i915_private *dev_priv)
>  	 */
>  	dram_info->is_16gb_dimm = !IS_GEN9_LP(dev_priv);
>  
> -	if (INTEL_GEN(dev_priv) < 9)
> +	if (!HAS_DRAM(dev_priv))
>  		return;

As opposed to what? SRAM?

>  
>  	if (IS_GEN9_LP(dev_priv))
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index fcf7423075ef..e82ca38be59e 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2151,6 +2151,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>  
>  #define HAS_DP_MST(dev_priv)	(INTEL_INFO(dev_priv)->display.has_dp_mst)
>  
> +#define HAS_DRAM(dev_priv)	(INTEL_INFO(dev_priv)->has_dram)
> +
>  #define HAS_DDI(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_ddi)
>  #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->has_fpga_dbg)
>  #define HAS_PSR(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_psr)
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index ea53dfe2fba0..98d7e07dba6a 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -602,7 +602,8 @@ static const struct intel_device_info intel_cherryview_info = {
>  	.display.has_csr = 1, \
>  	.has_gt_uc = 1, \
>  	.display.has_ipc = 1, \
> -	.ddb_size = 896
> +	.ddb_size = 896, \
> +	.has_dram = 1
>  
>  #define SKL_PLATFORM \
>  	GEN9_FEATURES, \
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 0cdc2465534b..c9c858100ea3 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -109,6 +109,7 @@ enum intel_ppgtt_type {
>  	func(require_force_probe); \
>  	/* Keep has_* in alphabetical order */ \
>  	func(has_64bit_reloc); \
> +	func(has_dram); \
>  	func(gpu_reset_clobbers_display); \
>  	func(has_reset_engine); \
>  	func(has_fpga_dbg); \
> -- 
> 2.22.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Summers, Stuart Sept. 26, 2019, 2:58 p.m. UTC | #2
On Thu, 2019-09-26 at 15:36 +0300, Ville Syrjälä wrote:
> On Wed, Sep 25, 2019 at 02:07:27PM -0700, Stuart Summers wrote:
> 
> No commit message.

I'll add one here, should have caught this before posting, sorry.

> 
> > Signed-off-by: Stuart Summers <stuart.summers@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c          | 2 +-
> >  drivers/gpu/drm/i915/i915_drv.h          | 2 ++
> >  drivers/gpu/drm/i915/i915_pci.c          | 3 ++-
> >  drivers/gpu/drm/i915/intel_device_info.h | 1 +
> >  4 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c
> > index a9ee73b61f4d..552ba7607e9a 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -1128,7 +1128,7 @@ intel_get_dram_info(struct drm_i915_private
> > *dev_priv)
> >  	 */
> >  	dram_info->is_16gb_dimm = !IS_GEN9_LP(dev_priv);
> >  
> > -	if (INTEL_GEN(dev_priv) < 9)
> > +	if (!HAS_DRAM(dev_priv))
> >  		return;
> 
> As opposed to what? SRAM?

Hm.. perhaps this could be named better? I was hoping we could more
clearly identify platforms which don't have these dram structures
available through MMIO. Do you have another suggestion?

Thanks,
Stuart

> 
> >  
> >  	if (IS_GEN9_LP(dev_priv))
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h
> > b/drivers/gpu/drm/i915/i915_drv.h
> > index fcf7423075ef..e82ca38be59e 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2151,6 +2151,8 @@ IS_SUBPLATFORM(const struct drm_i915_private
> > *i915,
> >  
> >  #define HAS_DP_MST(dev_priv)	(INTEL_INFO(dev_priv)-
> > >display.has_dp_mst)
> >  
> > +#define HAS_DRAM(dev_priv)	(INTEL_INFO(dev_priv)->has_dram)
> > +
> >  #define HAS_DDI(dev_priv)		 (INTEL_INFO(dev_priv)-
> > >display.has_ddi)
> >  #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)-
> > >has_fpga_dbg)
> >  #define HAS_PSR(dev_priv)		 (INTEL_INFO(dev_priv)-
> > >display.has_psr)
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c
> > b/drivers/gpu/drm/i915/i915_pci.c
> > index ea53dfe2fba0..98d7e07dba6a 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -602,7 +602,8 @@ static const struct intel_device_info
> > intel_cherryview_info = {
> >  	.display.has_csr = 1, \
> >  	.has_gt_uc = 1, \
> >  	.display.has_ipc = 1, \
> > -	.ddb_size = 896
> > +	.ddb_size = 896, \
> > +	.has_dram = 1
> >  
> >  #define SKL_PLATFORM \
> >  	GEN9_FEATURES, \
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.h
> > b/drivers/gpu/drm/i915/intel_device_info.h
> > index 0cdc2465534b..c9c858100ea3 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.h
> > +++ b/drivers/gpu/drm/i915/intel_device_info.h
> > @@ -109,6 +109,7 @@ enum intel_ppgtt_type {
> >  	func(require_force_probe); \
> >  	/* Keep has_* in alphabetical order */ \
> >  	func(has_64bit_reloc); \
> > +	func(has_dram); \
> >  	func(gpu_reset_clobbers_display); \
> >  	func(has_reset_engine); \
> >  	func(has_fpga_dbg); \
> > -- 
> > 2.22.0
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a9ee73b61f4d..552ba7607e9a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1128,7 +1128,7 @@  intel_get_dram_info(struct drm_i915_private *dev_priv)
 	 */
 	dram_info->is_16gb_dimm = !IS_GEN9_LP(dev_priv);
 
-	if (INTEL_GEN(dev_priv) < 9)
+	if (!HAS_DRAM(dev_priv))
 		return;
 
 	if (IS_GEN9_LP(dev_priv))
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fcf7423075ef..e82ca38be59e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2151,6 +2151,8 @@  IS_SUBPLATFORM(const struct drm_i915_private *i915,
 
 #define HAS_DP_MST(dev_priv)	(INTEL_INFO(dev_priv)->display.has_dp_mst)
 
+#define HAS_DRAM(dev_priv)	(INTEL_INFO(dev_priv)->has_dram)
+
 #define HAS_DDI(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_ddi)
 #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->has_fpga_dbg)
 #define HAS_PSR(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_psr)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index ea53dfe2fba0..98d7e07dba6a 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -602,7 +602,8 @@  static const struct intel_device_info intel_cherryview_info = {
 	.display.has_csr = 1, \
 	.has_gt_uc = 1, \
 	.display.has_ipc = 1, \
-	.ddb_size = 896
+	.ddb_size = 896, \
+	.has_dram = 1
 
 #define SKL_PLATFORM \
 	GEN9_FEATURES, \
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 0cdc2465534b..c9c858100ea3 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -109,6 +109,7 @@  enum intel_ppgtt_type {
 	func(require_force_probe); \
 	/* Keep has_* in alphabetical order */ \
 	func(has_64bit_reloc); \
+	func(has_dram); \
 	func(gpu_reset_clobbers_display); \
 	func(has_reset_engine); \
 	func(has_fpga_dbg); \