leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: add for_each_port() and use it

Browse Source 
Add another for_each style macro to the pile of custom looping macros.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101134333.11612-1-jani.nikula@intel.com
This commit is contained in:
Jani Nikula
2019-11-01 15:43:33 +02:00
parent 7d14863525
commit c4a774c419
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/display/intel_bios.c
View File

@@ -1246,7 +1246,7 @@ static enum port get_port_by_ddc_pin(struct drm_i915_private *i915, u8 ddc_pin)
const struct ddi_vbt_port_info *info; const struct ddi_vbt_port_info *info;
enum port port; enum port port;
for (port = PORT_A; port < I915_MAX_PORTS; port++) { for_each_port(port) {
info = &i915->vbt.ddi_port_info[port]; info = &i915->vbt.ddi_port_info[port];
if (info->child && ddc_pin == info->alternate_ddc_pin) if (info->child && ddc_pin == info->alternate_ddc_pin)
@@ -1297,7 +1297,7 @@ static enum port get_port_by_aux_ch(struct drm_i915_private *i915, u8 aux_ch)
const struct ddi_vbt_port_info *info; const struct ddi_vbt_port_info *info;
enum port port; enum port port;
for (port = PORT_A; port < I915_MAX_PORTS; port++) { for_each_port(port) {
info = &i915->vbt.ddi_port_info[port]; info = &i915->vbt.ddi_port_info[port];
if (info->child && aux_ch == info->alternate_aux_channel) if (info->child && aux_ch == info->alternate_aux_channel)
@@ -1722,7 +1722,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
!HAS_PCH_SPLIT(dev_priv)); !HAS_PCH_SPLIT(dev_priv));
DRM_DEBUG_KMS("Set default to SSC at %d kHz\n", dev_priv->vbt.lvds_ssc_freq); DRM_DEBUG_KMS("Set default to SSC at %d kHz\n", dev_priv->vbt.lvds_ssc_freq);
for (port = PORT_A; port < I915_MAX_PORTS; port++) { for_each_port(port) {
struct ddi_vbt_port_info *info = struct ddi_vbt_port_info *info =
&dev_priv->vbt.ddi_port_info[port]; &dev_priv->vbt.ddi_port_info[port];
@@ -1736,7 +1736,7 @@ init_vbt_missing_defaults(struct drm_i915_private *dev_priv)
{ {
enum port port; enum port port;
for (port = PORT_A; port < I915_MAX_PORTS; port++) { for_each_port(port) {
struct ddi_vbt_port_info *info = struct ddi_vbt_port_info *info =
&dev_priv->vbt.ddi_port_info[port]; &dev_priv->vbt.ddi_port_info[port];
enum phy phy = intel_port_to_phy(dev_priv, port); enum phy phy = intel_port_to_phy(dev_priv, port);

5
drivers/gpu/drm/i915/display/intel_display.h
View File

@@ -333,8 +333,11 @@ enum phy_fia {
(__s) < RUNTIME_INFO(__dev_priv)->num_sprites[(__p)]; \ (__s) < RUNTIME_INFO(__dev_priv)->num_sprites[(__p)]; \
(__s)++) (__s)++)
#define for_each_port(__port) \
for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++)
#define for_each_port_masked(__port, __ports_mask) \ #define for_each_port_masked(__port, __ports_mask) \
for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ for_each_port(__port) \
for_each_if((__ports_mask) & BIT(__port)) for_each_if((__ports_mask) & BIT(__port))
#define for_each_phy_masked(__phy, __phys_mask) \ #define for_each_phy_masked(__phy, __phys_mask) \