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

Commit e3c4e5dd authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: caps.has_rc6 is no longer used, remove it. 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 3c8cdf9b

drivers/gpu/drm/i915/i915_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	B(is_broadwater);

	B(is_crestline);

	B(has_fbc);

	B(has_rc6);

	B(has_pipe_cxsr);

	B(has_hotplug);

	B(cursor_needs_physical);

drivers/gpu/drm/i915/i915_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static const struct intel_device_info intel_i965g_info = { 


static const struct intel_device_info intel_i965gm_info = {

	.gen = 4, .is_crestline = 1,

	.is_mobile = 1, .has_fbc = 1, .has_rc6 = 1, .has_hotplug = 1,

	.is_mobile = 1, .has_fbc = 1, .has_hotplug = 1,

	.has_overlay = 1,

	.supports_tv = 1,

};
@@ -130,7 +130,7 @@ static const struct intel_device_info intel_g45_info = { 


static const struct intel_device_info intel_gm45_info = {

	.gen = 4, .is_g4x = 1,

	.is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,

	.is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1,

	.has_pipe_cxsr = 1, .has_hotplug = 1,

	.supports_tv = 1,

	.has_bsd_ring = 1,
@@ -150,7 +150,7 @@ static const struct intel_device_info intel_ironlake_d_info = { 


static const struct intel_device_info intel_ironlake_m_info = {

	.gen = 5, .is_mobile = 1,

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

	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_fbc = 0, /* disabled due to buggy hardware */

	.has_bsd_ring = 1,

};

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ struct intel_device_info { 
	u8 is_broadwater : 1;

	u8 is_crestline : 1;

	u8 has_fbc : 1;

	u8 has_rc6 : 1;

	u8 has_pipe_cxsr : 1;

	u8 has_hotplug : 1;

	u8 cursor_needs_physical : 1;
@@ -930,7 +929,6 @@ enum intel_chip_family { 
#define HAS_FW_BLC(dev) (INTEL_INFO(dev)->gen > 2)

#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr)

#define I915_HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc)

#define I915_HAS_RC6(dev) (INTEL_INFO(dev)->has_rc6)



#define HAS_PCH_SPLIT(dev) (IS_GEN5(dev) || IS_GEN6(dev))

#define HAS_PIPE_CONTROL(dev) (IS_GEN5(dev) || IS_GEN6(dev))