Commit 56b857a5 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: More assorted dev_priv cleanups

A small selection of macros which can only accept dev_priv from
now on and a resulting trickle of fixups.

v2: Keep original order. (Ville Syrjala)
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
parent 0031fb96
...@@ -2577,24 +2577,24 @@ struct drm_i915_cmd_table { ...@@ -2577,24 +2577,24 @@ struct drm_i915_cmd_table {
#define HAS_128_BYTE_Y_TILING(dev_priv) (!IS_GEN2(dev_priv) && \ #define HAS_128_BYTE_Y_TILING(dev_priv) (!IS_GEN2(dev_priv) && \
!(IS_I915G(dev_priv) || \ !(IS_I915G(dev_priv) || \
IS_I915GM(dev_priv))) IS_I915GM(dev_priv)))
#define SUPPORTS_TV(dev) (INTEL_INFO(dev)->supports_tv) #define SUPPORTS_TV(dev_priv) ((dev_priv)->info.supports_tv)
#define I915_HAS_HOTPLUG(dev) (INTEL_INFO(dev)->has_hotplug) #define I915_HAS_HOTPLUG(dev_priv) ((dev_priv)->info.has_hotplug)
#define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2) #define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2)
#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr) #define HAS_PIPE_CXSR(dev_priv) ((dev_priv)->info.has_pipe_cxsr)
#define HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc) #define HAS_FBC(dev_priv) ((dev_priv)->info.has_fbc)
#define HAS_IPS(dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv)) #define HAS_IPS(dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))
#define HAS_DP_MST(dev) (INTEL_INFO(dev)->has_dp_mst) #define HAS_DP_MST(dev_priv) ((dev_priv)->info.has_dp_mst)
#define HAS_DDI(dev_priv) ((dev_priv)->info.has_ddi) #define HAS_DDI(dev_priv) ((dev_priv)->info.has_ddi)
#define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg) #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) ((dev_priv)->info.has_fpga_dbg)
#define HAS_PSR(dev) (INTEL_INFO(dev)->has_psr) #define HAS_PSR(dev_priv) ((dev_priv)->info.has_psr)
#define HAS_RC6(dev) (INTEL_INFO(dev)->has_rc6) #define HAS_RC6(dev_priv) ((dev_priv)->info.has_rc6)
#define HAS_RC6p(dev) (INTEL_INFO(dev)->has_rc6p) #define HAS_RC6p(dev_priv) ((dev_priv)->info.has_rc6p)
#define HAS_CSR(dev) (INTEL_INFO(dev)->has_csr) #define HAS_CSR(dev_priv) ((dev_priv)->info.has_csr)
#define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm) #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
#define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc) #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
......
...@@ -573,7 +573,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, ...@@ -573,7 +573,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
pdev->subsystem_device); pdev->subsystem_device);
err_printf(m, "IOMMU enabled?: %d\n", error->iommu); err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
if (HAS_CSR(dev)) { if (HAS_CSR(dev_priv)) {
struct intel_csr *csr = &dev_priv->csr; struct intel_csr *csr = &dev_priv->csr;
err_printf(m, "DMC loaded: %s\n", err_printf(m, "DMC loaded: %s\n",
......
...@@ -3678,7 +3678,7 @@ static void i915_irq_preinstall(struct drm_device * dev) ...@@ -3678,7 +3678,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
int pipe; int pipe;
if (I915_HAS_HOTPLUG(dev)) { if (I915_HAS_HOTPLUG(dev_priv)) {
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0); i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
} }
...@@ -3712,7 +3712,7 @@ static int i915_irq_postinstall(struct drm_device *dev) ...@@ -3712,7 +3712,7 @@ static int i915_irq_postinstall(struct drm_device *dev)
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
I915_USER_INTERRUPT; I915_USER_INTERRUPT;
if (I915_HAS_HOTPLUG(dev)) { if (I915_HAS_HOTPLUG(dev_priv)) {
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0); i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
POSTING_READ(PORT_HOTPLUG_EN); POSTING_READ(PORT_HOTPLUG_EN);
...@@ -3880,7 +3880,7 @@ static void i915_irq_uninstall(struct drm_device * dev) ...@@ -3880,7 +3880,7 @@ static void i915_irq_uninstall(struct drm_device * dev)
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
int pipe; int pipe;
if (I915_HAS_HOTPLUG(dev)) { if (I915_HAS_HOTPLUG(dev_priv)) {
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0); i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
} }
......
...@@ -693,7 +693,7 @@ intel_crt_detect(struct drm_connector *connector, bool force) ...@@ -693,7 +693,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)
power_domain = intel_display_port_power_domain(intel_encoder); power_domain = intel_display_port_power_domain(intel_encoder);
intel_display_power_get(dev_priv, power_domain); intel_display_power_get(dev_priv, power_domain);
if (I915_HAS_HOTPLUG(dev)) { if (I915_HAS_HOTPLUG(dev_priv)) {
/* We can not rely on the HPD pin always being correctly wired /* We can not rely on the HPD pin always being correctly wired
* up, for example many KVM do not pass it through, and so * up, for example many KVM do not pass it through, and so
* only trust an assertion that the monitor is connected. * only trust an assertion that the monitor is connected.
...@@ -715,7 +715,7 @@ intel_crt_detect(struct drm_connector *connector, bool force) ...@@ -715,7 +715,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)
* broken monitor (without edid) to work behind a broken kvm (that fails * broken monitor (without edid) to work behind a broken kvm (that fails
* to have the right resistors for HP detection) needs to fix this up. * to have the right resistors for HP detection) needs to fix this up.
* For now just bail out. */ * For now just bail out. */
if (I915_HAS_HOTPLUG(dev) && !i915.load_detect_test) { if (I915_HAS_HOTPLUG(dev_priv) && !i915.load_detect_test) {
status = connector_status_disconnected; status = connector_status_disconnected;
goto out; goto out;
} }
...@@ -915,7 +915,7 @@ void intel_crt_init(struct drm_device *dev) ...@@ -915,7 +915,7 @@ void intel_crt_init(struct drm_device *dev)
crt->base.disable = intel_disable_crt; crt->base.disable = intel_disable_crt;
} }
crt->base.enable = intel_enable_crt; crt->base.enable = intel_enable_crt;
if (I915_HAS_HOTPLUG(dev) && if (I915_HAS_HOTPLUG(dev_priv) &&
!dmi_check_system(intel_spurious_crt_detect)) !dmi_check_system(intel_spurious_crt_detect))
crt->base.hpd_pin = HPD_CRT; crt->base.hpd_pin = HPD_CRT;
if (HAS_DDI(dev_priv)) { if (HAS_DDI(dev_priv)) {
...@@ -932,7 +932,7 @@ void intel_crt_init(struct drm_device *dev) ...@@ -932,7 +932,7 @@ void intel_crt_init(struct drm_device *dev)
drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs); drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
if (!I915_HAS_HOTPLUG(dev)) if (!I915_HAS_HOTPLUG(dev_priv))
intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT; intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;
/* /*
......
...@@ -8440,7 +8440,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) ...@@ -8440,7 +8440,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
} }
} }
if (HAS_PIPE_CXSR(dev)) { if (HAS_PIPE_CXSR(dev_priv)) {
if (intel_crtc->lowfreq_avail) { if (intel_crtc->lowfreq_avail) {
DRM_DEBUG_KMS("enabling CxSR downclocking\n"); DRM_DEBUG_KMS("enabling CxSR downclocking\n");
pipeconf |= PIPECONF_CXSR_DOWNCLOCK; pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
...@@ -15652,7 +15652,7 @@ static void intel_setup_outputs(struct drm_device *dev) ...@@ -15652,7 +15652,7 @@ static void intel_setup_outputs(struct drm_device *dev)
} else if (IS_GEN2(dev_priv)) } else if (IS_GEN2(dev_priv))
intel_dvo_init(dev); intel_dvo_init(dev);
if (SUPPORTS_TV(dev)) if (SUPPORTS_TV(dev_priv))
intel_tv_init(dev); intel_tv_init(dev);
intel_psr_init(dev); intel_psr_init(dev);
......
...@@ -5743,7 +5743,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, ...@@ -5743,7 +5743,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
} }
/* init MST on ports that can support it */ /* init MST on ports that can support it */
if (HAS_DP_MST(dev) && !is_edp(intel_dp) && if (HAS_DP_MST(dev_priv) && !is_edp(intel_dp) &&
(port == PORT_B || port == PORT_C || port == PORT_D)) (port == PORT_B || port == PORT_C || port == PORT_D))
intel_dp_mst_encoder_init(intel_dig_port, intel_dp_mst_encoder_init(intel_dig_port,
intel_connector->base.base.id); intel_connector->base.base.id);
......
...@@ -501,7 +501,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work) ...@@ -501,7 +501,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
if (intel_connector->mst_port) if (intel_connector->mst_port)
continue; continue;
if (!connector->polled && I915_HAS_HOTPLUG(dev) && if (!connector->polled && I915_HAS_HOTPLUG(dev_priv) &&
intel_connector->encoder->hpd_pin > HPD_NONE) { intel_connector->encoder->hpd_pin > HPD_NONE) {
connector->polled = enabled ? connector->polled = enabled ?
DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_CONNECT |
......
...@@ -427,7 +427,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) ...@@ -427,7 +427,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc); struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
if (!HAS_PSR(dev)) { if (!HAS_PSR(dev_priv)) {
DRM_DEBUG_KMS("PSR not supported on this platform\n"); DRM_DEBUG_KMS("PSR not supported on this platform\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment