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

Commit 09da55dc authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Inline SUPPORTS_DIGITAL_OUTPUTS 



After the register save/restore code is gone there's just one user
left and it just obfuscates that one. Remove it.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6adfb1ef

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -2518,7 +2518,6 @@ struct drm_i915_cmd_table { 
 */

#define HAS_128_BYTE_Y_TILING(dev) (!IS_GEN2(dev) && !(IS_I915G(dev) || \

						      IS_I915GM(dev)))

#define SUPPORTS_DIGITAL_OUTPUTS(dev)	(!IS_GEN2(dev) && !IS_PINEVIEW(dev))

#define SUPPORTS_TV(dev)		(INTEL_INFO(dev)->supports_tv)

#define I915_HAS_HOTPLUG(dev)		 (INTEL_INFO(dev)->has_hotplug)

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -14306,7 +14306,7 @@ static void intel_setup_outputs(struct drm_device *dev) 
		}



		intel_dsi_init(dev);

	} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {

	} else if (!IS_GEN2(dev) && !IS_PINEVIEW(dev)) {

		bool found = false;



		if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {