Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92f49d9c authored by Xiang, Haihao's avatar Xiang, Haihao Committed by Chris Wilson
Browse files

drm/i915: fix HAS_BSD with a device info flag 



Signed-off-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f803aa55

drivers/gpu/drm/i915/i915_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static const struct intel_device_info intel_g33_info = { 
static const struct intel_device_info intel_g45_info = {

	.gen = 4, .is_g4x = 1, .need_gfx_hws = 1,

	.has_pipe_cxsr = 1, .has_hotplug = 1,

	.has_bsd_ring = 1,

};



static const struct intel_device_info intel_gm45_info = {
@@ -132,6 +133,7 @@ static const struct intel_device_info intel_gm45_info = { 
	.is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,

	.has_pipe_cxsr = 1, .has_hotplug = 1,

	.supports_tv = 1,

	.has_bsd_ring = 1,

};



static const struct intel_device_info intel_pineview_info = {
@@ -143,11 +145,13 @@ static const struct intel_device_info intel_pineview_info = { 
static const struct intel_device_info intel_ironlake_d_info = {

	.gen = 5, .is_ironlake = 1,

	.need_gfx_hws = 1, .has_pipe_cxsr = 1, .has_hotplug = 1,

	.has_bsd_ring = 1,

};



static const struct intel_device_info intel_ironlake_m_info = {

	.gen = 5, .is_ironlake = 1, .is_mobile = 1,

	.need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1, .has_hotplug = 1,

	.has_bsd_ring = 1,

};



static const struct intel_device_info intel_sandybridge_d_info = {

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct intel_device_info { 
	u8 has_overlay : 1;

	u8 overlay_needs_physical : 1;

	u8 supports_tv : 1;

	u8 has_bsd_ring : 1;

};



enum no_fbc_reason {
@@ -1237,7 +1238,7 @@ static inline void i915_write(struct drm_i915_private *dev_priv, u32 reg, 
#define IS_GEN5(dev)	(INTEL_INFO(dev)->gen == 5)

#define IS_GEN6(dev)	(INTEL_INFO(dev)->gen == 6)



#define HAS_BSD(dev)            (IS_IRONLAKE(dev) || IS_G4X(dev))

#define HAS_BSD(dev)            (INTEL_INFO(dev)->has_bsd_ring)

#define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)



#define HAS_OVERLAY(dev) 		(INTEL_INFO(dev)->has_overlay)