aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c172
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c28
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c54
-rw-r--r--drivers/gpu/drm/i915/i915_gem_context.c10
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c4
-rw-r--r--drivers/gpu/drm/i915/i915_gem_fence.c24
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c20
-rw-r--r--drivers/gpu/drm/i915/i915_gem_stolen.c6
-rw-r--r--drivers/gpu/drm/i915/i915_gem_tiling.c4
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c6
-rw-r--r--drivers/gpu/drm/i915/i915_guc_submission.c4
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c92
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c8
-rw-r--r--drivers/gpu/drm/i915/i915_sysfs.c22
-rw-r--r--drivers/gpu/drm/i915/intel_audio.c18
-rw-r--r--drivers/gpu/drm/i915/intel_color.c18
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c24
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c36
-rw-r--r--drivers/gpu/drm/i915/intel_display.c286
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c107
-rw-r--r--drivers/gpu/drm/i915/intel_dp_mst.c6
-rw-r--r--drivers/gpu/drm/i915/intel_dpio_phy.c10
-rw-r--r--drivers/gpu/drm/i915/intel_dpll_mgr.c12
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h4
-rw-r--r--drivers/gpu/drm/i915/intel_dsi.c36
-rw-r--r--drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c2
-rw-r--r--drivers/gpu/drm/i915/intel_dsi_panel_vbt.c6
-rw-r--r--drivers/gpu/drm/i915/intel_dsi_pll.c12
-rw-r--r--drivers/gpu/drm/i915/intel_dvo.c18
-rw-r--r--drivers/gpu/drm/i915/intel_fbc.c24
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c10
-rw-r--r--drivers/gpu/drm/i915/intel_fifo_underrun.c18
-rw-r--r--drivers/gpu/drm/i915/intel_guc_loader.c6
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c48
-rw-r--r--drivers/gpu/drm/i915/intel_i2c.c6
-rw-r--r--drivers/gpu/drm/i915/intel_lrc.c4
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c16
-rw-r--r--drivers/gpu/drm/i915/intel_modes.c4
-rw-r--r--drivers/gpu/drm/i915/intel_overlay.c4
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c6
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c110
-rw-r--r--drivers/gpu/drm/i915/intel_psr.c36
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c10
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c22
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c18
-rw-r--r--drivers/gpu/drm/i915/intel_tv.c12
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c2
47 files changed, 702 insertions, 703 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 3464c23f2fc6..8cc453731567 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -265,7 +265,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
265{ 265{
266 struct drm_info_node *node = m->private; 266 struct drm_info_node *node = m->private;
267 struct drm_device *dev = node->minor->dev; 267 struct drm_device *dev = node->minor->dev;
268 struct drm_i915_private *dev_priv = dev->dev_private; 268 struct drm_i915_private *dev_priv = to_i915(dev);
269 struct drm_i915_gem_object *obj; 269 struct drm_i915_gem_object *obj;
270 u64 total_obj_size, total_gtt_size; 270 u64 total_obj_size, total_gtt_size;
271 LIST_HEAD(stolen); 271 LIST_HEAD(stolen);
@@ -591,7 +591,7 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)
591 struct drm_info_node *node = m->private; 591 struct drm_info_node *node = m->private;
592 struct drm_device *dev = node->minor->dev; 592 struct drm_device *dev = node->minor->dev;
593 uintptr_t list = (uintptr_t) node->info_ent->data; 593 uintptr_t list = (uintptr_t) node->info_ent->data;
594 struct drm_i915_private *dev_priv = dev->dev_private; 594 struct drm_i915_private *dev_priv = to_i915(dev);
595 struct drm_i915_gem_object *obj; 595 struct drm_i915_gem_object *obj;
596 u64 total_obj_size, total_gtt_size; 596 u64 total_obj_size, total_gtt_size;
597 int count, ret; 597 int count, ret;
@@ -625,7 +625,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
625{ 625{
626 struct drm_info_node *node = m->private; 626 struct drm_info_node *node = m->private;
627 struct drm_device *dev = node->minor->dev; 627 struct drm_device *dev = node->minor->dev;
628 struct drm_i915_private *dev_priv = dev->dev_private; 628 struct drm_i915_private *dev_priv = to_i915(dev);
629 struct intel_crtc *crtc; 629 struct intel_crtc *crtc;
630 int ret; 630 int ret;
631 631
@@ -695,7 +695,7 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)
695{ 695{
696 struct drm_info_node *node = m->private; 696 struct drm_info_node *node = m->private;
697 struct drm_device *dev = node->minor->dev; 697 struct drm_device *dev = node->minor->dev;
698 struct drm_i915_private *dev_priv = dev->dev_private; 698 struct drm_i915_private *dev_priv = to_i915(dev);
699 struct drm_i915_gem_object *obj; 699 struct drm_i915_gem_object *obj;
700 struct intel_engine_cs *engine; 700 struct intel_engine_cs *engine;
701 int total = 0; 701 int total = 0;
@@ -740,7 +740,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
740{ 740{
741 struct drm_info_node *node = m->private; 741 struct drm_info_node *node = m->private;
742 struct drm_device *dev = node->minor->dev; 742 struct drm_device *dev = node->minor->dev;
743 struct drm_i915_private *dev_priv = dev->dev_private; 743 struct drm_i915_private *dev_priv = to_i915(dev);
744 struct intel_engine_cs *engine; 744 struct intel_engine_cs *engine;
745 struct drm_i915_gem_request *req; 745 struct drm_i915_gem_request *req;
746 int ret, any; 746 int ret, any;
@@ -810,7 +810,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)
810{ 810{
811 struct drm_info_node *node = m->private; 811 struct drm_info_node *node = m->private;
812 struct drm_device *dev = node->minor->dev; 812 struct drm_device *dev = node->minor->dev;
813 struct drm_i915_private *dev_priv = dev->dev_private; 813 struct drm_i915_private *dev_priv = to_i915(dev);
814 struct intel_engine_cs *engine; 814 struct intel_engine_cs *engine;
815 int ret; 815 int ret;
816 816
@@ -833,7 +833,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
833{ 833{
834 struct drm_info_node *node = m->private; 834 struct drm_info_node *node = m->private;
835 struct drm_device *dev = node->minor->dev; 835 struct drm_device *dev = node->minor->dev;
836 struct drm_i915_private *dev_priv = dev->dev_private; 836 struct drm_i915_private *dev_priv = to_i915(dev);
837 struct intel_engine_cs *engine; 837 struct intel_engine_cs *engine;
838 int ret, i, pipe; 838 int ret, i, pipe;
839 839
@@ -1024,7 +1024,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
1024{ 1024{
1025 struct drm_info_node *node = m->private; 1025 struct drm_info_node *node = m->private;
1026 struct drm_device *dev = node->minor->dev; 1026 struct drm_device *dev = node->minor->dev;
1027 struct drm_i915_private *dev_priv = dev->dev_private; 1027 struct drm_i915_private *dev_priv = to_i915(dev);
1028 int i, ret; 1028 int i, ret;
1029 1029
1030 ret = mutex_lock_interruptible(&dev->struct_mutex); 1030 ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1052,7 +1052,7 @@ static int i915_hws_info(struct seq_file *m, void *data)
1052{ 1052{
1053 struct drm_info_node *node = m->private; 1053 struct drm_info_node *node = m->private;
1054 struct drm_device *dev = node->minor->dev; 1054 struct drm_device *dev = node->minor->dev;
1055 struct drm_i915_private *dev_priv = dev->dev_private; 1055 struct drm_i915_private *dev_priv = to_i915(dev);
1056 struct intel_engine_cs *engine; 1056 struct intel_engine_cs *engine;
1057 const u32 *hws; 1057 const u32 *hws;
1058 int i; 1058 int i;
@@ -1163,7 +1163,7 @@ static int
1163i915_next_seqno_get(void *data, u64 *val) 1163i915_next_seqno_get(void *data, u64 *val)
1164{ 1164{
1165 struct drm_device *dev = data; 1165 struct drm_device *dev = data;
1166 struct drm_i915_private *dev_priv = dev->dev_private; 1166 struct drm_i915_private *dev_priv = to_i915(dev);
1167 int ret; 1167 int ret;
1168 1168
1169 ret = mutex_lock_interruptible(&dev->struct_mutex); 1169 ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1200,7 +1200,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
1200{ 1200{
1201 struct drm_info_node *node = m->private; 1201 struct drm_info_node *node = m->private;
1202 struct drm_device *dev = node->minor->dev; 1202 struct drm_device *dev = node->minor->dev;
1203 struct drm_i915_private *dev_priv = dev->dev_private; 1203 struct drm_i915_private *dev_priv = to_i915(dev);
1204 int ret = 0; 1204 int ret = 0;
1205 1205
1206 intel_runtime_pm_get(dev_priv); 1206 intel_runtime_pm_get(dev_priv);
@@ -1403,7 +1403,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
1403{ 1403{
1404 struct drm_info_node *node = m->private; 1404 struct drm_info_node *node = m->private;
1405 struct drm_device *dev = node->minor->dev; 1405 struct drm_device *dev = node->minor->dev;
1406 struct drm_i915_private *dev_priv = dev->dev_private; 1406 struct drm_i915_private *dev_priv = to_i915(dev);
1407 struct intel_engine_cs *engine; 1407 struct intel_engine_cs *engine;
1408 u64 acthd[I915_NUM_ENGINES]; 1408 u64 acthd[I915_NUM_ENGINES];
1409 u32 seqno[I915_NUM_ENGINES]; 1409 u32 seqno[I915_NUM_ENGINES];
@@ -1474,7 +1474,7 @@ static int ironlake_drpc_info(struct seq_file *m)
1474{ 1474{
1475 struct drm_info_node *node = m->private; 1475 struct drm_info_node *node = m->private;
1476 struct drm_device *dev = node->minor->dev; 1476 struct drm_device *dev = node->minor->dev;
1477 struct drm_i915_private *dev_priv = dev->dev_private; 1477 struct drm_i915_private *dev_priv = to_i915(dev);
1478 u32 rgvmodectl, rstdbyctl; 1478 u32 rgvmodectl, rstdbyctl;
1479 u16 crstandvid; 1479 u16 crstandvid;
1480 int ret; 1480 int ret;
@@ -1542,7 +1542,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)
1542{ 1542{
1543 struct drm_info_node *node = m->private; 1543 struct drm_info_node *node = m->private;
1544 struct drm_device *dev = node->minor->dev; 1544 struct drm_device *dev = node->minor->dev;
1545 struct drm_i915_private *dev_priv = dev->dev_private; 1545 struct drm_i915_private *dev_priv = to_i915(dev);
1546 struct intel_uncore_forcewake_domain *fw_domain; 1546 struct intel_uncore_forcewake_domain *fw_domain;
1547 1547
1548 spin_lock_irq(&dev_priv->uncore.lock); 1548 spin_lock_irq(&dev_priv->uncore.lock);
@@ -1560,7 +1560,7 @@ static int vlv_drpc_info(struct seq_file *m)
1560{ 1560{
1561 struct drm_info_node *node = m->private; 1561 struct drm_info_node *node = m->private;
1562 struct drm_device *dev = node->minor->dev; 1562 struct drm_device *dev = node->minor->dev;
1563 struct drm_i915_private *dev_priv = dev->dev_private; 1563 struct drm_i915_private *dev_priv = to_i915(dev);
1564 u32 rpmodectl1, rcctl1, pw_status; 1564 u32 rpmodectl1, rcctl1, pw_status;
1565 1565
1566 intel_runtime_pm_get(dev_priv); 1566 intel_runtime_pm_get(dev_priv);
@@ -1600,7 +1600,7 @@ static int gen6_drpc_info(struct seq_file *m)
1600{ 1600{
1601 struct drm_info_node *node = m->private; 1601 struct drm_info_node *node = m->private;
1602 struct drm_device *dev = node->minor->dev; 1602 struct drm_device *dev = node->minor->dev;
1603 struct drm_i915_private *dev_priv = dev->dev_private; 1603 struct drm_i915_private *dev_priv = to_i915(dev);
1604 u32 rpmodectl1, gt_core_status, rcctl1, rc6vids = 0; 1604 u32 rpmodectl1, gt_core_status, rcctl1, rc6vids = 0;
1605 unsigned forcewake_count; 1605 unsigned forcewake_count;
1606 int count = 0, ret; 1606 int count = 0, ret;
@@ -1712,7 +1712,7 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)
1712{ 1712{
1713 struct drm_info_node *node = m->private; 1713 struct drm_info_node *node = m->private;
1714 struct drm_device *dev = node->minor->dev; 1714 struct drm_device *dev = node->minor->dev;
1715 struct drm_i915_private *dev_priv = dev->dev_private; 1715 struct drm_i915_private *dev_priv = to_i915(dev);
1716 1716
1717 seq_printf(m, "FB tracking busy bits: 0x%08x\n", 1717 seq_printf(m, "FB tracking busy bits: 0x%08x\n",
1718 dev_priv->fb_tracking.busy_bits); 1718 dev_priv->fb_tracking.busy_bits);
@@ -1727,7 +1727,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
1727{ 1727{
1728 struct drm_info_node *node = m->private; 1728 struct drm_info_node *node = m->private;
1729 struct drm_device *dev = node->minor->dev; 1729 struct drm_device *dev = node->minor->dev;
1730 struct drm_i915_private *dev_priv = dev->dev_private; 1730 struct drm_i915_private *dev_priv = to_i915(dev);
1731 1731
1732 if (!HAS_FBC(dev)) { 1732 if (!HAS_FBC(dev)) {
1733 seq_puts(m, "FBC unsupported on this chipset\n"); 1733 seq_puts(m, "FBC unsupported on this chipset\n");
@@ -1757,7 +1757,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
1757static int i915_fbc_fc_get(void *data, u64 *val) 1757static int i915_fbc_fc_get(void *data, u64 *val)
1758{ 1758{
1759 struct drm_device *dev = data; 1759 struct drm_device *dev = data;
1760 struct drm_i915_private *dev_priv = dev->dev_private; 1760 struct drm_i915_private *dev_priv = to_i915(dev);
1761 1761
1762 if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev)) 1762 if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev))
1763 return -ENODEV; 1763 return -ENODEV;
@@ -1770,7 +1770,7 @@ static int i915_fbc_fc_get(void *data, u64 *val)
1770static int i915_fbc_fc_set(void *data, u64 val) 1770static int i915_fbc_fc_set(void *data, u64 val)
1771{ 1771{
1772 struct drm_device *dev = data; 1772 struct drm_device *dev = data;
1773 struct drm_i915_private *dev_priv = dev->dev_private; 1773 struct drm_i915_private *dev_priv = to_i915(dev);
1774 u32 reg; 1774 u32 reg;
1775 1775
1776 if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev)) 1776 if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev))
@@ -1797,7 +1797,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)
1797{ 1797{
1798 struct drm_info_node *node = m->private; 1798 struct drm_info_node *node = m->private;
1799 struct drm_device *dev = node->minor->dev; 1799 struct drm_device *dev = node->minor->dev;
1800 struct drm_i915_private *dev_priv = dev->dev_private; 1800 struct drm_i915_private *dev_priv = to_i915(dev);
1801 1801
1802 if (!HAS_IPS(dev)) { 1802 if (!HAS_IPS(dev)) {
1803 seq_puts(m, "not supported\n"); 1803 seq_puts(m, "not supported\n");
@@ -1827,7 +1827,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
1827{ 1827{
1828 struct drm_info_node *node = m->private; 1828 struct drm_info_node *node = m->private;
1829 struct drm_device *dev = node->minor->dev; 1829 struct drm_device *dev = node->minor->dev;
1830 struct drm_i915_private *dev_priv = dev->dev_private; 1830 struct drm_i915_private *dev_priv = to_i915(dev);
1831 bool sr_enabled = false; 1831 bool sr_enabled = false;
1832 1832
1833 intel_runtime_pm_get(dev_priv); 1833 intel_runtime_pm_get(dev_priv);
@@ -1856,7 +1856,7 @@ static int i915_emon_status(struct seq_file *m, void *unused)
1856{ 1856{
1857 struct drm_info_node *node = m->private; 1857 struct drm_info_node *node = m->private;
1858 struct drm_device *dev = node->minor->dev; 1858 struct drm_device *dev = node->minor->dev;
1859 struct drm_i915_private *dev_priv = dev->dev_private; 1859 struct drm_i915_private *dev_priv = to_i915(dev);
1860 unsigned long temp, chipset, gfx; 1860 unsigned long temp, chipset, gfx;
1861 int ret; 1861 int ret;
1862 1862
@@ -1884,7 +1884,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)
1884{ 1884{
1885 struct drm_info_node *node = m->private; 1885 struct drm_info_node *node = m->private;
1886 struct drm_device *dev = node->minor->dev; 1886 struct drm_device *dev = node->minor->dev;
1887 struct drm_i915_private *dev_priv = dev->dev_private; 1887 struct drm_i915_private *dev_priv = to_i915(dev);
1888 int ret = 0; 1888 int ret = 0;
1889 int gpu_freq, ia_freq; 1889 int gpu_freq, ia_freq;
1890 unsigned int max_gpu_freq, min_gpu_freq; 1890 unsigned int max_gpu_freq, min_gpu_freq;
@@ -1939,7 +1939,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
1939{ 1939{
1940 struct drm_info_node *node = m->private; 1940 struct drm_info_node *node = m->private;
1941 struct drm_device *dev = node->minor->dev; 1941 struct drm_device *dev = node->minor->dev;
1942 struct drm_i915_private *dev_priv = dev->dev_private; 1942 struct drm_i915_private *dev_priv = to_i915(dev);
1943 struct intel_opregion *opregion = &dev_priv->opregion; 1943 struct intel_opregion *opregion = &dev_priv->opregion;
1944 int ret; 1944 int ret;
1945 1945
@@ -1960,7 +1960,7 @@ static int i915_vbt(struct seq_file *m, void *unused)
1960{ 1960{
1961 struct drm_info_node *node = m->private; 1961 struct drm_info_node *node = m->private;
1962 struct drm_device *dev = node->minor->dev; 1962 struct drm_device *dev = node->minor->dev;
1963 struct drm_i915_private *dev_priv = dev->dev_private; 1963 struct drm_i915_private *dev_priv = to_i915(dev);
1964 struct intel_opregion *opregion = &dev_priv->opregion; 1964 struct intel_opregion *opregion = &dev_priv->opregion;
1965 1965
1966 if (opregion->vbt) 1966 if (opregion->vbt)
@@ -2031,7 +2031,7 @@ static int i915_context_status(struct seq_file *m, void *unused)
2031{ 2031{
2032 struct drm_info_node *node = m->private; 2032 struct drm_info_node *node = m->private;
2033 struct drm_device *dev = node->minor->dev; 2033 struct drm_device *dev = node->minor->dev;
2034 struct drm_i915_private *dev_priv = dev->dev_private; 2034 struct drm_i915_private *dev_priv = to_i915(dev);
2035 struct intel_engine_cs *engine; 2035 struct intel_engine_cs *engine;
2036 struct i915_gem_context *ctx; 2036 struct i915_gem_context *ctx;
2037 int ret; 2037 int ret;
@@ -2128,7 +2128,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)
2128{ 2128{
2129 struct drm_info_node *node = (struct drm_info_node *) m->private; 2129 struct drm_info_node *node = (struct drm_info_node *) m->private;
2130 struct drm_device *dev = node->minor->dev; 2130 struct drm_device *dev = node->minor->dev;
2131 struct drm_i915_private *dev_priv = dev->dev_private; 2131 struct drm_i915_private *dev_priv = to_i915(dev);
2132 struct intel_engine_cs *engine; 2132 struct intel_engine_cs *engine;
2133 struct i915_gem_context *ctx; 2133 struct i915_gem_context *ctx;
2134 int ret; 2134 int ret;
@@ -2155,7 +2155,7 @@ static int i915_execlists(struct seq_file *m, void *data)
2155{ 2155{
2156 struct drm_info_node *node = (struct drm_info_node *)m->private; 2156 struct drm_info_node *node = (struct drm_info_node *)m->private;
2157 struct drm_device *dev = node->minor->dev; 2157 struct drm_device *dev = node->minor->dev;
2158 struct drm_i915_private *dev_priv = dev->dev_private; 2158 struct drm_i915_private *dev_priv = to_i915(dev);
2159 struct intel_engine_cs *engine; 2159 struct intel_engine_cs *engine;
2160 u32 status_pointer; 2160 u32 status_pointer;
2161 u8 read_pointer; 2161 u8 read_pointer;
@@ -2258,7 +2258,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
2258{ 2258{
2259 struct drm_info_node *node = m->private; 2259 struct drm_info_node *node = m->private;
2260 struct drm_device *dev = node->minor->dev; 2260 struct drm_device *dev = node->minor->dev;
2261 struct drm_i915_private *dev_priv = dev->dev_private; 2261 struct drm_i915_private *dev_priv = to_i915(dev);
2262 int ret; 2262 int ret;
2263 2263
2264 ret = mutex_lock_interruptible(&dev->struct_mutex); 2264 ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -2331,7 +2331,7 @@ static int per_file_ctx(int id, void *ptr, void *data)
2331 2331
2332static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev) 2332static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
2333{ 2333{
2334 struct drm_i915_private *dev_priv = dev->dev_private; 2334 struct drm_i915_private *dev_priv = to_i915(dev);
2335 struct intel_engine_cs *engine; 2335 struct intel_engine_cs *engine;
2336 struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt; 2336 struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
2337 int i; 2337 int i;
@@ -2352,7 +2352,7 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
2352 2352
2353static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev) 2353static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
2354{ 2354{
2355 struct drm_i915_private *dev_priv = dev->dev_private; 2355 struct drm_i915_private *dev_priv = to_i915(dev);
2356 struct intel_engine_cs *engine; 2356 struct intel_engine_cs *engine;
2357 2357
2358 if (IS_GEN6(dev_priv)) 2358 if (IS_GEN6(dev_priv))
@@ -2386,7 +2386,7 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
2386{ 2386{
2387 struct drm_info_node *node = m->private; 2387 struct drm_info_node *node = m->private;
2388 struct drm_device *dev = node->minor->dev; 2388 struct drm_device *dev = node->minor->dev;
2389 struct drm_i915_private *dev_priv = dev->dev_private; 2389 struct drm_i915_private *dev_priv = to_i915(dev);
2390 struct drm_file *file; 2390 struct drm_file *file;
2391 2391
2392 int ret = mutex_lock_interruptible(&dev->struct_mutex); 2392 int ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -2438,7 +2438,7 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
2438{ 2438{
2439 struct drm_info_node *node = m->private; 2439 struct drm_info_node *node = m->private;
2440 struct drm_device *dev = node->minor->dev; 2440 struct drm_device *dev = node->minor->dev;
2441 struct drm_i915_private *dev_priv = dev->dev_private; 2441 struct drm_i915_private *dev_priv = to_i915(dev);
2442 struct drm_file *file; 2442 struct drm_file *file;
2443 2443
2444 seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled); 2444 seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled);
@@ -2484,7 +2484,7 @@ static int i915_llc(struct seq_file *m, void *data)
2484{ 2484{
2485 struct drm_info_node *node = m->private; 2485 struct drm_info_node *node = m->private;
2486 struct drm_device *dev = node->minor->dev; 2486 struct drm_device *dev = node->minor->dev;
2487 struct drm_i915_private *dev_priv = dev->dev_private; 2487 struct drm_i915_private *dev_priv = to_i915(dev);
2488 const bool edram = INTEL_GEN(dev_priv) > 8; 2488 const bool edram = INTEL_GEN(dev_priv) > 8;
2489 2489
2490 seq_printf(m, "LLC: %s\n", yesno(HAS_LLC(dev))); 2490 seq_printf(m, "LLC: %s\n", yesno(HAS_LLC(dev)));
@@ -2497,7 +2497,7 @@ static int i915_llc(struct seq_file *m, void *data)
2497static int i915_guc_load_status_info(struct seq_file *m, void *data) 2497static int i915_guc_load_status_info(struct seq_file *m, void *data)
2498{ 2498{
2499 struct drm_info_node *node = m->private; 2499 struct drm_info_node *node = m->private;
2500 struct drm_i915_private *dev_priv = node->minor->dev->dev_private; 2500 struct drm_i915_private *dev_priv = to_i915(node->minor->dev);
2501 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; 2501 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
2502 u32 tmp, i; 2502 u32 tmp, i;
2503 2503
@@ -2570,7 +2570,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
2570{ 2570{
2571 struct drm_info_node *node = m->private; 2571 struct drm_info_node *node = m->private;
2572 struct drm_device *dev = node->minor->dev; 2572 struct drm_device *dev = node->minor->dev;
2573 struct drm_i915_private *dev_priv = dev->dev_private; 2573 struct drm_i915_private *dev_priv = to_i915(dev);
2574 struct intel_guc guc; 2574 struct intel_guc guc;
2575 struct i915_guc_client client = {}; 2575 struct i915_guc_client client = {};
2576 struct intel_engine_cs *engine; 2576 struct intel_engine_cs *engine;
@@ -2620,7 +2620,7 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
2620{ 2620{
2621 struct drm_info_node *node = m->private; 2621 struct drm_info_node *node = m->private;
2622 struct drm_device *dev = node->minor->dev; 2622 struct drm_device *dev = node->minor->dev;
2623 struct drm_i915_private *dev_priv = dev->dev_private; 2623 struct drm_i915_private *dev_priv = to_i915(dev);
2624 struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj; 2624 struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;
2625 u32 *log; 2625 u32 *log;
2626 int i = 0, pg; 2626 int i = 0, pg;
@@ -2648,7 +2648,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
2648{ 2648{
2649 struct drm_info_node *node = m->private; 2649 struct drm_info_node *node = m->private;
2650 struct drm_device *dev = node->minor->dev; 2650 struct drm_device *dev = node->minor->dev;
2651 struct drm_i915_private *dev_priv = dev->dev_private; 2651 struct drm_i915_private *dev_priv = to_i915(dev);
2652 u32 psrperf = 0; 2652 u32 psrperf = 0;
2653 u32 stat[3]; 2653 u32 stat[3];
2654 enum pipe pipe; 2654 enum pipe pipe;
@@ -2756,7 +2756,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)
2756{ 2756{
2757 struct drm_info_node *node = m->private; 2757 struct drm_info_node *node = m->private;
2758 struct drm_device *dev = node->minor->dev; 2758 struct drm_device *dev = node->minor->dev;
2759 struct drm_i915_private *dev_priv = dev->dev_private; 2759 struct drm_i915_private *dev_priv = to_i915(dev);
2760 u64 power; 2760 u64 power;
2761 u32 units; 2761 u32 units;
2762 2762
@@ -2782,7 +2782,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
2782{ 2782{
2783 struct drm_info_node *node = m->private; 2783 struct drm_info_node *node = m->private;
2784 struct drm_device *dev = node->minor->dev; 2784 struct drm_device *dev = node->minor->dev;
2785 struct drm_i915_private *dev_priv = dev->dev_private; 2785 struct drm_i915_private *dev_priv = to_i915(dev);
2786 2786
2787 if (!HAS_RUNTIME_PM(dev_priv)) 2787 if (!HAS_RUNTIME_PM(dev_priv))
2788 seq_puts(m, "Runtime power management not supported\n"); 2788 seq_puts(m, "Runtime power management not supported\n");
@@ -2807,7 +2807,7 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)
2807{ 2807{
2808 struct drm_info_node *node = m->private; 2808 struct drm_info_node *node = m->private;
2809 struct drm_device *dev = node->minor->dev; 2809 struct drm_device *dev = node->minor->dev;
2810 struct drm_i915_private *dev_priv = dev->dev_private; 2810 struct drm_i915_private *dev_priv = to_i915(dev);
2811 struct i915_power_domains *power_domains = &dev_priv->power_domains; 2811 struct i915_power_domains *power_domains = &dev_priv->power_domains;
2812 int i; 2812 int i;
2813 2813
@@ -2842,7 +2842,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
2842{ 2842{
2843 struct drm_info_node *node = m->private; 2843 struct drm_info_node *node = m->private;
2844 struct drm_device *dev = node->minor->dev; 2844 struct drm_device *dev = node->minor->dev;
2845 struct drm_i915_private *dev_priv = dev->dev_private; 2845 struct drm_i915_private *dev_priv = to_i915(dev);
2846 struct intel_csr *csr; 2846 struct intel_csr *csr;
2847 2847
2848 if (!HAS_CSR(dev)) { 2848 if (!HAS_CSR(dev)) {
@@ -3033,7 +3033,7 @@ static void intel_connector_info(struct seq_file *m,
3033 3033
3034static bool cursor_active(struct drm_device *dev, int pipe) 3034static bool cursor_active(struct drm_device *dev, int pipe)
3035{ 3035{
3036 struct drm_i915_private *dev_priv = dev->dev_private; 3036 struct drm_i915_private *dev_priv = to_i915(dev);
3037 u32 state; 3037 u32 state;
3038 3038
3039 if (IS_845G(dev) || IS_I865G(dev)) 3039 if (IS_845G(dev) || IS_I865G(dev))
@@ -3046,7 +3046,7 @@ static bool cursor_active(struct drm_device *dev, int pipe)
3046 3046
3047static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y) 3047static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)
3048{ 3048{
3049 struct drm_i915_private *dev_priv = dev->dev_private; 3049 struct drm_i915_private *dev_priv = to_i915(dev);
3050 u32 pos; 3050 u32 pos;
3051 3051
3052 pos = I915_READ(CURPOS(pipe)); 3052 pos = I915_READ(CURPOS(pipe));
@@ -3167,7 +3167,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
3167{ 3167{
3168 struct drm_info_node *node = m->private; 3168 struct drm_info_node *node = m->private;
3169 struct drm_device *dev = node->minor->dev; 3169 struct drm_device *dev = node->minor->dev;
3170 struct drm_i915_private *dev_priv = dev->dev_private; 3170 struct drm_i915_private *dev_priv = to_i915(dev);
3171 struct intel_crtc *crtc; 3171 struct intel_crtc *crtc;
3172 struct drm_connector *connector; 3172 struct drm_connector *connector;
3173 3173
@@ -3222,7 +3222,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)
3222{ 3222{
3223 struct drm_info_node *node = (struct drm_info_node *) m->private; 3223 struct drm_info_node *node = (struct drm_info_node *) m->private;
3224 struct drm_device *dev = node->minor->dev; 3224 struct drm_device *dev = node->minor->dev;
3225 struct drm_i915_private *dev_priv = dev->dev_private; 3225 struct drm_i915_private *dev_priv = to_i915(dev);
3226 struct intel_engine_cs *engine; 3226 struct intel_engine_cs *engine;
3227 int num_rings = hweight32(INTEL_INFO(dev)->ring_mask); 3227 int num_rings = hweight32(INTEL_INFO(dev)->ring_mask);
3228 enum intel_engine_id id; 3228 enum intel_engine_id id;
@@ -3295,7 +3295,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
3295{ 3295{
3296 struct drm_info_node *node = (struct drm_info_node *) m->private; 3296 struct drm_info_node *node = (struct drm_info_node *) m->private;
3297 struct drm_device *dev = node->minor->dev; 3297 struct drm_device *dev = node->minor->dev;
3298 struct drm_i915_private *dev_priv = dev->dev_private; 3298 struct drm_i915_private *dev_priv = to_i915(dev);
3299 int i; 3299 int i;
3300 3300
3301 drm_modeset_lock_all(dev); 3301 drm_modeset_lock_all(dev);
@@ -3325,7 +3325,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
3325 struct intel_engine_cs *engine; 3325 struct intel_engine_cs *engine;
3326 struct drm_info_node *node = (struct drm_info_node *) m->private; 3326 struct drm_info_node *node = (struct drm_info_node *) m->private;
3327 struct drm_device *dev = node->minor->dev; 3327 struct drm_device *dev = node->minor->dev;
3328 struct drm_i915_private *dev_priv = dev->dev_private; 3328 struct drm_i915_private *dev_priv = to_i915(dev);
3329 struct i915_workarounds *workarounds = &dev_priv->workarounds; 3329 struct i915_workarounds *workarounds = &dev_priv->workarounds;
3330 enum intel_engine_id id; 3330 enum intel_engine_id id;
3331 3331
@@ -3363,7 +3363,7 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
3363{ 3363{
3364 struct drm_info_node *node = m->private; 3364 struct drm_info_node *node = m->private;
3365 struct drm_device *dev = node->minor->dev; 3365 struct drm_device *dev = node->minor->dev;
3366 struct drm_i915_private *dev_priv = dev->dev_private; 3366 struct drm_i915_private *dev_priv = to_i915(dev);
3367 struct skl_ddb_allocation *ddb; 3367 struct skl_ddb_allocation *ddb;
3368 struct skl_ddb_entry *entry; 3368 struct skl_ddb_entry *entry;
3369 enum pipe pipe; 3369 enum pipe pipe;
@@ -3401,7 +3401,7 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
3401static void drrs_status_per_crtc(struct seq_file *m, 3401static void drrs_status_per_crtc(struct seq_file *m,
3402 struct drm_device *dev, struct intel_crtc *intel_crtc) 3402 struct drm_device *dev, struct intel_crtc *intel_crtc)
3403{ 3403{
3404 struct drm_i915_private *dev_priv = dev->dev_private; 3404 struct drm_i915_private *dev_priv = to_i915(dev);
3405 struct i915_drrs *drrs = &dev_priv->drrs; 3405 struct i915_drrs *drrs = &dev_priv->drrs;
3406 int vrefresh = 0; 3406 int vrefresh = 0;
3407 struct drm_connector *connector; 3407 struct drm_connector *connector;
@@ -3528,7 +3528,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)
3528static int i915_pipe_crc_open(struct inode *inode, struct file *filep) 3528static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
3529{ 3529{
3530 struct pipe_crc_info *info = inode->i_private; 3530 struct pipe_crc_info *info = inode->i_private;
3531 struct drm_i915_private *dev_priv = info->dev->dev_private; 3531 struct drm_i915_private *dev_priv = to_i915(info->dev);
3532 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; 3532 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
3533 3533
3534 if (info->pipe >= INTEL_INFO(info->dev)->num_pipes) 3534 if (info->pipe >= INTEL_INFO(info->dev)->num_pipes)
@@ -3552,7 +3552,7 @@ static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
3552static int i915_pipe_crc_release(struct inode *inode, struct file *filep) 3552static int i915_pipe_crc_release(struct inode *inode, struct file *filep)
3553{ 3553{
3554 struct pipe_crc_info *info = inode->i_private; 3554 struct pipe_crc_info *info = inode->i_private;
3555 struct drm_i915_private *dev_priv = info->dev->dev_private; 3555 struct drm_i915_private *dev_priv = to_i915(info->dev);
3556 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; 3556 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
3557 3557
3558 spin_lock_irq(&pipe_crc->lock); 3558 spin_lock_irq(&pipe_crc->lock);
@@ -3580,7 +3580,7 @@ i915_pipe_crc_read(struct file *filep, char __user *user_buf, size_t count,
3580{ 3580{
3581 struct pipe_crc_info *info = filep->private_data; 3581 struct pipe_crc_info *info = filep->private_data;
3582 struct drm_device *dev = info->dev; 3582 struct drm_device *dev = info->dev;
3583 struct drm_i915_private *dev_priv = dev->dev_private; 3583 struct drm_i915_private *dev_priv = to_i915(dev);
3584 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; 3584 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
3585 char buf[PIPE_CRC_BUFFER_LEN]; 3585 char buf[PIPE_CRC_BUFFER_LEN];
3586 int n_entries; 3586 int n_entries;
@@ -3713,7 +3713,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)
3713static int display_crc_ctl_show(struct seq_file *m, void *data) 3713static int display_crc_ctl_show(struct seq_file *m, void *data)
3714{ 3714{
3715 struct drm_device *dev = m->private; 3715 struct drm_device *dev = m->private;
3716 struct drm_i915_private *dev_priv = dev->dev_private; 3716 struct drm_i915_private *dev_priv = to_i915(dev);
3717 int i; 3717 int i;
3718 3718
3719 for (i = 0; i < I915_MAX_PIPES; i++) 3719 for (i = 0; i < I915_MAX_PIPES; i++)
@@ -3807,7 +3807,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,
3807 enum intel_pipe_crc_source *source, 3807 enum intel_pipe_crc_source *source,
3808 uint32_t *val) 3808 uint32_t *val)
3809{ 3809{
3810 struct drm_i915_private *dev_priv = dev->dev_private; 3810 struct drm_i915_private *dev_priv = to_i915(dev);
3811 bool need_stable_symbols = false; 3811 bool need_stable_symbols = false;
3812 3812
3813 if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) { 3813 if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) {
@@ -3878,7 +3878,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,
3878 enum intel_pipe_crc_source *source, 3878 enum intel_pipe_crc_source *source,
3879 uint32_t *val) 3879 uint32_t *val)
3880{ 3880{
3881 struct drm_i915_private *dev_priv = dev->dev_private; 3881 struct drm_i915_private *dev_priv = to_i915(dev);
3882 bool need_stable_symbols = false; 3882 bool need_stable_symbols = false;
3883 3883
3884 if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) { 3884 if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) {
@@ -3952,7 +3952,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,
3952static void vlv_undo_pipe_scramble_reset(struct drm_device *dev, 3952static void vlv_undo_pipe_scramble_reset(struct drm_device *dev,
3953 enum pipe pipe) 3953 enum pipe pipe)
3954{ 3954{
3955 struct drm_i915_private *dev_priv = dev->dev_private; 3955 struct drm_i915_private *dev_priv = to_i915(dev);
3956 uint32_t tmp = I915_READ(PORT_DFT2_G4X); 3956 uint32_t tmp = I915_READ(PORT_DFT2_G4X);
3957 3957
3958 switch (pipe) { 3958 switch (pipe) {
@@ -3977,7 +3977,7 @@ static void vlv_undo_pipe_scramble_reset(struct drm_device *dev,
3977static void g4x_undo_pipe_scramble_reset(struct drm_device *dev, 3977static void g4x_undo_pipe_scramble_reset(struct drm_device *dev,
3978 enum pipe pipe) 3978 enum pipe pipe)
3979{ 3979{
3980 struct drm_i915_private *dev_priv = dev->dev_private; 3980 struct drm_i915_private *dev_priv = to_i915(dev);
3981 uint32_t tmp = I915_READ(PORT_DFT2_G4X); 3981 uint32_t tmp = I915_READ(PORT_DFT2_G4X);
3982 3982
3983 if (pipe == PIPE_A) 3983 if (pipe == PIPE_A)
@@ -4020,7 +4020,7 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
4020 4020
4021static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev, bool enable) 4021static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev, bool enable)
4022{ 4022{
4023 struct drm_i915_private *dev_priv = dev->dev_private; 4023 struct drm_i915_private *dev_priv = to_i915(dev);
4024 struct intel_crtc *crtc = 4024 struct intel_crtc *crtc =
4025 to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_A]); 4025 to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_A]);
4026 struct intel_crtc_state *pipe_config; 4026 struct intel_crtc_state *pipe_config;
@@ -4088,7 +4088,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,
4088static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe, 4088static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
4089 enum intel_pipe_crc_source source) 4089 enum intel_pipe_crc_source source)
4090{ 4090{
4091 struct drm_i915_private *dev_priv = dev->dev_private; 4091 struct drm_i915_private *dev_priv = to_i915(dev);
4092 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; 4092 struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
4093 struct intel_crtc *crtc = to_intel_crtc(intel_get_crtc_for_pipe(dev, 4093 struct intel_crtc *crtc = to_intel_crtc(intel_get_crtc_for_pipe(dev,
4094 pipe)); 4094 pipe));
@@ -4595,7 +4595,7 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])
4595static int pri_wm_latency_show(struct seq_file *m, void *data) 4595static int pri_wm_latency_show(struct seq_file *m, void *data)
4596{ 4596{
4597 struct drm_device *dev = m->private; 4597 struct drm_device *dev = m->private;
4598 struct drm_i915_private *dev_priv = dev->dev_private; 4598 struct drm_i915_private *dev_priv = to_i915(dev);
4599 const uint16_t *latencies; 4599 const uint16_t *latencies;
4600 4600
4601 if (INTEL_INFO(dev)->gen >= 9) 4601 if (INTEL_INFO(dev)->gen >= 9)
@@ -4611,7 +4611,7 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)
4611static int spr_wm_latency_show(struct seq_file *m, void *data) 4611static int spr_wm_latency_show(struct seq_file *m, void *data)
4612{ 4612{
4613 struct drm_device *dev = m->private; 4613 struct drm_device *dev = m->private;
4614 struct drm_i915_private *dev_priv = dev->dev_private; 4614 struct drm_i915_private *dev_priv = to_i915(dev);
4615 const uint16_t *latencies; 4615 const uint16_t *latencies;
4616 4616
4617 if (INTEL_INFO(dev)->gen >= 9) 4617 if (INTEL_INFO(dev)->gen >= 9)
@@ -4627,7 +4627,7 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)
4627static int cur_wm_latency_show(struct seq_file *m, void *data) 4627static int cur_wm_latency_show(struct seq_file *m, void *data)
4628{ 4628{
4629 struct drm_device *dev = m->private; 4629 struct drm_device *dev = m->private;
4630 struct drm_i915_private *dev_priv = dev->dev_private; 4630 struct drm_i915_private *dev_priv = to_i915(dev);
4631 const uint16_t *latencies; 4631 const uint16_t *latencies;
4632 4632
4633 if (INTEL_INFO(dev)->gen >= 9) 4633 if (INTEL_INFO(dev)->gen >= 9)
@@ -4718,7 +4718,7 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf,
4718{ 4718{
4719 struct seq_file *m = file->private_data; 4719 struct seq_file *m = file->private_data;
4720 struct drm_device *dev = m->private; 4720 struct drm_device *dev = m->private;
4721 struct drm_i915_private *dev_priv = dev->dev_private; 4721 struct drm_i915_private *dev_priv = to_i915(dev);
4722 uint16_t *latencies; 4722 uint16_t *latencies;
4723 4723
4724 if (INTEL_INFO(dev)->gen >= 9) 4724 if (INTEL_INFO(dev)->gen >= 9)
@@ -4734,7 +4734,7 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf,
4734{ 4734{
4735 struct seq_file *m = file->private_data; 4735 struct seq_file *m = file->private_data;
4736 struct drm_device *dev = m->private; 4736 struct drm_device *dev = m->private;
4737 struct drm_i915_private *dev_priv = dev->dev_private; 4737 struct drm_i915_private *dev_priv = to_i915(dev);
4738 uint16_t *latencies; 4738 uint16_t *latencies;
4739 4739
4740 if (INTEL_INFO(dev)->gen >= 9) 4740 if (INTEL_INFO(dev)->gen >= 9)
@@ -4750,7 +4750,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,
4750{ 4750{
4751 struct seq_file *m = file->private_data; 4751 struct seq_file *m = file->private_data;
4752 struct drm_device *dev = m->private; 4752 struct drm_device *dev = m->private;
4753 struct drm_i915_private *dev_priv = dev->dev_private; 4753 struct drm_i915_private *dev_priv = to_i915(dev);
4754 uint16_t *latencies; 4754 uint16_t *latencies;
4755 4755
4756 if (INTEL_INFO(dev)->gen >= 9) 4756 if (INTEL_INFO(dev)->gen >= 9)
@@ -4792,7 +4792,7 @@ static int
4792i915_wedged_get(void *data, u64 *val) 4792i915_wedged_get(void *data, u64 *val)
4793{ 4793{
4794 struct drm_device *dev = data; 4794 struct drm_device *dev = data;
4795 struct drm_i915_private *dev_priv = dev->dev_private; 4795 struct drm_i915_private *dev_priv = to_i915(dev);
4796 4796
4797 *val = i915_terminally_wedged(&dev_priv->gpu_error); 4797 *val = i915_terminally_wedged(&dev_priv->gpu_error);
4798 4798
@@ -4803,7 +4803,7 @@ static int
4803i915_wedged_set(void *data, u64 val) 4803i915_wedged_set(void *data, u64 val)
4804{ 4804{
4805 struct drm_device *dev = data; 4805 struct drm_device *dev = data;
4806 struct drm_i915_private *dev_priv = dev->dev_private; 4806 struct drm_i915_private *dev_priv = to_i915(dev);
4807 4807
4808 /* 4808 /*
4809 * There is no safeguard against this debugfs entry colliding 4809 * There is no safeguard against this debugfs entry colliding
@@ -4834,7 +4834,7 @@ static int
4834i915_ring_missed_irq_get(void *data, u64 *val) 4834i915_ring_missed_irq_get(void *data, u64 *val)
4835{ 4835{
4836 struct drm_device *dev = data; 4836 struct drm_device *dev = data;
4837 struct drm_i915_private *dev_priv = dev->dev_private; 4837 struct drm_i915_private *dev_priv = to_i915(dev);
4838 4838
4839 *val = dev_priv->gpu_error.missed_irq_rings; 4839 *val = dev_priv->gpu_error.missed_irq_rings;
4840 return 0; 4840 return 0;
@@ -4844,7 +4844,7 @@ static int
4844i915_ring_missed_irq_set(void *data, u64 val) 4844i915_ring_missed_irq_set(void *data, u64 val)
4845{ 4845{
4846 struct drm_device *dev = data; 4846 struct drm_device *dev = data;
4847 struct drm_i915_private *dev_priv = dev->dev_private; 4847 struct drm_i915_private *dev_priv = to_i915(dev);
4848 int ret; 4848 int ret;
4849 4849
4850 /* Lock against concurrent debugfs callers */ 4850 /* Lock against concurrent debugfs callers */
@@ -4865,7 +4865,7 @@ static int
4865i915_ring_test_irq_get(void *data, u64 *val) 4865i915_ring_test_irq_get(void *data, u64 *val)
4866{ 4866{
4867 struct drm_device *dev = data; 4867 struct drm_device *dev = data;
4868 struct drm_i915_private *dev_priv = dev->dev_private; 4868 struct drm_i915_private *dev_priv = to_i915(dev);
4869 4869
4870 *val = dev_priv->gpu_error.test_irq_rings; 4870 *val = dev_priv->gpu_error.test_irq_rings;
4871 4871
@@ -4876,7 +4876,7 @@ static int
4876i915_ring_test_irq_set(void *data, u64 val) 4876i915_ring_test_irq_set(void *data, u64 val)
4877{ 4877{
4878 struct drm_device *dev = data; 4878 struct drm_device *dev = data;
4879 struct drm_i915_private *dev_priv = dev->dev_private; 4879 struct drm_i915_private *dev_priv = to_i915(dev);
4880 4880
4881 val &= INTEL_INFO(dev_priv)->ring_mask; 4881 val &= INTEL_INFO(dev_priv)->ring_mask;
4882 DRM_DEBUG_DRIVER("Masking interrupts on rings 0x%08llx\n", val); 4882 DRM_DEBUG_DRIVER("Masking interrupts on rings 0x%08llx\n", val);
@@ -4909,7 +4909,7 @@ static int
4909i915_drop_caches_set(void *data, u64 val) 4909i915_drop_caches_set(void *data, u64 val)
4910{ 4910{
4911 struct drm_device *dev = data; 4911 struct drm_device *dev = data;
4912 struct drm_i915_private *dev_priv = dev->dev_private; 4912 struct drm_i915_private *dev_priv = to_i915(dev);
4913 int ret; 4913 int ret;
4914 4914
4915 DRM_DEBUG("Dropping caches: 0x%08llx\n", val); 4915 DRM_DEBUG("Dropping caches: 0x%08llx\n", val);
@@ -4949,7 +4949,7 @@ static int
4949i915_max_freq_get(void *data, u64 *val) 4949i915_max_freq_get(void *data, u64 *val)
4950{ 4950{
4951 struct drm_device *dev = data; 4951 struct drm_device *dev = data;
4952 struct drm_i915_private *dev_priv = dev->dev_private; 4952 struct drm_i915_private *dev_priv = to_i915(dev);
4953 int ret; 4953 int ret;
4954 4954
4955 if (INTEL_INFO(dev)->gen < 6) 4955 if (INTEL_INFO(dev)->gen < 6)
@@ -4971,7 +4971,7 @@ static int
4971i915_max_freq_set(void *data, u64 val) 4971i915_max_freq_set(void *data, u64 val)
4972{ 4972{
4973 struct drm_device *dev = data; 4973 struct drm_device *dev = data;
4974 struct drm_i915_private *dev_priv = dev->dev_private; 4974 struct drm_i915_private *dev_priv = to_i915(dev);
4975 u32 hw_max, hw_min; 4975 u32 hw_max, hw_min;
4976 int ret; 4976 int ret;
4977 4977
@@ -5016,7 +5016,7 @@ static int
5016i915_min_freq_get(void *data, u64 *val) 5016i915_min_freq_get(void *data, u64 *val)
5017{ 5017{
5018 struct drm_device *dev = data; 5018 struct drm_device *dev = data;
5019 struct drm_i915_private *dev_priv = dev->dev_private; 5019 struct drm_i915_private *dev_priv = to_i915(dev);
5020 int ret; 5020 int ret;
5021 5021
5022 if (INTEL_INFO(dev)->gen < 6) 5022 if (INTEL_INFO(dev)->gen < 6)
@@ -5038,7 +5038,7 @@ static int
5038i915_min_freq_set(void *data, u64 val) 5038i915_min_freq_set(void *data, u64 val)
5039{ 5039{
5040 struct drm_device *dev = data; 5040 struct drm_device *dev = data;
5041 struct drm_i915_private *dev_priv = dev->dev_private; 5041 struct drm_i915_private *dev_priv = to_i915(dev);
5042 u32 hw_max, hw_min; 5042 u32 hw_max, hw_min;
5043 int ret; 5043 int ret;
5044 5044
@@ -5083,7 +5083,7 @@ static int
5083i915_cache_sharing_get(void *data, u64 *val) 5083i915_cache_sharing_get(void *data, u64 *val)
5084{ 5084{
5085 struct drm_device *dev = data; 5085 struct drm_device *dev = data;
5086 struct drm_i915_private *dev_priv = dev->dev_private; 5086 struct drm_i915_private *dev_priv = to_i915(dev);
5087 u32 snpcr; 5087 u32 snpcr;
5088 int ret; 5088 int ret;
5089 5089
@@ -5109,7 +5109,7 @@ static int
5109i915_cache_sharing_set(void *data, u64 val) 5109i915_cache_sharing_set(void *data, u64 val)
5110{ 5110{
5111 struct drm_device *dev = data; 5111 struct drm_device *dev = data;
5112 struct drm_i915_private *dev_priv = dev->dev_private; 5112 struct drm_i915_private *dev_priv = to_i915(dev);
5113 u32 snpcr; 5113 u32 snpcr;
5114 5114
5115 if (!(IS_GEN6(dev) || IS_GEN7(dev))) 5115 if (!(IS_GEN6(dev) || IS_GEN7(dev)))
@@ -5146,7 +5146,7 @@ struct sseu_dev_status {
5146static void cherryview_sseu_device_status(struct drm_device *dev, 5146static void cherryview_sseu_device_status(struct drm_device *dev,
5147 struct sseu_dev_status *stat) 5147 struct sseu_dev_status *stat)
5148{ 5148{
5149 struct drm_i915_private *dev_priv = dev->dev_private; 5149 struct drm_i915_private *dev_priv = to_i915(dev);
5150 int ss_max = 2; 5150 int ss_max = 2;
5151 int ss; 5151 int ss;
5152 u32 sig1[ss_max], sig2[ss_max]; 5152 u32 sig1[ss_max], sig2[ss_max];
@@ -5178,7 +5178,7 @@ static void cherryview_sseu_device_status(struct drm_device *dev,
5178static void gen9_sseu_device_status(struct drm_device *dev, 5178static void gen9_sseu_device_status(struct drm_device *dev,
5179 struct sseu_dev_status *stat) 5179 struct sseu_dev_status *stat)
5180{ 5180{
5181 struct drm_i915_private *dev_priv = dev->dev_private; 5181 struct drm_i915_private *dev_priv = to_i915(dev);
5182 int s_max = 3, ss_max = 4; 5182 int s_max = 3, ss_max = 4;
5183 int s, ss; 5183 int s, ss;
5184 u32 s_reg[s_max], eu_reg[2*s_max], eu_mask[2]; 5184 u32 s_reg[s_max], eu_reg[2*s_max], eu_mask[2];
@@ -5243,7 +5243,7 @@ static void gen9_sseu_device_status(struct drm_device *dev,
5243static void broadwell_sseu_device_status(struct drm_device *dev, 5243static void broadwell_sseu_device_status(struct drm_device *dev,
5244 struct sseu_dev_status *stat) 5244 struct sseu_dev_status *stat)
5245{ 5245{
5246 struct drm_i915_private *dev_priv = dev->dev_private; 5246 struct drm_i915_private *dev_priv = to_i915(dev);
5247 int s; 5247 int s;
5248 u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO); 5248 u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO);
5249 5249
@@ -5322,7 +5322,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
5322static int i915_forcewake_open(struct inode *inode, struct file *file) 5322static int i915_forcewake_open(struct inode *inode, struct file *file)
5323{ 5323{
5324 struct drm_device *dev = inode->i_private; 5324 struct drm_device *dev = inode->i_private;
5325 struct drm_i915_private *dev_priv = dev->dev_private; 5325 struct drm_i915_private *dev_priv = to_i915(dev);
5326 5326
5327 if (INTEL_INFO(dev)->gen < 6) 5327 if (INTEL_INFO(dev)->gen < 6)
5328 return 0; 5328 return 0;
@@ -5336,7 +5336,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
5336static int i915_forcewake_release(struct inode *inode, struct file *file) 5336static int i915_forcewake_release(struct inode *inode, struct file *file)
5337{ 5337{
5338 struct drm_device *dev = inode->i_private; 5338 struct drm_device *dev = inode->i_private;
5339 struct drm_i915_private *dev_priv = dev->dev_private; 5339 struct drm_i915_private *dev_priv = to_i915(dev);
5340 5340
5341 if (INTEL_INFO(dev)->gen < 6) 5341 if (INTEL_INFO(dev)->gen < 6)
5342 return 0; 5342 return 0;
@@ -5469,7 +5469,7 @@ static const struct i915_debugfs_files {
5469 5469
5470void intel_display_crc_init(struct drm_device *dev) 5470void intel_display_crc_init(struct drm_device *dev)
5471{ 5471{
5472 struct drm_i915_private *dev_priv = dev->dev_private; 5472 struct drm_i915_private *dev_priv = to_i915(dev);
5473 enum pipe pipe; 5473 enum pipe pipe;
5474 5474
5475 for_each_pipe(dev_priv, pipe) { 5475 for_each_pipe(dev_priv, pipe) {
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7b9b6f90ca69..695001ffd547 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -144,7 +144,7 @@ static enum intel_pch intel_virt_detect_pch(struct drm_device *dev)
144 144
145static void intel_detect_pch(struct drm_device *dev) 145static void intel_detect_pch(struct drm_device *dev)
146{ 146{
147 struct drm_i915_private *dev_priv = dev->dev_private; 147 struct drm_i915_private *dev_priv = to_i915(dev);
148 struct pci_dev *pch = NULL; 148 struct pci_dev *pch = NULL;
149 149
150 /* In all current cases, num_pipes is equivalent to the PCH_NOP setting 150 /* In all current cases, num_pipes is equivalent to the PCH_NOP setting
@@ -248,7 +248,7 @@ bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv)
248static int i915_getparam(struct drm_device *dev, void *data, 248static int i915_getparam(struct drm_device *dev, void *data,
249 struct drm_file *file_priv) 249 struct drm_file *file_priv)
250{ 250{
251 struct drm_i915_private *dev_priv = dev->dev_private; 251 struct drm_i915_private *dev_priv = to_i915(dev);
252 drm_i915_getparam_t *param = data; 252 drm_i915_getparam_t *param = data;
253 int value; 253 int value;
254 254
@@ -384,7 +384,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
384 384
385static int i915_get_bridge_dev(struct drm_device *dev) 385static int i915_get_bridge_dev(struct drm_device *dev)
386{ 386{
387 struct drm_i915_private *dev_priv = dev->dev_private; 387 struct drm_i915_private *dev_priv = to_i915(dev);
388 388
389 dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); 389 dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
390 if (!dev_priv->bridge_dev) { 390 if (!dev_priv->bridge_dev) {
@@ -398,7 +398,7 @@ static int i915_get_bridge_dev(struct drm_device *dev)
398static int 398static int
399intel_alloc_mchbar_resource(struct drm_device *dev) 399intel_alloc_mchbar_resource(struct drm_device *dev)
400{ 400{
401 struct drm_i915_private *dev_priv = dev->dev_private; 401 struct drm_i915_private *dev_priv = to_i915(dev);
402 int reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915; 402 int reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915;
403 u32 temp_lo, temp_hi = 0; 403 u32 temp_lo, temp_hi = 0;
404 u64 mchbar_addr; 404 u64 mchbar_addr;
@@ -444,7 +444,7 @@ intel_alloc_mchbar_resource(struct drm_device *dev)
444static void 444static void
445intel_setup_mchbar(struct drm_device *dev) 445intel_setup_mchbar(struct drm_device *dev)
446{ 446{
447 struct drm_i915_private *dev_priv = dev->dev_private; 447 struct drm_i915_private *dev_priv = to_i915(dev);
448 int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915; 448 int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915;
449 u32 temp; 449 u32 temp;
450 bool enabled; 450 bool enabled;
@@ -484,7 +484,7 @@ intel_setup_mchbar(struct drm_device *dev)
484static void 484static void
485intel_teardown_mchbar(struct drm_device *dev) 485intel_teardown_mchbar(struct drm_device *dev)
486{ 486{
487 struct drm_i915_private *dev_priv = dev->dev_private; 487 struct drm_i915_private *dev_priv = to_i915(dev);
488 int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915; 488 int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915;
489 489
490 if (dev_priv->mchbar_need_disable) { 490 if (dev_priv->mchbar_need_disable) {
@@ -601,7 +601,7 @@ static void i915_gem_fini(struct drm_device *dev)
601 601
602static int i915_load_modeset_init(struct drm_device *dev) 602static int i915_load_modeset_init(struct drm_device *dev)
603{ 603{
604 struct drm_i915_private *dev_priv = dev->dev_private; 604 struct drm_i915_private *dev_priv = to_i915(dev);
605 int ret; 605 int ret;
606 606
607 if (i915_inject_load_failure()) 607 if (i915_inject_load_failure())
@@ -1671,7 +1671,7 @@ out_free_priv:
1671 1671
1672void i915_driver_unload(struct drm_device *dev) 1672void i915_driver_unload(struct drm_device *dev)
1673{ 1673{
1674 struct drm_i915_private *dev_priv = dev->dev_private; 1674 struct drm_i915_private *dev_priv = to_i915(dev);
1675 1675
1676 intel_fbdev_fini(dev); 1676 intel_fbdev_fini(dev);
1677 1677
@@ -1797,7 +1797,7 @@ static bool suspend_to_idle(struct drm_i915_private *dev_priv)
1797 1797
1798static int i915_drm_suspend(struct drm_device *dev) 1798static int i915_drm_suspend(struct drm_device *dev)
1799{ 1799{
1800 struct drm_i915_private *dev_priv = dev->dev_private; 1800 struct drm_i915_private *dev_priv = to_i915(dev);
1801 pci_power_t opregion_target_state; 1801 pci_power_t opregion_target_state;
1802 int error; 1802 int error;
1803 1803
@@ -1864,7 +1864,7 @@ out:
1864 1864
1865static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) 1865static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
1866{ 1866{
1867 struct drm_i915_private *dev_priv = drm_dev->dev_private; 1867 struct drm_i915_private *dev_priv = to_i915(drm_dev);
1868 bool fw_csr; 1868 bool fw_csr;
1869 int ret; 1869 int ret;
1870 1870
@@ -1948,7 +1948,7 @@ int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state)
1948 1948
1949static int i915_drm_resume(struct drm_device *dev) 1949static int i915_drm_resume(struct drm_device *dev)
1950{ 1950{
1951 struct drm_i915_private *dev_priv = dev->dev_private; 1951 struct drm_i915_private *dev_priv = to_i915(dev);
1952 int ret; 1952 int ret;
1953 1953
1954 disable_rpm_wakeref_asserts(dev_priv); 1954 disable_rpm_wakeref_asserts(dev_priv);
@@ -2028,7 +2028,7 @@ static int i915_drm_resume(struct drm_device *dev)
2028 2028
2029static int i915_drm_resume_early(struct drm_device *dev) 2029static int i915_drm_resume_early(struct drm_device *dev)
2030{ 2030{
2031 struct drm_i915_private *dev_priv = dev->dev_private; 2031 struct drm_i915_private *dev_priv = to_i915(dev);
2032 int ret; 2032 int ret;
2033 2033
2034 /* 2034 /*
@@ -2684,7 +2684,7 @@ static int intel_runtime_suspend(struct device *device)
2684{ 2684{
2685 struct pci_dev *pdev = to_pci_dev(device); 2685 struct pci_dev *pdev = to_pci_dev(device);
2686 struct drm_device *dev = pci_get_drvdata(pdev); 2686 struct drm_device *dev = pci_get_drvdata(pdev);
2687 struct drm_i915_private *dev_priv = dev->dev_private; 2687 struct drm_i915_private *dev_priv = to_i915(dev);
2688 int ret; 2688 int ret;
2689 2689
2690 if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6()))) 2690 if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6())))
@@ -2788,7 +2788,7 @@ static int intel_runtime_resume(struct device *device)
2788{ 2788{
2789 struct pci_dev *pdev = to_pci_dev(device); 2789 struct pci_dev *pdev = to_pci_dev(device);
2790 struct drm_device *dev = pci_get_drvdata(pdev); 2790 struct drm_device *dev = pci_get_drvdata(pdev);
2791 struct drm_i915_private *dev_priv = dev->dev_private; 2791 struct drm_i915_private *dev_priv = to_i915(dev);
2792 int ret = 0; 2792 int ret = 0;
2793 2793
2794 if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev))) 2794 if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev)))
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 94d68f9c3a08..7a88840b59fa 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -128,7 +128,7 @@ i915_gem_wait_for_error(struct i915_gpu_error *error)
128 128
129int i915_mutex_lock_interruptible(struct drm_device *dev) 129int i915_mutex_lock_interruptible(struct drm_device *dev)
130{ 130{
131 struct drm_i915_private *dev_priv = dev->dev_private; 131 struct drm_i915_private *dev_priv = to_i915(dev);
132 int ret; 132 int ret;
133 133
134 ret = i915_gem_wait_for_error(&dev_priv->gpu_error); 134 ret = i915_gem_wait_for_error(&dev_priv->gpu_error);
@@ -377,13 +377,13 @@ out:
377 377
378void *i915_gem_object_alloc(struct drm_device *dev) 378void *i915_gem_object_alloc(struct drm_device *dev)
379{ 379{
380 struct drm_i915_private *dev_priv = dev->dev_private; 380 struct drm_i915_private *dev_priv = to_i915(dev);
381 return kmem_cache_zalloc(dev_priv->objects, GFP_KERNEL); 381 return kmem_cache_zalloc(dev_priv->objects, GFP_KERNEL);
382} 382}
383 383
384void i915_gem_object_free(struct drm_i915_gem_object *obj) 384void i915_gem_object_free(struct drm_i915_gem_object *obj)
385{ 385{
386 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 386 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
387 kmem_cache_free(dev_priv->objects, obj); 387 kmem_cache_free(dev_priv->objects, obj);
388} 388}
389 389
@@ -636,7 +636,7 @@ i915_gem_gtt_pread(struct drm_device *dev,
636 struct drm_i915_gem_object *obj, uint64_t size, 636 struct drm_i915_gem_object *obj, uint64_t size,
637 uint64_t data_offset, uint64_t data_ptr) 637 uint64_t data_offset, uint64_t data_ptr)
638{ 638{
639 struct drm_i915_private *dev_priv = dev->dev_private; 639 struct drm_i915_private *dev_priv = to_i915(dev);
640 struct i915_ggtt *ggtt = &dev_priv->ggtt; 640 struct i915_ggtt *ggtt = &dev_priv->ggtt;
641 struct drm_mm_node node; 641 struct drm_mm_node node;
642 char __user *user_data; 642 char __user *user_data;
@@ -1250,7 +1250,7 @@ int
1250i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 1250i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
1251 struct drm_file *file) 1251 struct drm_file *file)
1252{ 1252{
1253 struct drm_i915_private *dev_priv = dev->dev_private; 1253 struct drm_i915_private *dev_priv = to_i915(dev);
1254 struct drm_i915_gem_pwrite *args = data; 1254 struct drm_i915_gem_pwrite *args = data;
1255 struct drm_i915_gem_object *obj; 1255 struct drm_i915_gem_object *obj;
1256 int ret; 1256 int ret;
@@ -1761,7 +1761,7 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj,
1761 bool readonly) 1761 bool readonly)
1762{ 1762{
1763 struct drm_device *dev = obj->base.dev; 1763 struct drm_device *dev = obj->base.dev;
1764 struct drm_i915_private *dev_priv = dev->dev_private; 1764 struct drm_i915_private *dev_priv = to_i915(dev);
1765 struct drm_i915_gem_request *requests[I915_NUM_ENGINES]; 1765 struct drm_i915_gem_request *requests[I915_NUM_ENGINES];
1766 int ret, i, n = 0; 1766 int ret, i, n = 0;
1767 1767
@@ -2273,7 +2273,7 @@ i915_gem_get_gtt_alignment(struct drm_device *dev, uint32_t size,
2273 2273
2274static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj) 2274static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj)
2275{ 2275{
2276 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 2276 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
2277 int ret; 2277 int ret;
2278 2278
2279 dev_priv->mm.shrinker_no_lock_stealing = true; 2279 dev_priv->mm.shrinker_no_lock_stealing = true;
@@ -2489,7 +2489,7 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
2489static int 2489static int
2490i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 2490i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
2491{ 2491{
2492 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 2492 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
2493 int page_count, i; 2493 int page_count, i;
2494 struct address_space *mapping; 2494 struct address_space *mapping;
2495 struct sg_table *st; 2495 struct sg_table *st;
@@ -2620,7 +2620,7 @@ err_pages:
2620int 2620int
2621i915_gem_object_get_pages(struct drm_i915_gem_object *obj) 2621i915_gem_object_get_pages(struct drm_i915_gem_object *obj)
2622{ 2622{
2623 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 2623 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
2624 const struct drm_i915_gem_object_ops *ops = obj->ops; 2624 const struct drm_i915_gem_object_ops *ops = obj->ops;
2625 int ret; 2625 int ret;
2626 2626
@@ -2800,7 +2800,7 @@ i915_gem_init_seqno(struct drm_i915_private *dev_priv, u32 seqno)
2800 2800
2801int i915_gem_set_seqno(struct drm_device *dev, u32 seqno) 2801int i915_gem_set_seqno(struct drm_device *dev, u32 seqno)
2802{ 2802{
2803 struct drm_i915_private *dev_priv = dev->dev_private; 2803 struct drm_i915_private *dev_priv = to_i915(dev);
2804 int ret; 2804 int ret;
2805 2805
2806 if (seqno == 0) 2806 if (seqno == 0)
@@ -3182,7 +3182,7 @@ static void i915_gem_reset_engine_cleanup(struct intel_engine_cs *engine)
3182 3182
3183void i915_gem_reset(struct drm_device *dev) 3183void i915_gem_reset(struct drm_device *dev)
3184{ 3184{
3185 struct drm_i915_private *dev_priv = dev->dev_private; 3185 struct drm_i915_private *dev_priv = to_i915(dev);
3186 struct intel_engine_cs *engine; 3186 struct intel_engine_cs *engine;
3187 3187
3188 /* 3188 /*
@@ -3632,7 +3632,7 @@ static void __i915_vma_iounmap(struct i915_vma *vma)
3632static int __i915_vma_unbind(struct i915_vma *vma, bool wait) 3632static int __i915_vma_unbind(struct i915_vma *vma, bool wait)
3633{ 3633{
3634 struct drm_i915_gem_object *obj = vma->obj; 3634 struct drm_i915_gem_object *obj = vma->obj;
3635 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 3635 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
3636 int ret; 3636 int ret;
3637 3637
3638 if (list_empty(&vma->obj_link)) 3638 if (list_empty(&vma->obj_link))
@@ -4250,7 +4250,7 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
4250int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, 4250int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
4251 struct drm_file *file) 4251 struct drm_file *file)
4252{ 4252{
4253 struct drm_i915_private *dev_priv = dev->dev_private; 4253 struct drm_i915_private *dev_priv = to_i915(dev);
4254 struct drm_i915_gem_caching *args = data; 4254 struct drm_i915_gem_caching *args = data;
4255 struct drm_i915_gem_object *obj; 4255 struct drm_i915_gem_object *obj;
4256 enum i915_cache_level level; 4256 enum i915_cache_level level;
@@ -4444,7 +4444,7 @@ i915_gem_object_set_to_cpu_domain(struct drm_i915_gem_object *obj, bool write)
4444static int 4444static int
4445i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) 4445i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
4446{ 4446{
4447 struct drm_i915_private *dev_priv = dev->dev_private; 4447 struct drm_i915_private *dev_priv = to_i915(dev);
4448 struct drm_i915_file_private *file_priv = file->driver_priv; 4448 struct drm_i915_file_private *file_priv = file->driver_priv;
4449 unsigned long recent_enough = jiffies - DRM_I915_THROTTLE_JIFFIES; 4449 unsigned long recent_enough = jiffies - DRM_I915_THROTTLE_JIFFIES;
4450 struct drm_i915_gem_request *request, *target = NULL; 4450 struct drm_i915_gem_request *request, *target = NULL;
@@ -4538,7 +4538,7 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj,
4538 uint32_t alignment, 4538 uint32_t alignment,
4539 uint64_t flags) 4539 uint64_t flags)
4540{ 4540{
4541 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 4541 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
4542 struct i915_vma *vma; 4542 struct i915_vma *vma;
4543 unsigned bound; 4543 unsigned bound;
4544 int ret; 4544 int ret;
@@ -4702,7 +4702,7 @@ int
4702i915_gem_madvise_ioctl(struct drm_device *dev, void *data, 4702i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
4703 struct drm_file *file_priv) 4703 struct drm_file *file_priv)
4704{ 4704{
4705 struct drm_i915_private *dev_priv = dev->dev_private; 4705 struct drm_i915_private *dev_priv = to_i915(dev);
4706 struct drm_i915_gem_madvise *args = data; 4706 struct drm_i915_gem_madvise *args = data;
4707 struct drm_i915_gem_object *obj; 4707 struct drm_i915_gem_object *obj;
4708 int ret; 4708 int ret;
@@ -4867,7 +4867,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
4867{ 4867{
4868 struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); 4868 struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
4869 struct drm_device *dev = obj->base.dev; 4869 struct drm_device *dev = obj->base.dev;
4870 struct drm_i915_private *dev_priv = dev->dev_private; 4870 struct drm_i915_private *dev_priv = to_i915(dev);
4871 struct i915_vma *vma, *next; 4871 struct i915_vma *vma, *next;
4872 4872
4873 intel_runtime_pm_get(dev_priv); 4873 intel_runtime_pm_get(dev_priv);
@@ -4971,7 +4971,7 @@ void i915_gem_vma_destroy(struct i915_vma *vma)
4971static void 4971static void
4972i915_gem_stop_engines(struct drm_device *dev) 4972i915_gem_stop_engines(struct drm_device *dev)
4973{ 4973{
4974 struct drm_i915_private *dev_priv = dev->dev_private; 4974 struct drm_i915_private *dev_priv = to_i915(dev);
4975 struct intel_engine_cs *engine; 4975 struct intel_engine_cs *engine;
4976 4976
4977 for_each_engine(engine, dev_priv) 4977 for_each_engine(engine, dev_priv)
@@ -4981,7 +4981,7 @@ i915_gem_stop_engines(struct drm_device *dev)
4981int 4981int
4982i915_gem_suspend(struct drm_device *dev) 4982i915_gem_suspend(struct drm_device *dev)
4983{ 4983{
4984 struct drm_i915_private *dev_priv = dev->dev_private; 4984 struct drm_i915_private *dev_priv = to_i915(dev);
4985 int ret = 0; 4985 int ret = 0;
4986 4986
4987 mutex_lock(&dev->struct_mutex); 4987 mutex_lock(&dev->struct_mutex);
@@ -5013,7 +5013,7 @@ err:
5013 5013
5014void i915_gem_init_swizzling(struct drm_device *dev) 5014void i915_gem_init_swizzling(struct drm_device *dev)
5015{ 5015{
5016 struct drm_i915_private *dev_priv = dev->dev_private; 5016 struct drm_i915_private *dev_priv = to_i915(dev);
5017 5017
5018 if (INTEL_INFO(dev)->gen < 5 || 5018 if (INTEL_INFO(dev)->gen < 5 ||
5019 dev_priv->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE) 5019 dev_priv->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE)
@@ -5038,7 +5038,7 @@ void i915_gem_init_swizzling(struct drm_device *dev)
5038 5038
5039static void init_unused_ring(struct drm_device *dev, u32 base) 5039static void init_unused_ring(struct drm_device *dev, u32 base)
5040{ 5040{
5041 struct drm_i915_private *dev_priv = dev->dev_private; 5041 struct drm_i915_private *dev_priv = to_i915(dev);
5042 5042
5043 I915_WRITE(RING_CTL(base), 0); 5043 I915_WRITE(RING_CTL(base), 0);
5044 I915_WRITE(RING_HEAD(base), 0); 5044 I915_WRITE(RING_HEAD(base), 0);
@@ -5065,7 +5065,7 @@ static void init_unused_rings(struct drm_device *dev)
5065 5065
5066int i915_gem_init_engines(struct drm_device *dev) 5066int i915_gem_init_engines(struct drm_device *dev)
5067{ 5067{
5068 struct drm_i915_private *dev_priv = dev->dev_private; 5068 struct drm_i915_private *dev_priv = to_i915(dev);
5069 int ret; 5069 int ret;
5070 5070
5071 ret = intel_init_render_ring_buffer(dev); 5071 ret = intel_init_render_ring_buffer(dev);
@@ -5113,7 +5113,7 @@ cleanup_render_ring:
5113int 5113int
5114i915_gem_init_hw(struct drm_device *dev) 5114i915_gem_init_hw(struct drm_device *dev)
5115{ 5115{
5116 struct drm_i915_private *dev_priv = dev->dev_private; 5116 struct drm_i915_private *dev_priv = to_i915(dev);
5117 struct intel_engine_cs *engine; 5117 struct intel_engine_cs *engine;
5118 int ret; 5118 int ret;
5119 5119
@@ -5178,7 +5178,7 @@ out:
5178 5178
5179int i915_gem_init(struct drm_device *dev) 5179int i915_gem_init(struct drm_device *dev)
5180{ 5180{
5181 struct drm_i915_private *dev_priv = dev->dev_private; 5181 struct drm_i915_private *dev_priv = to_i915(dev);
5182 int ret; 5182 int ret;
5183 5183
5184 mutex_lock(&dev->struct_mutex); 5184 mutex_lock(&dev->struct_mutex);
@@ -5235,7 +5235,7 @@ out_unlock:
5235void 5235void
5236i915_gem_cleanup_engines(struct drm_device *dev) 5236i915_gem_cleanup_engines(struct drm_device *dev)
5237{ 5237{
5238 struct drm_i915_private *dev_priv = dev->dev_private; 5238 struct drm_i915_private *dev_priv = to_i915(dev);
5239 struct intel_engine_cs *engine; 5239 struct intel_engine_cs *engine;
5240 5240
5241 for_each_engine(engine, dev_priv) 5241 for_each_engine(engine, dev_priv)
@@ -5276,7 +5276,7 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)
5276void 5276void
5277i915_gem_load_init(struct drm_device *dev) 5277i915_gem_load_init(struct drm_device *dev)
5278{ 5278{
5279 struct drm_i915_private *dev_priv = dev->dev_private; 5279 struct drm_i915_private *dev_priv = to_i915(dev);
5280 int i; 5280 int i;
5281 5281
5282 dev_priv->objects = 5282 dev_priv->objects =
@@ -5444,7 +5444,7 @@ void i915_gem_track_fb(struct drm_i915_gem_object *old,
5444u64 i915_gem_obj_offset(struct drm_i915_gem_object *o, 5444u64 i915_gem_obj_offset(struct drm_i915_gem_object *o,
5445 struct i915_address_space *vm) 5445 struct i915_address_space *vm)
5446{ 5446{
5447 struct drm_i915_private *dev_priv = o->base.dev->dev_private; 5447 struct drm_i915_private *dev_priv = to_i915(o->base.dev);
5448 struct i915_vma *vma; 5448 struct i915_vma *vma;
5449 5449
5450 WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base); 5450 WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base);
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 8e952b1a31b3..b4bba8a76191 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -250,7 +250,7 @@ static struct i915_gem_context *
250__create_hw_context(struct drm_device *dev, 250__create_hw_context(struct drm_device *dev,
251 struct drm_i915_file_private *file_priv) 251 struct drm_i915_file_private *file_priv)
252{ 252{
253 struct drm_i915_private *dev_priv = dev->dev_private; 253 struct drm_i915_private *dev_priv = to_i915(dev);
254 struct i915_gem_context *ctx; 254 struct i915_gem_context *ctx;
255 int ret; 255 int ret;
256 256
@@ -396,7 +396,7 @@ static void i915_gem_context_unpin(struct i915_gem_context *ctx,
396 396
397void i915_gem_context_reset(struct drm_device *dev) 397void i915_gem_context_reset(struct drm_device *dev)
398{ 398{
399 struct drm_i915_private *dev_priv = dev->dev_private; 399 struct drm_i915_private *dev_priv = to_i915(dev);
400 400
401 lockdep_assert_held(&dev->struct_mutex); 401 lockdep_assert_held(&dev->struct_mutex);
402 402
@@ -412,7 +412,7 @@ void i915_gem_context_reset(struct drm_device *dev)
412 412
413int i915_gem_context_init(struct drm_device *dev) 413int i915_gem_context_init(struct drm_device *dev)
414{ 414{
415 struct drm_i915_private *dev_priv = dev->dev_private; 415 struct drm_i915_private *dev_priv = to_i915(dev);
416 struct i915_gem_context *ctx; 416 struct i915_gem_context *ctx;
417 417
418 /* Init should only be called once per module load. Eventually the 418 /* Init should only be called once per module load. Eventually the
@@ -499,7 +499,7 @@ void i915_gem_context_lost(struct drm_i915_private *dev_priv)
499 499
500void i915_gem_context_fini(struct drm_device *dev) 500void i915_gem_context_fini(struct drm_device *dev)
501{ 501{
502 struct drm_i915_private *dev_priv = dev->dev_private; 502 struct drm_i915_private *dev_priv = to_i915(dev);
503 struct i915_gem_context *dctx = dev_priv->kernel_context; 503 struct i915_gem_context *dctx = dev_priv->kernel_context;
504 504
505 lockdep_assert_held(&dev->struct_mutex); 505 lockdep_assert_held(&dev->struct_mutex);
@@ -1096,7 +1096,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
1096int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, 1096int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,
1097 void *data, struct drm_file *file) 1097 void *data, struct drm_file *file)
1098{ 1098{
1099 struct drm_i915_private *dev_priv = dev->dev_private; 1099 struct drm_i915_private *dev_priv = to_i915(dev);
1100 struct drm_i915_reset_stats *args = data; 1100 struct drm_i915_reset_stats *args = data;
1101 struct i915_ctx_hang_stats *hs; 1101 struct i915_ctx_hang_stats *hs;
1102 struct i915_gem_context *ctx; 1102 struct i915_gem_context *ctx;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 39c53d97833a..3a04d37be4e9 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1142,7 +1142,7 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev,
1142 struct drm_i915_gem_request *req) 1142 struct drm_i915_gem_request *req)
1143{ 1143{
1144 struct intel_engine_cs *engine = req->engine; 1144 struct intel_engine_cs *engine = req->engine;
1145 struct drm_i915_private *dev_priv = dev->dev_private; 1145 struct drm_i915_private *dev_priv = to_i915(dev);
1146 int ret, i; 1146 int ret, i;
1147 1147
1148 if (!IS_GEN7(dev) || engine != &dev_priv->engine[RCS]) { 1148 if (!IS_GEN7(dev) || engine != &dev_priv->engine[RCS]) {
@@ -1225,7 +1225,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
1225{ 1225{
1226 struct drm_device *dev = params->dev; 1226 struct drm_device *dev = params->dev;
1227 struct intel_engine_cs *engine = params->engine; 1227 struct intel_engine_cs *engine = params->engine;
1228 struct drm_i915_private *dev_priv = dev->dev_private; 1228 struct drm_i915_private *dev_priv = to_i915(dev);
1229 u64 exec_start, exec_len; 1229 u64 exec_start, exec_len;
1230 int instp_mode; 1230 int instp_mode;
1231 u32 instp_mask; 1231 u32 instp_mask;
diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
index 2b6bdc267fb5..251d7a95af89 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -58,7 +58,7 @@
58static void i965_write_fence_reg(struct drm_device *dev, int reg, 58static void i965_write_fence_reg(struct drm_device *dev, int reg,
59 struct drm_i915_gem_object *obj) 59 struct drm_i915_gem_object *obj)
60{ 60{
61 struct drm_i915_private *dev_priv = dev->dev_private; 61 struct drm_i915_private *dev_priv = to_i915(dev);
62 i915_reg_t fence_reg_lo, fence_reg_hi; 62 i915_reg_t fence_reg_lo, fence_reg_hi;
63 int fence_pitch_shift; 63 int fence_pitch_shift;
64 64
@@ -117,7 +117,7 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,
117static void i915_write_fence_reg(struct drm_device *dev, int reg, 117static void i915_write_fence_reg(struct drm_device *dev, int reg,
118 struct drm_i915_gem_object *obj) 118 struct drm_i915_gem_object *obj)
119{ 119{
120 struct drm_i915_private *dev_priv = dev->dev_private; 120 struct drm_i915_private *dev_priv = to_i915(dev);
121 u32 val; 121 u32 val;
122 122
123 if (obj) { 123 if (obj) {
@@ -156,7 +156,7 @@ static void i915_write_fence_reg(struct drm_device *dev, int reg,
156static void i830_write_fence_reg(struct drm_device *dev, int reg, 156static void i830_write_fence_reg(struct drm_device *dev, int reg,
157 struct drm_i915_gem_object *obj) 157 struct drm_i915_gem_object *obj)
158{ 158{
159 struct drm_i915_private *dev_priv = dev->dev_private; 159 struct drm_i915_private *dev_priv = to_i915(dev);
160 uint32_t val; 160 uint32_t val;
161 161
162 if (obj) { 162 if (obj) {
@@ -193,7 +193,7 @@ inline static bool i915_gem_object_needs_mb(struct drm_i915_gem_object *obj)
193static void i915_gem_write_fence(struct drm_device *dev, int reg, 193static void i915_gem_write_fence(struct drm_device *dev, int reg,
194 struct drm_i915_gem_object *obj) 194 struct drm_i915_gem_object *obj)
195{ 195{
196 struct drm_i915_private *dev_priv = dev->dev_private; 196 struct drm_i915_private *dev_priv = to_i915(dev);
197 197
198 /* Ensure that all CPU reads are completed before installing a fence 198 /* Ensure that all CPU reads are completed before installing a fence
199 * and all writes before removing the fence. 199 * and all writes before removing the fence.
@@ -229,7 +229,7 @@ static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj,
229 struct drm_i915_fence_reg *fence, 229 struct drm_i915_fence_reg *fence,
230 bool enable) 230 bool enable)
231{ 231{
232 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 232 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
233 int reg = fence_number(dev_priv, fence); 233 int reg = fence_number(dev_priv, fence);
234 234
235 i915_gem_write_fence(obj->base.dev, reg, enable ? obj : NULL); 235 i915_gem_write_fence(obj->base.dev, reg, enable ? obj : NULL);
@@ -286,7 +286,7 @@ i915_gem_object_wait_fence(struct drm_i915_gem_object *obj)
286int 286int
287i915_gem_object_put_fence(struct drm_i915_gem_object *obj) 287i915_gem_object_put_fence(struct drm_i915_gem_object *obj)
288{ 288{
289 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 289 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
290 struct drm_i915_fence_reg *fence; 290 struct drm_i915_fence_reg *fence;
291 int ret; 291 int ret;
292 292
@@ -311,7 +311,7 @@ i915_gem_object_put_fence(struct drm_i915_gem_object *obj)
311static struct drm_i915_fence_reg * 311static struct drm_i915_fence_reg *
312i915_find_fence_reg(struct drm_device *dev) 312i915_find_fence_reg(struct drm_device *dev)
313{ 313{
314 struct drm_i915_private *dev_priv = dev->dev_private; 314 struct drm_i915_private *dev_priv = to_i915(dev);
315 struct drm_i915_fence_reg *reg, *avail; 315 struct drm_i915_fence_reg *reg, *avail;
316 int i; 316 int i;
317 317
@@ -367,7 +367,7 @@ int
367i915_gem_object_get_fence(struct drm_i915_gem_object *obj) 367i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
368{ 368{
369 struct drm_device *dev = obj->base.dev; 369 struct drm_device *dev = obj->base.dev;
370 struct drm_i915_private *dev_priv = dev->dev_private; 370 struct drm_i915_private *dev_priv = to_i915(dev);
371 bool enable = obj->tiling_mode != I915_TILING_NONE; 371 bool enable = obj->tiling_mode != I915_TILING_NONE;
372 struct drm_i915_fence_reg *reg; 372 struct drm_i915_fence_reg *reg;
373 int ret; 373 int ret;
@@ -433,7 +433,7 @@ bool
433i915_gem_object_pin_fence(struct drm_i915_gem_object *obj) 433i915_gem_object_pin_fence(struct drm_i915_gem_object *obj)
434{ 434{
435 if (obj->fence_reg != I915_FENCE_REG_NONE) { 435 if (obj->fence_reg != I915_FENCE_REG_NONE) {
436 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 436 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
437 struct i915_vma *ggtt_vma = i915_gem_obj_to_ggtt(obj); 437 struct i915_vma *ggtt_vma = i915_gem_obj_to_ggtt(obj);
438 438
439 WARN_ON(!ggtt_vma || 439 WARN_ON(!ggtt_vma ||
@@ -457,7 +457,7 @@ void
457i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj) 457i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj)
458{ 458{
459 if (obj->fence_reg != I915_FENCE_REG_NONE) { 459 if (obj->fence_reg != I915_FENCE_REG_NONE) {
460 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 460 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
461 WARN_ON(dev_priv->fence_regs[obj->fence_reg].pin_count <= 0); 461 WARN_ON(dev_priv->fence_regs[obj->fence_reg].pin_count <= 0);
462 dev_priv->fence_regs[obj->fence_reg].pin_count--; 462 dev_priv->fence_regs[obj->fence_reg].pin_count--;
463 } 463 }
@@ -472,7 +472,7 @@ i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj)
472 */ 472 */
473void i915_gem_restore_fences(struct drm_device *dev) 473void i915_gem_restore_fences(struct drm_device *dev)
474{ 474{
475 struct drm_i915_private *dev_priv = dev->dev_private; 475 struct drm_i915_private *dev_priv = to_i915(dev);
476 int i; 476 int i;
477 477
478 for (i = 0; i < dev_priv->num_fence_regs; i++) { 478 for (i = 0; i < dev_priv->num_fence_regs; i++) {
@@ -549,7 +549,7 @@ void i915_gem_restore_fences(struct drm_device *dev)
549void 549void
550i915_gem_detect_bit_6_swizzle(struct drm_device *dev) 550i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
551{ 551{
552 struct drm_i915_private *dev_priv = dev->dev_private; 552 struct drm_i915_private *dev_priv = to_i915(dev);
553 uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN; 553 uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
554 uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN; 554 uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
555 555
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0bb18b88dc7a..cf6fdcb147c6 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1732,7 +1732,7 @@ static int gen6_mm_switch(struct i915_hw_ppgtt *ppgtt,
1732{ 1732{
1733 struct intel_engine_cs *engine = req->engine; 1733 struct intel_engine_cs *engine = req->engine;
1734 struct drm_device *dev = ppgtt->base.dev; 1734 struct drm_device *dev = ppgtt->base.dev;
1735 struct drm_i915_private *dev_priv = dev->dev_private; 1735 struct drm_i915_private *dev_priv = to_i915(dev);
1736 1736
1737 1737
1738 I915_WRITE(RING_PP_DIR_DCLV(engine), PP_DIR_DCLV_2G); 1738 I915_WRITE(RING_PP_DIR_DCLV(engine), PP_DIR_DCLV_2G);
@@ -1745,7 +1745,7 @@ static int gen6_mm_switch(struct i915_hw_ppgtt *ppgtt,
1745 1745
1746static void gen8_ppgtt_enable(struct drm_device *dev) 1746static void gen8_ppgtt_enable(struct drm_device *dev)
1747{ 1747{
1748 struct drm_i915_private *dev_priv = dev->dev_private; 1748 struct drm_i915_private *dev_priv = to_i915(dev);
1749 struct intel_engine_cs *engine; 1749 struct intel_engine_cs *engine;
1750 1750
1751 for_each_engine(engine, dev_priv) { 1751 for_each_engine(engine, dev_priv) {
@@ -1757,7 +1757,7 @@ static void gen8_ppgtt_enable(struct drm_device *dev)
1757 1757
1758static void gen7_ppgtt_enable(struct drm_device *dev) 1758static void gen7_ppgtt_enable(struct drm_device *dev)
1759{ 1759{
1760 struct drm_i915_private *dev_priv = dev->dev_private; 1760 struct drm_i915_private *dev_priv = to_i915(dev);
1761 struct intel_engine_cs *engine; 1761 struct intel_engine_cs *engine;
1762 uint32_t ecochk, ecobits; 1762 uint32_t ecochk, ecobits;
1763 1763
@@ -1782,7 +1782,7 @@ static void gen7_ppgtt_enable(struct drm_device *dev)
1782 1782
1783static void gen6_ppgtt_enable(struct drm_device *dev) 1783static void gen6_ppgtt_enable(struct drm_device *dev)
1784{ 1784{
1785 struct drm_i915_private *dev_priv = dev->dev_private; 1785 struct drm_i915_private *dev_priv = to_i915(dev);
1786 uint32_t ecochk, gab_ctl, ecobits; 1786 uint32_t ecochk, gab_ctl, ecobits;
1787 1787
1788 ecobits = I915_READ(GAC_ECO_BITS); 1788 ecobits = I915_READ(GAC_ECO_BITS);
@@ -2142,7 +2142,7 @@ static void i915_address_space_init(struct i915_address_space *vm,
2142 2142
2143static void gtt_write_workarounds(struct drm_device *dev) 2143static void gtt_write_workarounds(struct drm_device *dev)
2144{ 2144{
2145 struct drm_i915_private *dev_priv = dev->dev_private; 2145 struct drm_i915_private *dev_priv = to_i915(dev);
2146 2146
2147 /* This function is for gtt related workarounds. This function is 2147 /* This function is for gtt related workarounds. This function is
2148 * called on driver load and after a GPU reset, so you can place 2148 * called on driver load and after a GPU reset, so you can place
@@ -2161,7 +2161,7 @@ static void gtt_write_workarounds(struct drm_device *dev)
2161 2161
2162static int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt) 2162static int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
2163{ 2163{
2164 struct drm_i915_private *dev_priv = dev->dev_private; 2164 struct drm_i915_private *dev_priv = to_i915(dev);
2165 int ret = 0; 2165 int ret = 0;
2166 2166
2167 ret = __hw_ppgtt_init(dev, ppgtt); 2167 ret = __hw_ppgtt_init(dev, ppgtt);
@@ -2611,7 +2611,7 @@ static void i915_ggtt_insert_entries(struct i915_address_space *vm,
2611 uint64_t start, 2611 uint64_t start,
2612 enum i915_cache_level cache_level, u32 unused) 2612 enum i915_cache_level cache_level, u32 unused)
2613{ 2613{
2614 struct drm_i915_private *dev_priv = vm->dev->dev_private; 2614 struct drm_i915_private *dev_priv = to_i915(vm->dev);
2615 unsigned int flags = (cache_level == I915_CACHE_NONE) ? 2615 unsigned int flags = (cache_level == I915_CACHE_NONE) ?
2616 AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY; 2616 AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
2617 int rpm_atomic_seq; 2617 int rpm_atomic_seq;
@@ -2629,7 +2629,7 @@ static void i915_ggtt_clear_range(struct i915_address_space *vm,
2629 uint64_t length, 2629 uint64_t length,
2630 bool unused) 2630 bool unused)
2631{ 2631{
2632 struct drm_i915_private *dev_priv = vm->dev->dev_private; 2632 struct drm_i915_private *dev_priv = to_i915(vm->dev);
2633 unsigned first_entry = start >> PAGE_SHIFT; 2633 unsigned first_entry = start >> PAGE_SHIFT;
2634 unsigned num_entries = length >> PAGE_SHIFT; 2634 unsigned num_entries = length >> PAGE_SHIFT;
2635 int rpm_atomic_seq; 2635 int rpm_atomic_seq;
@@ -2710,7 +2710,7 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma,
2710static void ggtt_unbind_vma(struct i915_vma *vma) 2710static void ggtt_unbind_vma(struct i915_vma *vma)
2711{ 2711{
2712 struct drm_device *dev = vma->vm->dev; 2712 struct drm_device *dev = vma->vm->dev;
2713 struct drm_i915_private *dev_priv = dev->dev_private; 2713 struct drm_i915_private *dev_priv = to_i915(dev);
2714 struct drm_i915_gem_object *obj = vma->obj; 2714 struct drm_i915_gem_object *obj = vma->obj;
2715 const uint64_t size = min_t(uint64_t, 2715 const uint64_t size = min_t(uint64_t,
2716 obj->base.size, 2716 obj->base.size,
@@ -2736,7 +2736,7 @@ static void ggtt_unbind_vma(struct i915_vma *vma)
2736void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj) 2736void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj)
2737{ 2737{
2738 struct drm_device *dev = obj->base.dev; 2738 struct drm_device *dev = obj->base.dev;
2739 struct drm_i915_private *dev_priv = dev->dev_private; 2739 struct drm_i915_private *dev_priv = to_i915(dev);
2740 bool interruptible; 2740 bool interruptible;
2741 2741
2742 interruptible = do_idling(dev_priv); 2742 interruptible = do_idling(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index e9cd82290408..66be299a1486 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -270,7 +270,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
270 270
271void i915_gem_cleanup_stolen(struct drm_device *dev) 271void i915_gem_cleanup_stolen(struct drm_device *dev)
272{ 272{
273 struct drm_i915_private *dev_priv = dev->dev_private; 273 struct drm_i915_private *dev_priv = to_i915(dev);
274 274
275 if (!drm_mm_initialized(&dev_priv->mm.stolen)) 275 if (!drm_mm_initialized(&dev_priv->mm.stolen))
276 return; 276 return;
@@ -550,7 +550,7 @@ static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj)
550static void 550static void
551i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) 551i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)
552{ 552{
553 struct drm_i915_private *dev_priv = obj->base.dev->dev_private; 553 struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
554 554
555 if (obj->stolen) { 555 if (obj->stolen) {
556 i915_gem_stolen_remove_node(dev_priv, obj->stolen); 556 i915_gem_stolen_remove_node(dev_priv, obj->stolen);
@@ -601,7 +601,7 @@ cleanup:
601struct drm_i915_gem_object * 601struct drm_i915_gem_object *
602i915_gem_object_create_stolen(struct drm_device *dev, u32 size) 602i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
603{ 603{
604 struct drm_i915_private *dev_priv = dev->dev_private; 604 struct drm_i915_private *dev_priv = to_i915(dev);
605 struct drm_i915_gem_object *obj; 605 struct drm_i915_gem_object *obj;
606 struct drm_mm_node *stolen; 606 struct drm_mm_node *stolen;
607 int ret; 607 int ret;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index a6eb5c47a49c..8030199731db 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -162,7 +162,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
162 struct drm_file *file) 162 struct drm_file *file)
163{ 163{
164 struct drm_i915_gem_set_tiling *args = data; 164 struct drm_i915_gem_set_tiling *args = data;
165 struct drm_i915_private *dev_priv = dev->dev_private; 165 struct drm_i915_private *dev_priv = to_i915(dev);
166 struct drm_i915_gem_object *obj; 166 struct drm_i915_gem_object *obj;
167 int ret = 0; 167 int ret = 0;
168 168
@@ -294,7 +294,7 @@ i915_gem_get_tiling(struct drm_device *dev, void *data,
294 struct drm_file *file) 294 struct drm_file *file)
295{ 295{
296 struct drm_i915_gem_get_tiling *args = data; 296 struct drm_i915_gem_get_tiling *args = data;
297 struct drm_i915_private *dev_priv = dev->dev_private; 297 struct drm_i915_private *dev_priv = to_i915(dev);
298 struct drm_i915_gem_object *obj; 298 struct drm_i915_gem_object *obj;
299 299
300 obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 300 obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index c6e05cccbedf..1d9aa3e6a334 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -332,7 +332,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
332 const struct i915_error_state_file_priv *error_priv) 332 const struct i915_error_state_file_priv *error_priv)
333{ 333{
334 struct drm_device *dev = error_priv->dev; 334 struct drm_device *dev = error_priv->dev;
335 struct drm_i915_private *dev_priv = dev->dev_private; 335 struct drm_i915_private *dev_priv = to_i915(dev);
336 struct drm_i915_error_state *error = error_priv->error; 336 struct drm_i915_error_state *error = error_priv->error;
337 struct drm_i915_error_object *obj; 337 struct drm_i915_error_object *obj;
338 int i, j, offset, elt; 338 int i, j, offset, elt;
@@ -1451,7 +1451,7 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,
1451void i915_error_state_get(struct drm_device *dev, 1451void i915_error_state_get(struct drm_device *dev,
1452 struct i915_error_state_file_priv *error_priv) 1452 struct i915_error_state_file_priv *error_priv)
1453{ 1453{
1454 struct drm_i915_private *dev_priv = dev->dev_private; 1454 struct drm_i915_private *dev_priv = to_i915(dev);
1455 1455
1456 spin_lock_irq(&dev_priv->gpu_error.lock); 1456 spin_lock_irq(&dev_priv->gpu_error.lock);
1457 error_priv->error = dev_priv->gpu_error.first_error; 1457 error_priv->error = dev_priv->gpu_error.first_error;
@@ -1469,7 +1469,7 @@ void i915_error_state_put(struct i915_error_state_file_priv *error_priv)
1469 1469
1470void i915_destroy_error_state(struct drm_device *dev) 1470void i915_destroy_error_state(struct drm_device *dev)
1471{ 1471{
1472 struct drm_i915_private *dev_priv = dev->dev_private; 1472 struct drm_i915_private *dev_priv = to_i915(dev);
1473 struct drm_i915_error_state *error; 1473 struct drm_i915_error_state *error;
1474 1474
1475 spin_lock_irq(&dev_priv->gpu_error.lock); 1475 spin_lock_irq(&dev_priv->gpu_error.lock);
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 355b6475e74c..3f9e3fe98faf 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -1033,7 +1033,7 @@ void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
1033 */ 1033 */
1034int intel_guc_suspend(struct drm_device *dev) 1034int intel_guc_suspend(struct drm_device *dev)
1035{ 1035{
1036 struct drm_i915_private *dev_priv = dev->dev_private; 1036 struct drm_i915_private *dev_priv = to_i915(dev);
1037 struct intel_guc *guc = &dev_priv->guc; 1037 struct intel_guc *guc = &dev_priv->guc;
1038 struct i915_gem_context *ctx; 1038 struct i915_gem_context *ctx;
1039 u32 data[3]; 1039 u32 data[3];
@@ -1059,7 +1059,7 @@ int intel_guc_suspend(struct drm_device *dev)
1059 */ 1059 */
1060int intel_guc_resume(struct drm_device *dev) 1060int intel_guc_resume(struct drm_device *dev)
1061{ 1061{
1062 struct drm_i915_private *dev_priv = dev->dev_private; 1062 struct drm_i915_private *dev_priv = to_i915(dev);
1063 struct intel_guc *guc = &dev_priv->guc; 1063 struct intel_guc *guc = &dev_priv->guc;
1064 struct i915_gem_context *ctx; 1064 struct i915_gem_context *ctx;
1065 u32 data[3]; 1065 u32 data[3];
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f0535df41dfd..f6de8dd567a2 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -667,7 +667,7 @@ static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
667 */ 667 */
668static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe) 668static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
669{ 669{
670 struct drm_i915_private *dev_priv = dev->dev_private; 670 struct drm_i915_private *dev_priv = to_i915(dev);
671 i915_reg_t high_frame, low_frame; 671 i915_reg_t high_frame, low_frame;
672 u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal; 672 u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal;
673 struct intel_crtc *intel_crtc = 673 struct intel_crtc *intel_crtc =
@@ -714,7 +714,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
714 714
715static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe) 715static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
716{ 716{
717 struct drm_i915_private *dev_priv = dev->dev_private; 717 struct drm_i915_private *dev_priv = to_i915(dev);
718 718
719 return I915_READ(PIPE_FRMCOUNT_G4X(pipe)); 719 return I915_READ(PIPE_FRMCOUNT_G4X(pipe));
720} 720}
@@ -723,7 +723,7 @@ static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
723static int __intel_get_crtc_scanline(struct intel_crtc *crtc) 723static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
724{ 724{
725 struct drm_device *dev = crtc->base.dev; 725 struct drm_device *dev = crtc->base.dev;
726 struct drm_i915_private *dev_priv = dev->dev_private; 726 struct drm_i915_private *dev_priv = to_i915(dev);
727 const struct drm_display_mode *mode = &crtc->base.hwmode; 727 const struct drm_display_mode *mode = &crtc->base.hwmode;
728 enum pipe pipe = crtc->pipe; 728 enum pipe pipe = crtc->pipe;
729 int position, vtotal; 729 int position, vtotal;
@@ -775,7 +775,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
775 ktime_t *stime, ktime_t *etime, 775 ktime_t *stime, ktime_t *etime,
776 const struct drm_display_mode *mode) 776 const struct drm_display_mode *mode)
777{ 777{
778 struct drm_i915_private *dev_priv = dev->dev_private; 778 struct drm_i915_private *dev_priv = to_i915(dev);
779 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; 779 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
780 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 780 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
781 int position; 781 int position;
@@ -896,7 +896,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
896 896
897int intel_get_crtc_scanline(struct intel_crtc *crtc) 897int intel_get_crtc_scanline(struct intel_crtc *crtc)
898{ 898{
899 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 899 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
900 unsigned long irqflags; 900 unsigned long irqflags;
901 int position; 901 int position;
902 902
@@ -1744,7 +1744,7 @@ static void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv,
1744static irqreturn_t valleyview_irq_handler(int irq, void *arg) 1744static irqreturn_t valleyview_irq_handler(int irq, void *arg)
1745{ 1745{
1746 struct drm_device *dev = arg; 1746 struct drm_device *dev = arg;
1747 struct drm_i915_private *dev_priv = dev->dev_private; 1747 struct drm_i915_private *dev_priv = to_i915(dev);
1748 irqreturn_t ret = IRQ_NONE; 1748 irqreturn_t ret = IRQ_NONE;
1749 1749
1750 if (!intel_irqs_enabled(dev_priv)) 1750 if (!intel_irqs_enabled(dev_priv))
@@ -1827,7 +1827,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
1827static irqreturn_t cherryview_irq_handler(int irq, void *arg) 1827static irqreturn_t cherryview_irq_handler(int irq, void *arg)
1828{ 1828{
1829 struct drm_device *dev = arg; 1829 struct drm_device *dev = arg;
1830 struct drm_i915_private *dev_priv = dev->dev_private; 1830 struct drm_i915_private *dev_priv = to_i915(dev);
1831 irqreturn_t ret = IRQ_NONE; 1831 irqreturn_t ret = IRQ_NONE;
1832 1832
1833 if (!intel_irqs_enabled(dev_priv)) 1833 if (!intel_irqs_enabled(dev_priv))
@@ -2212,7 +2212,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
2212static irqreturn_t ironlake_irq_handler(int irq, void *arg) 2212static irqreturn_t ironlake_irq_handler(int irq, void *arg)
2213{ 2213{
2214 struct drm_device *dev = arg; 2214 struct drm_device *dev = arg;
2215 struct drm_i915_private *dev_priv = dev->dev_private; 2215 struct drm_i915_private *dev_priv = to_i915(dev);
2216 u32 de_iir, gt_iir, de_ier, sde_ier = 0; 2216 u32 de_iir, gt_iir, de_ier, sde_ier = 0;
2217 irqreturn_t ret = IRQ_NONE; 2217 irqreturn_t ret = IRQ_NONE;
2218 2218
@@ -2444,7 +2444,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
2444static irqreturn_t gen8_irq_handler(int irq, void *arg) 2444static irqreturn_t gen8_irq_handler(int irq, void *arg)
2445{ 2445{
2446 struct drm_device *dev = arg; 2446 struct drm_device *dev = arg;
2447 struct drm_i915_private *dev_priv = dev->dev_private; 2447 struct drm_i915_private *dev_priv = to_i915(dev);
2448 u32 master_ctl; 2448 u32 master_ctl;
2449 u32 gt_iir[4] = {}; 2449 u32 gt_iir[4] = {};
2450 irqreturn_t ret; 2450 irqreturn_t ret;
@@ -2701,7 +2701,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv,
2701 */ 2701 */
2702static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe) 2702static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)
2703{ 2703{
2704 struct drm_i915_private *dev_priv = dev->dev_private; 2704 struct drm_i915_private *dev_priv = to_i915(dev);
2705 unsigned long irqflags; 2705 unsigned long irqflags;
2706 2706
2707 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2707 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2718,7 +2718,7 @@ static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)
2718 2718
2719static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe) 2719static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)
2720{ 2720{
2721 struct drm_i915_private *dev_priv = dev->dev_private; 2721 struct drm_i915_private *dev_priv = to_i915(dev);
2722 unsigned long irqflags; 2722 unsigned long irqflags;
2723 uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) : 2723 uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) :
2724 DE_PIPE_VBLANK(pipe); 2724 DE_PIPE_VBLANK(pipe);
@@ -2732,7 +2732,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)
2732 2732
2733static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe) 2733static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe)
2734{ 2734{
2735 struct drm_i915_private *dev_priv = dev->dev_private; 2735 struct drm_i915_private *dev_priv = to_i915(dev);
2736 unsigned long irqflags; 2736 unsigned long irqflags;
2737 2737
2738 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2738 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2745,7 +2745,7 @@ static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe)
2745 2745
2746static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe) 2746static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe)
2747{ 2747{
2748 struct drm_i915_private *dev_priv = dev->dev_private; 2748 struct drm_i915_private *dev_priv = to_i915(dev);
2749 unsigned long irqflags; 2749 unsigned long irqflags;
2750 2750
2751 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2751 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2760,7 +2760,7 @@ static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe)
2760 */ 2760 */
2761static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe) 2761static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)
2762{ 2762{
2763 struct drm_i915_private *dev_priv = dev->dev_private; 2763 struct drm_i915_private *dev_priv = to_i915(dev);
2764 unsigned long irqflags; 2764 unsigned long irqflags;
2765 2765
2766 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2766 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2772,7 +2772,7 @@ static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)
2772 2772
2773static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe) 2773static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
2774{ 2774{
2775 struct drm_i915_private *dev_priv = dev->dev_private; 2775 struct drm_i915_private *dev_priv = to_i915(dev);
2776 unsigned long irqflags; 2776 unsigned long irqflags;
2777 uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) : 2777 uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) :
2778 DE_PIPE_VBLANK(pipe); 2778 DE_PIPE_VBLANK(pipe);
@@ -2784,7 +2784,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
2784 2784
2785static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe) 2785static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)
2786{ 2786{
2787 struct drm_i915_private *dev_priv = dev->dev_private; 2787 struct drm_i915_private *dev_priv = to_i915(dev);
2788 unsigned long irqflags; 2788 unsigned long irqflags;
2789 2789
2790 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2790 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2795,7 +2795,7 @@ static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)
2795 2795
2796static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe) 2796static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
2797{ 2797{
2798 struct drm_i915_private *dev_priv = dev->dev_private; 2798 struct drm_i915_private *dev_priv = to_i915(dev);
2799 unsigned long irqflags; 2799 unsigned long irqflags;
2800 2800
2801 spin_lock_irqsave(&dev_priv->irq_lock, irqflags); 2801 spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -3214,7 +3214,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)
3214 3214
3215static void ibx_irq_reset(struct drm_device *dev) 3215static void ibx_irq_reset(struct drm_device *dev)
3216{ 3216{
3217 struct drm_i915_private *dev_priv = dev->dev_private; 3217 struct drm_i915_private *dev_priv = to_i915(dev);
3218 3218
3219 if (HAS_PCH_NOP(dev)) 3219 if (HAS_PCH_NOP(dev))
3220 return; 3220 return;
@@ -3235,7 +3235,7 @@ static void ibx_irq_reset(struct drm_device *dev)
3235 */ 3235 */
3236static void ibx_irq_pre_postinstall(struct drm_device *dev) 3236static void ibx_irq_pre_postinstall(struct drm_device *dev)
3237{ 3237{
3238 struct drm_i915_private *dev_priv = dev->dev_private; 3238 struct drm_i915_private *dev_priv = to_i915(dev);
3239 3239
3240 if (HAS_PCH_NOP(dev)) 3240 if (HAS_PCH_NOP(dev))
3241 return; 3241 return;
@@ -3247,7 +3247,7 @@ static void ibx_irq_pre_postinstall(struct drm_device *dev)
3247 3247
3248static void gen5_gt_irq_reset(struct drm_device *dev) 3248static void gen5_gt_irq_reset(struct drm_device *dev)
3249{ 3249{
3250 struct drm_i915_private *dev_priv = dev->dev_private; 3250 struct drm_i915_private *dev_priv = to_i915(dev);
3251 3251
3252 GEN5_IRQ_RESET(GT); 3252 GEN5_IRQ_RESET(GT);
3253 if (INTEL_INFO(dev)->gen >= 6) 3253 if (INTEL_INFO(dev)->gen >= 6)
@@ -3307,7 +3307,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
3307*/ 3307*/
3308static void ironlake_irq_reset(struct drm_device *dev) 3308static void ironlake_irq_reset(struct drm_device *dev)
3309{ 3309{
3310 struct drm_i915_private *dev_priv = dev->dev_private; 3310 struct drm_i915_private *dev_priv = to_i915(dev);
3311 3311
3312 I915_WRITE(HWSTAM, 0xffffffff); 3312 I915_WRITE(HWSTAM, 0xffffffff);
3313 3313
@@ -3322,7 +3322,7 @@ static void ironlake_irq_reset(struct drm_device *dev)
3322 3322
3323static void valleyview_irq_preinstall(struct drm_device *dev) 3323static void valleyview_irq_preinstall(struct drm_device *dev)
3324{ 3324{
3325 struct drm_i915_private *dev_priv = dev->dev_private; 3325 struct drm_i915_private *dev_priv = to_i915(dev);
3326 3326
3327 I915_WRITE(VLV_MASTER_IER, 0); 3327 I915_WRITE(VLV_MASTER_IER, 0);
3328 POSTING_READ(VLV_MASTER_IER); 3328 POSTING_READ(VLV_MASTER_IER);
@@ -3345,7 +3345,7 @@ static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)
3345 3345
3346static void gen8_irq_reset(struct drm_device *dev) 3346static void gen8_irq_reset(struct drm_device *dev)
3347{ 3347{
3348 struct drm_i915_private *dev_priv = dev->dev_private; 3348 struct drm_i915_private *dev_priv = to_i915(dev);
3349 int pipe; 3349 int pipe;
3350 3350
3351 I915_WRITE(GEN8_MASTER_IRQ, 0); 3351 I915_WRITE(GEN8_MASTER_IRQ, 0);
@@ -3396,7 +3396,7 @@ void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
3396 3396
3397static void cherryview_irq_preinstall(struct drm_device *dev) 3397static void cherryview_irq_preinstall(struct drm_device *dev)
3398{ 3398{
3399 struct drm_i915_private *dev_priv = dev->dev_private; 3399 struct drm_i915_private *dev_priv = to_i915(dev);
3400 3400
3401 I915_WRITE(GEN8_MASTER_IRQ, 0); 3401 I915_WRITE(GEN8_MASTER_IRQ, 0);
3402 POSTING_READ(GEN8_MASTER_IRQ); 3402 POSTING_READ(GEN8_MASTER_IRQ);
@@ -3548,7 +3548,7 @@ static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
3548 3548
3549static void ibx_irq_postinstall(struct drm_device *dev) 3549static void ibx_irq_postinstall(struct drm_device *dev)
3550{ 3550{
3551 struct drm_i915_private *dev_priv = dev->dev_private; 3551 struct drm_i915_private *dev_priv = to_i915(dev);
3552 u32 mask; 3552 u32 mask;
3553 3553
3554 if (HAS_PCH_NOP(dev)) 3554 if (HAS_PCH_NOP(dev))
@@ -3565,7 +3565,7 @@ static void ibx_irq_postinstall(struct drm_device *dev)
3565 3565
3566static void gen5_gt_irq_postinstall(struct drm_device *dev) 3566static void gen5_gt_irq_postinstall(struct drm_device *dev)
3567{ 3567{
3568 struct drm_i915_private *dev_priv = dev->dev_private; 3568 struct drm_i915_private *dev_priv = to_i915(dev);
3569 u32 pm_irqs, gt_irqs; 3569 u32 pm_irqs, gt_irqs;
3570 3570
3571 pm_irqs = gt_irqs = 0; 3571 pm_irqs = gt_irqs = 0;
@@ -3601,7 +3601,7 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev)
3601 3601
3602static int ironlake_irq_postinstall(struct drm_device *dev) 3602static int ironlake_irq_postinstall(struct drm_device *dev)
3603{ 3603{
3604 struct drm_i915_private *dev_priv = dev->dev_private; 3604 struct drm_i915_private *dev_priv = to_i915(dev);
3605 u32 display_mask, extra_mask; 3605 u32 display_mask, extra_mask;
3606 3606
3607 if (INTEL_INFO(dev)->gen >= 7) { 3607 if (INTEL_INFO(dev)->gen >= 7) {
@@ -3680,7 +3680,7 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
3680 3680
3681static int valleyview_irq_postinstall(struct drm_device *dev) 3681static int valleyview_irq_postinstall(struct drm_device *dev)
3682{ 3682{
3683 struct drm_i915_private *dev_priv = dev->dev_private; 3683 struct drm_i915_private *dev_priv = to_i915(dev);
3684 3684
3685 gen5_gt_irq_postinstall(dev); 3685 gen5_gt_irq_postinstall(dev);
3686 3686
@@ -3773,7 +3773,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
3773 3773
3774static int gen8_irq_postinstall(struct drm_device *dev) 3774static int gen8_irq_postinstall(struct drm_device *dev)
3775{ 3775{
3776 struct drm_i915_private *dev_priv = dev->dev_private; 3776 struct drm_i915_private *dev_priv = to_i915(dev);
3777 3777
3778 if (HAS_PCH_SPLIT(dev)) 3778 if (HAS_PCH_SPLIT(dev))
3779 ibx_irq_pre_postinstall(dev); 3779 ibx_irq_pre_postinstall(dev);
@@ -3792,7 +3792,7 @@ static int gen8_irq_postinstall(struct drm_device *dev)
3792 3792
3793static int cherryview_irq_postinstall(struct drm_device *dev) 3793static int cherryview_irq_postinstall(struct drm_device *dev)
3794{ 3794{
3795 struct drm_i915_private *dev_priv = dev->dev_private; 3795 struct drm_i915_private *dev_priv = to_i915(dev);
3796 3796
3797 gen8_gt_irq_postinstall(dev_priv); 3797 gen8_gt_irq_postinstall(dev_priv);
3798 3798
@@ -3809,7 +3809,7 @@ static int cherryview_irq_postinstall(struct drm_device *dev)
3809 3809
3810static void gen8_irq_uninstall(struct drm_device *dev) 3810static void gen8_irq_uninstall(struct drm_device *dev)
3811{ 3811{
3812 struct drm_i915_private *dev_priv = dev->dev_private; 3812 struct drm_i915_private *dev_priv = to_i915(dev);
3813 3813
3814 if (!dev_priv) 3814 if (!dev_priv)
3815 return; 3815 return;
@@ -3819,7 +3819,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)
3819 3819
3820static void valleyview_irq_uninstall(struct drm_device *dev) 3820static void valleyview_irq_uninstall(struct drm_device *dev)
3821{ 3821{
3822 struct drm_i915_private *dev_priv = dev->dev_private; 3822 struct drm_i915_private *dev_priv = to_i915(dev);
3823 3823
3824 if (!dev_priv) 3824 if (!dev_priv)
3825 return; 3825 return;
@@ -3839,7 +3839,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
3839 3839
3840static void cherryview_irq_uninstall(struct drm_device *dev) 3840static void cherryview_irq_uninstall(struct drm_device *dev)
3841{ 3841{
3842 struct drm_i915_private *dev_priv = dev->dev_private; 3842 struct drm_i915_private *dev_priv = to_i915(dev);
3843 3843
3844 if (!dev_priv) 3844 if (!dev_priv)
3845 return; 3845 return;
@@ -3859,7 +3859,7 @@ static void cherryview_irq_uninstall(struct drm_device *dev)
3859 3859
3860static void ironlake_irq_uninstall(struct drm_device *dev) 3860static void ironlake_irq_uninstall(struct drm_device *dev)
3861{ 3861{
3862 struct drm_i915_private *dev_priv = dev->dev_private; 3862 struct drm_i915_private *dev_priv = to_i915(dev);
3863 3863
3864 if (!dev_priv) 3864 if (!dev_priv)
3865 return; 3865 return;
@@ -3869,7 +3869,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
3869 3869
3870static void i8xx_irq_preinstall(struct drm_device * dev) 3870static void i8xx_irq_preinstall(struct drm_device * dev)
3871{ 3871{
3872 struct drm_i915_private *dev_priv = dev->dev_private; 3872 struct drm_i915_private *dev_priv = to_i915(dev);
3873 int pipe; 3873 int pipe;
3874 3874
3875 for_each_pipe(dev_priv, pipe) 3875 for_each_pipe(dev_priv, pipe)
@@ -3881,7 +3881,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
3881 3881
3882static int i8xx_irq_postinstall(struct drm_device *dev) 3882static int i8xx_irq_postinstall(struct drm_device *dev)
3883{ 3883{
3884 struct drm_i915_private *dev_priv = dev->dev_private; 3884 struct drm_i915_private *dev_priv = to_i915(dev);
3885 3885
3886 I915_WRITE16(EMR, 3886 I915_WRITE16(EMR,
3887 ~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH)); 3887 ~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH));
@@ -3944,7 +3944,7 @@ check_page_flip:
3944static irqreturn_t i8xx_irq_handler(int irq, void *arg) 3944static irqreturn_t i8xx_irq_handler(int irq, void *arg)
3945{ 3945{
3946 struct drm_device *dev = arg; 3946 struct drm_device *dev = arg;
3947 struct drm_i915_private *dev_priv = dev->dev_private; 3947 struct drm_i915_private *dev_priv = to_i915(dev);
3948 u16 iir, new_iir; 3948 u16 iir, new_iir;
3949 u32 pipe_stats[2]; 3949 u32 pipe_stats[2];
3950 int pipe; 3950 int pipe;
@@ -4021,7 +4021,7 @@ out:
4021 4021
4022static void i8xx_irq_uninstall(struct drm_device * dev) 4022static void i8xx_irq_uninstall(struct drm_device * dev)
4023{ 4023{
4024 struct drm_i915_private *dev_priv = dev->dev_private; 4024 struct drm_i915_private *dev_priv = to_i915(dev);
4025 int pipe; 4025 int pipe;
4026 4026
4027 for_each_pipe(dev_priv, pipe) { 4027 for_each_pipe(dev_priv, pipe) {
@@ -4036,7 +4036,7 @@ static void i8xx_irq_uninstall(struct drm_device * dev)
4036 4036
4037static void i915_irq_preinstall(struct drm_device * dev) 4037static void i915_irq_preinstall(struct drm_device * dev)
4038{ 4038{
4039 struct drm_i915_private *dev_priv = dev->dev_private; 4039 struct drm_i915_private *dev_priv = to_i915(dev);
4040 int pipe; 4040 int pipe;
4041 4041
4042 if (I915_HAS_HOTPLUG(dev)) { 4042 if (I915_HAS_HOTPLUG(dev)) {
@@ -4054,7 +4054,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
4054 4054
4055static int i915_irq_postinstall(struct drm_device *dev) 4055static int i915_irq_postinstall(struct drm_device *dev)
4056{ 4056{
4057 struct drm_i915_private *dev_priv = dev->dev_private; 4057 struct drm_i915_private *dev_priv = to_i915(dev);
4058 u32 enable_mask; 4058 u32 enable_mask;
4059 4059
4060 I915_WRITE(EMR, ~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH)); 4060 I915_WRITE(EMR, ~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH));
@@ -4133,7 +4133,7 @@ check_page_flip:
4133static irqreturn_t i915_irq_handler(int irq, void *arg) 4133static irqreturn_t i915_irq_handler(int irq, void *arg)
4134{ 4134{
4135 struct drm_device *dev = arg; 4135 struct drm_device *dev = arg;
4136 struct drm_i915_private *dev_priv = dev->dev_private; 4136 struct drm_i915_private *dev_priv = to_i915(dev);
4137 u32 iir, new_iir, pipe_stats[I915_MAX_PIPES]; 4137 u32 iir, new_iir, pipe_stats[I915_MAX_PIPES];
4138 u32 flip_mask = 4138 u32 flip_mask =
4139 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | 4139 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
@@ -4238,7 +4238,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
4238 4238
4239static void i915_irq_uninstall(struct drm_device * dev) 4239static void i915_irq_uninstall(struct drm_device * dev)
4240{ 4240{
4241 struct drm_i915_private *dev_priv = dev->dev_private; 4241 struct drm_i915_private *dev_priv = to_i915(dev);
4242 int pipe; 4242 int pipe;
4243 4243
4244 if (I915_HAS_HOTPLUG(dev)) { 4244 if (I915_HAS_HOTPLUG(dev)) {
@@ -4260,7 +4260,7 @@ static void i915_irq_uninstall(struct drm_device * dev)
4260 4260
4261static void i965_irq_preinstall(struct drm_device * dev) 4261static void i965_irq_preinstall(struct drm_device * dev)
4262{ 4262{
4263 struct drm_i915_private *dev_priv = dev->dev_private; 4263 struct drm_i915_private *dev_priv = to_i915(dev);
4264 int pipe; 4264 int pipe;
4265 4265
4266 i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0); 4266 i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
@@ -4276,7 +4276,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
4276 4276
4277static int i965_irq_postinstall(struct drm_device *dev) 4277static int i965_irq_postinstall(struct drm_device *dev)
4278{ 4278{
4279 struct drm_i915_private *dev_priv = dev->dev_private; 4279 struct drm_i915_private *dev_priv = to_i915(dev);
4280 u32 enable_mask; 4280 u32 enable_mask;
4281 u32 error_mask; 4281 u32 error_mask;
4282 4282
@@ -4360,7 +4360,7 @@ static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
4360static irqreturn_t i965_irq_handler(int irq, void *arg) 4360static irqreturn_t i965_irq_handler(int irq, void *arg)
4361{ 4361{
4362 struct drm_device *dev = arg; 4362 struct drm_device *dev = arg;
4363 struct drm_i915_private *dev_priv = dev->dev_private; 4363 struct drm_i915_private *dev_priv = to_i915(dev);
4364 u32 iir, new_iir; 4364 u32 iir, new_iir;
4365 u32 pipe_stats[I915_MAX_PIPES]; 4365 u32 pipe_stats[I915_MAX_PIPES];
4366 int ret = IRQ_NONE, pipe; 4366 int ret = IRQ_NONE, pipe;
@@ -4469,7 +4469,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
4469 4469
4470static void i965_irq_uninstall(struct drm_device * dev) 4470static void i965_irq_uninstall(struct drm_device * dev)
4471{ 4471{
4472 struct drm_i915_private *dev_priv = dev->dev_private; 4472 struct drm_i915_private *dev_priv = to_i915(dev);
4473 int pipe; 4473 int pipe;
4474 4474
4475 if (!dev_priv) 4475 if (!dev_priv)
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 34e061a9ef06..5cfe4c7716b4 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -31,7 +31,7 @@
31 31
32static void i915_save_display(struct drm_device *dev) 32static void i915_save_display(struct drm_device *dev)
33{ 33{
34 struct drm_i915_private *dev_priv = dev->dev_private; 34 struct drm_i915_private *dev_priv = to_i915(dev);
35 35
36 /* Display arbitration control */ 36 /* Display arbitration control */
37 if (INTEL_INFO(dev)->gen <= 4) 37 if (INTEL_INFO(dev)->gen <= 4)
@@ -63,7 +63,7 @@ static void i915_save_display(struct drm_device *dev)
63 63
64static void i915_restore_display(struct drm_device *dev) 64static void i915_restore_display(struct drm_device *dev)
65{ 65{
66 struct drm_i915_private *dev_priv = dev->dev_private; 66 struct drm_i915_private *dev_priv = to_i915(dev);
67 u32 mask = 0xffffffff; 67 u32 mask = 0xffffffff;
68 68
69 /* Display arbitration */ 69 /* Display arbitration */
@@ -103,7 +103,7 @@ static void i915_restore_display(struct drm_device *dev)
103 103
104int i915_save_state(struct drm_device *dev) 104int i915_save_state(struct drm_device *dev)
105{ 105{
106 struct drm_i915_private *dev_priv = dev->dev_private; 106 struct drm_i915_private *dev_priv = to_i915(dev);
107 int i; 107 int i;
108 108
109 mutex_lock(&dev->struct_mutex); 109 mutex_lock(&dev->struct_mutex);
@@ -148,7 +148,7 @@ int i915_save_state(struct drm_device *dev)
148 148
149int i915_restore_state(struct drm_device *dev) 149int i915_restore_state(struct drm_device *dev)
150{ 150{
151 struct drm_i915_private *dev_priv = dev->dev_private; 151 struct drm_i915_private *dev_priv = to_i915(dev);
152 int i; 152 int i;
153 153
154 mutex_lock(&dev->struct_mutex); 154 mutex_lock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index a6e90fe05a1e..d61829e54f93 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -38,7 +38,7 @@
38static u32 calc_residency(struct drm_device *dev, 38static u32 calc_residency(struct drm_device *dev,
39 i915_reg_t reg) 39 i915_reg_t reg)
40{ 40{
41 struct drm_i915_private *dev_priv = dev->dev_private; 41 struct drm_i915_private *dev_priv = to_i915(dev);
42 u64 raw_time; /* 32b value may overflow during fixed point math */ 42 u64 raw_time; /* 32b value may overflow during fixed point math */
43 u64 units = 128ULL, div = 100000ULL; 43 u64 units = 128ULL, div = 100000ULL;
44 u32 ret; 44 u32 ret;
@@ -166,7 +166,7 @@ i915_l3_read(struct file *filp, struct kobject *kobj,
166 struct device *dev = kobj_to_dev(kobj); 166 struct device *dev = kobj_to_dev(kobj);
167 struct drm_minor *dminor = dev_to_drm_minor(dev); 167 struct drm_minor *dminor = dev_to_drm_minor(dev);
168 struct drm_device *drm_dev = dminor->dev; 168 struct drm_device *drm_dev = dminor->dev;
169 struct drm_i915_private *dev_priv = drm_dev->dev_private; 169 struct drm_i915_private *dev_priv = to_i915(drm_dev);
170 int slice = (int)(uintptr_t)attr->private; 170 int slice = (int)(uintptr_t)attr->private;
171 int ret; 171 int ret;
172 172
@@ -202,7 +202,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj,
202 struct device *dev = kobj_to_dev(kobj); 202 struct device *dev = kobj_to_dev(kobj);
203 struct drm_minor *dminor = dev_to_drm_minor(dev); 203 struct drm_minor *dminor = dev_to_drm_minor(dev);
204 struct drm_device *drm_dev = dminor->dev; 204 struct drm_device *drm_dev = dminor->dev;
205 struct drm_i915_private *dev_priv = drm_dev->dev_private; 205 struct drm_i915_private *dev_priv = to_i915(drm_dev);
206 struct i915_gem_context *ctx; 206 struct i915_gem_context *ctx;
207 u32 *temp = NULL; /* Just here to make handling failures easy */ 207 u32 *temp = NULL; /* Just here to make handling failures easy */
208 int slice = (int)(uintptr_t)attr->private; 208 int slice = (int)(uintptr_t)attr->private;
@@ -268,7 +268,7 @@ static ssize_t gt_act_freq_mhz_show(struct device *kdev,
268{ 268{
269 struct drm_minor *minor = dev_to_drm_minor(kdev); 269 struct drm_minor *minor = dev_to_drm_minor(kdev);
270 struct drm_device *dev = minor->dev; 270 struct drm_device *dev = minor->dev;
271 struct drm_i915_private *dev_priv = dev->dev_private; 271 struct drm_i915_private *dev_priv = to_i915(dev);
272 int ret; 272 int ret;
273 273
274 flush_delayed_work(&dev_priv->rps.delayed_resume_work); 274 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
@@ -302,7 +302,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
302{ 302{
303 struct drm_minor *minor = dev_to_drm_minor(kdev); 303 struct drm_minor *minor = dev_to_drm_minor(kdev);
304 struct drm_device *dev = minor->dev; 304 struct drm_device *dev = minor->dev;
305 struct drm_i915_private *dev_priv = dev->dev_private; 305 struct drm_i915_private *dev_priv = to_i915(dev);
306 int ret; 306 int ret;
307 307
308 flush_delayed_work(&dev_priv->rps.delayed_resume_work); 308 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
@@ -323,7 +323,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
323{ 323{
324 struct drm_minor *minor = dev_to_drm_minor(kdev); 324 struct drm_minor *minor = dev_to_drm_minor(kdev);
325 struct drm_device *dev = minor->dev; 325 struct drm_device *dev = minor->dev;
326 struct drm_i915_private *dev_priv = dev->dev_private; 326 struct drm_i915_private *dev_priv = to_i915(dev);
327 327
328 return snprintf(buf, PAGE_SIZE, 328 return snprintf(buf, PAGE_SIZE,
329 "%d\n", 329 "%d\n",
@@ -334,7 +334,7 @@ static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute
334{ 334{
335 struct drm_minor *minor = dev_to_drm_minor(kdev); 335 struct drm_minor *minor = dev_to_drm_minor(kdev);
336 struct drm_device *dev = minor->dev; 336 struct drm_device *dev = minor->dev;
337 struct drm_i915_private *dev_priv = dev->dev_private; 337 struct drm_i915_private *dev_priv = to_i915(dev);
338 int ret; 338 int ret;
339 339
340 flush_delayed_work(&dev_priv->rps.delayed_resume_work); 340 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
@@ -352,7 +352,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,
352{ 352{
353 struct drm_minor *minor = dev_to_drm_minor(kdev); 353 struct drm_minor *minor = dev_to_drm_minor(kdev);
354 struct drm_device *dev = minor->dev; 354 struct drm_device *dev = minor->dev;
355 struct drm_i915_private *dev_priv = dev->dev_private; 355 struct drm_i915_private *dev_priv = to_i915(dev);
356 u32 val; 356 u32 val;
357 ssize_t ret; 357 ssize_t ret;
358 358
@@ -402,7 +402,7 @@ static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute
402{ 402{
403 struct drm_minor *minor = dev_to_drm_minor(kdev); 403 struct drm_minor *minor = dev_to_drm_minor(kdev);
404 struct drm_device *dev = minor->dev; 404 struct drm_device *dev = minor->dev;
405 struct drm_i915_private *dev_priv = dev->dev_private; 405 struct drm_i915_private *dev_priv = to_i915(dev);
406 int ret; 406 int ret;
407 407
408 flush_delayed_work(&dev_priv->rps.delayed_resume_work); 408 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
@@ -420,7 +420,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,
420{ 420{
421 struct drm_minor *minor = dev_to_drm_minor(kdev); 421 struct drm_minor *minor = dev_to_drm_minor(kdev);
422 struct drm_device *dev = minor->dev; 422 struct drm_device *dev = minor->dev;
423 struct drm_i915_private *dev_priv = dev->dev_private; 423 struct drm_i915_private *dev_priv = to_i915(dev);
424 u32 val; 424 u32 val;
425 ssize_t ret; 425 ssize_t ret;
426 426
@@ -480,7 +480,7 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr
480{ 480{
481 struct drm_minor *minor = dev_to_drm_minor(kdev); 481 struct drm_minor *minor = dev_to_drm_minor(kdev);
482 struct drm_device *dev = minor->dev; 482 struct drm_device *dev = minor->dev;
483 struct drm_i915_private *dev_priv = dev->dev_private; 483 struct drm_i915_private *dev_priv = to_i915(dev);
484 u32 val; 484 u32 val;
485 485
486 if (attr == &dev_attr_gt_RP0_freq_mhz) 486 if (attr == &dev_attr_gt_RP0_freq_mhz)
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index b9329c2a670a..e2e4d4c59e85 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -165,7 +165,7 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
165 i915_reg_t reg_elda, uint32_t bits_elda, 165 i915_reg_t reg_elda, uint32_t bits_elda,
166 i915_reg_t reg_edid) 166 i915_reg_t reg_edid)
167{ 167{
168 struct drm_i915_private *dev_priv = connector->dev->dev_private; 168 struct drm_i915_private *dev_priv = to_i915(connector->dev);
169 uint8_t *eld = connector->eld; 169 uint8_t *eld = connector->eld;
170 uint32_t tmp; 170 uint32_t tmp;
171 int i; 171 int i;
@@ -189,7 +189,7 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
189 189
190static void g4x_audio_codec_disable(struct intel_encoder *encoder) 190static void g4x_audio_codec_disable(struct intel_encoder *encoder)
191{ 191{
192 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 192 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
193 uint32_t eldv, tmp; 193 uint32_t eldv, tmp;
194 194
195 DRM_DEBUG_KMS("Disable audio codec\n"); 195 DRM_DEBUG_KMS("Disable audio codec\n");
@@ -210,7 +210,7 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
210 struct intel_encoder *encoder, 210 struct intel_encoder *encoder,
211 const struct drm_display_mode *adjusted_mode) 211 const struct drm_display_mode *adjusted_mode)
212{ 212{
213 struct drm_i915_private *dev_priv = connector->dev->dev_private; 213 struct drm_i915_private *dev_priv = to_i915(connector->dev);
214 uint8_t *eld = connector->eld; 214 uint8_t *eld = connector->eld;
215 uint32_t eldv; 215 uint32_t eldv;
216 uint32_t tmp; 216 uint32_t tmp;
@@ -247,7 +247,7 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
247 247
248static void hsw_audio_codec_disable(struct intel_encoder *encoder) 248static void hsw_audio_codec_disable(struct intel_encoder *encoder)
249{ 249{
250 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 250 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
251 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 251 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
252 enum pipe pipe = intel_crtc->pipe; 252 enum pipe pipe = intel_crtc->pipe;
253 uint32_t tmp; 253 uint32_t tmp;
@@ -279,7 +279,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
279 struct intel_encoder *encoder, 279 struct intel_encoder *encoder,
280 const struct drm_display_mode *adjusted_mode) 280 const struct drm_display_mode *adjusted_mode)
281{ 281{
282 struct drm_i915_private *dev_priv = connector->dev->dev_private; 282 struct drm_i915_private *dev_priv = to_i915(connector->dev);
283 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 283 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
284 enum pipe pipe = intel_crtc->pipe; 284 enum pipe pipe = intel_crtc->pipe;
285 struct i915_audio_component *acomp = dev_priv->audio_component; 285 struct i915_audio_component *acomp = dev_priv->audio_component;
@@ -357,7 +357,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
357 357
358static void ilk_audio_codec_disable(struct intel_encoder *encoder) 358static void ilk_audio_codec_disable(struct intel_encoder *encoder)
359{ 359{
360 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 360 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
361 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 361 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
362 struct intel_digital_port *intel_dig_port = 362 struct intel_digital_port *intel_dig_port =
363 enc_to_dig_port(&encoder->base); 363 enc_to_dig_port(&encoder->base);
@@ -405,7 +405,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
405 struct intel_encoder *encoder, 405 struct intel_encoder *encoder,
406 const struct drm_display_mode *adjusted_mode) 406 const struct drm_display_mode *adjusted_mode)
407{ 407{
408 struct drm_i915_private *dev_priv = connector->dev->dev_private; 408 struct drm_i915_private *dev_priv = to_i915(connector->dev);
409 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 409 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
410 struct intel_digital_port *intel_dig_port = 410 struct intel_digital_port *intel_dig_port =
411 enc_to_dig_port(&encoder->base); 411 enc_to_dig_port(&encoder->base);
@@ -496,7 +496,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
496 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 496 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
497 struct drm_connector *connector; 497 struct drm_connector *connector;
498 struct drm_device *dev = encoder->dev; 498 struct drm_device *dev = encoder->dev;
499 struct drm_i915_private *dev_priv = dev->dev_private; 499 struct drm_i915_private *dev_priv = to_i915(dev);
500 struct i915_audio_component *acomp = dev_priv->audio_component; 500 struct i915_audio_component *acomp = dev_priv->audio_component;
501 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); 501 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
502 enum port port = intel_dig_port->port; 502 enum port port = intel_dig_port->port;
@@ -543,7 +543,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
543{ 543{
544 struct drm_encoder *encoder = &intel_encoder->base; 544 struct drm_encoder *encoder = &intel_encoder->base;
545 struct drm_device *dev = encoder->dev; 545 struct drm_device *dev = encoder->dev;
546 struct drm_i915_private *dev_priv = dev->dev_private; 546 struct drm_i915_private *dev_priv = to_i915(dev);
547 struct i915_audio_component *acomp = dev_priv->audio_component; 547 struct i915_audio_component *acomp = dev_priv->audio_component;
548 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); 548 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
549 enum port port = intel_dig_port->port; 549 enum port port = intel_dig_port->port;
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index 522f5a2de015..2523a5b86dbe 100644
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -96,7 +96,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)
96{ 96{
97 struct drm_crtc *crtc = crtc_state->crtc; 97 struct drm_crtc *crtc = crtc_state->crtc;
98 struct drm_device *dev = crtc->dev; 98 struct drm_device *dev = crtc->dev;
99 struct drm_i915_private *dev_priv = dev->dev_private; 99 struct drm_i915_private *dev_priv = to_i915(dev);
100 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 100 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
101 int i, pipe = intel_crtc->pipe; 101 int i, pipe = intel_crtc->pipe;
102 uint16_t coeffs[9] = { 0, }; 102 uint16_t coeffs[9] = { 0, };
@@ -207,7 +207,7 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state)
207{ 207{
208 struct drm_crtc *crtc = state->crtc; 208 struct drm_crtc *crtc = state->crtc;
209 struct drm_device *dev = crtc->dev; 209 struct drm_device *dev = crtc->dev;
210 struct drm_i915_private *dev_priv = dev->dev_private; 210 struct drm_i915_private *dev_priv = to_i915(dev);
211 int pipe = to_intel_crtc(crtc)->pipe; 211 int pipe = to_intel_crtc(crtc)->pipe;
212 uint32_t mode; 212 uint32_t mode;
213 213
@@ -255,7 +255,7 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state)
255void intel_color_set_csc(struct drm_crtc_state *crtc_state) 255void intel_color_set_csc(struct drm_crtc_state *crtc_state)
256{ 256{
257 struct drm_device *dev = crtc_state->crtc->dev; 257 struct drm_device *dev = crtc_state->crtc->dev;
258 struct drm_i915_private *dev_priv = dev->dev_private; 258 struct drm_i915_private *dev_priv = to_i915(dev);
259 259
260 if (dev_priv->display.load_csc_matrix) 260 if (dev_priv->display.load_csc_matrix)
261 dev_priv->display.load_csc_matrix(crtc_state); 261 dev_priv->display.load_csc_matrix(crtc_state);
@@ -266,7 +266,7 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,
266 struct drm_property_blob *blob) 266 struct drm_property_blob *blob)
267{ 267{
268 struct drm_device *dev = crtc->dev; 268 struct drm_device *dev = crtc->dev;
269 struct drm_i915_private *dev_priv = dev->dev_private; 269 struct drm_i915_private *dev_priv = to_i915(dev);
270 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 270 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
271 enum pipe pipe = intel_crtc->pipe; 271 enum pipe pipe = intel_crtc->pipe;
272 int i; 272 int i;
@@ -313,7 +313,7 @@ static void haswell_load_luts(struct drm_crtc_state *crtc_state)
313{ 313{
314 struct drm_crtc *crtc = crtc_state->crtc; 314 struct drm_crtc *crtc = crtc_state->crtc;
315 struct drm_device *dev = crtc->dev; 315 struct drm_device *dev = crtc->dev;
316 struct drm_i915_private *dev_priv = dev->dev_private; 316 struct drm_i915_private *dev_priv = to_i915(dev);
317 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 317 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
318 struct intel_crtc_state *intel_crtc_state = 318 struct intel_crtc_state *intel_crtc_state =
319 to_intel_crtc_state(crtc_state); 319 to_intel_crtc_state(crtc_state);
@@ -343,7 +343,7 @@ static void broadwell_load_luts(struct drm_crtc_state *state)
343{ 343{
344 struct drm_crtc *crtc = state->crtc; 344 struct drm_crtc *crtc = state->crtc;
345 struct drm_device *dev = crtc->dev; 345 struct drm_device *dev = crtc->dev;
346 struct drm_i915_private *dev_priv = dev->dev_private; 346 struct drm_i915_private *dev_priv = to_i915(dev);
347 struct intel_crtc_state *intel_state = to_intel_crtc_state(state); 347 struct intel_crtc_state *intel_state = to_intel_crtc_state(state);
348 enum pipe pipe = to_intel_crtc(crtc)->pipe; 348 enum pipe pipe = to_intel_crtc(crtc)->pipe;
349 uint32_t i, lut_size = INTEL_INFO(dev)->color.degamma_lut_size; 349 uint32_t i, lut_size = INTEL_INFO(dev)->color.degamma_lut_size;
@@ -426,7 +426,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state)
426{ 426{
427 struct drm_crtc *crtc = state->crtc; 427 struct drm_crtc *crtc = state->crtc;
428 struct drm_device *dev = crtc->dev; 428 struct drm_device *dev = crtc->dev;
429 struct drm_i915_private *dev_priv = dev->dev_private; 429 struct drm_i915_private *dev_priv = to_i915(dev);
430 enum pipe pipe = to_intel_crtc(crtc)->pipe; 430 enum pipe pipe = to_intel_crtc(crtc)->pipe;
431 struct drm_color_lut *lut; 431 struct drm_color_lut *lut;
432 uint32_t i, lut_size; 432 uint32_t i, lut_size;
@@ -485,7 +485,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state)
485void intel_color_load_luts(struct drm_crtc_state *crtc_state) 485void intel_color_load_luts(struct drm_crtc_state *crtc_state)
486{ 486{
487 struct drm_device *dev = crtc_state->crtc->dev; 487 struct drm_device *dev = crtc_state->crtc->dev;
488 struct drm_i915_private *dev_priv = dev->dev_private; 488 struct drm_i915_private *dev_priv = to_i915(dev);
489 489
490 dev_priv->display.load_luts(crtc_state); 490 dev_priv->display.load_luts(crtc_state);
491} 491}
@@ -526,7 +526,7 @@ int intel_color_check(struct drm_crtc *crtc,
526void intel_color_init(struct drm_crtc *crtc) 526void intel_color_init(struct drm_crtc *crtc)
527{ 527{
528 struct drm_device *dev = crtc->dev; 528 struct drm_device *dev = crtc->dev;
529 struct drm_i915_private *dev_priv = dev->dev_private; 529 struct drm_i915_private *dev_priv = to_i915(dev);
530 530
531 drm_mode_crtc_set_gamma_size(crtc, 256); 531 drm_mode_crtc_set_gamma_size(crtc, 256);
532 532
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 0c8036e1b4d7..5819d524d917 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -67,7 +67,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
67 enum pipe *pipe) 67 enum pipe *pipe)
68{ 68{
69 struct drm_device *dev = encoder->base.dev; 69 struct drm_device *dev = encoder->base.dev;
70 struct drm_i915_private *dev_priv = dev->dev_private; 70 struct drm_i915_private *dev_priv = to_i915(dev);
71 struct intel_crt *crt = intel_encoder_to_crt(encoder); 71 struct intel_crt *crt = intel_encoder_to_crt(encoder);
72 enum intel_display_power_domain power_domain; 72 enum intel_display_power_domain power_domain;
73 u32 tmp; 73 u32 tmp;
@@ -98,7 +98,7 @@ out:
98 98
99static unsigned int intel_crt_get_flags(struct intel_encoder *encoder) 99static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)
100{ 100{
101 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 101 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
102 struct intel_crt *crt = intel_encoder_to_crt(encoder); 102 struct intel_crt *crt = intel_encoder_to_crt(encoder);
103 u32 tmp, flags = 0; 103 u32 tmp, flags = 0;
104 104
@@ -146,7 +146,7 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,
146static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode) 146static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
147{ 147{
148 struct drm_device *dev = encoder->base.dev; 148 struct drm_device *dev = encoder->base.dev;
149 struct drm_i915_private *dev_priv = dev->dev_private; 149 struct drm_i915_private *dev_priv = to_i915(dev);
150 struct intel_crt *crt = intel_encoder_to_crt(encoder); 150 struct intel_crt *crt = intel_encoder_to_crt(encoder);
151 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 151 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
152 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 152 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
@@ -281,7 +281,7 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
281{ 281{
282 struct drm_device *dev = connector->dev; 282 struct drm_device *dev = connector->dev;
283 struct intel_crt *crt = intel_attached_crt(connector); 283 struct intel_crt *crt = intel_attached_crt(connector);
284 struct drm_i915_private *dev_priv = dev->dev_private; 284 struct drm_i915_private *dev_priv = to_i915(dev);
285 u32 adpa; 285 u32 adpa;
286 bool ret; 286 bool ret;
287 287
@@ -328,7 +328,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
328{ 328{
329 struct drm_device *dev = connector->dev; 329 struct drm_device *dev = connector->dev;
330 struct intel_crt *crt = intel_attached_crt(connector); 330 struct intel_crt *crt = intel_attached_crt(connector);
331 struct drm_i915_private *dev_priv = dev->dev_private; 331 struct drm_i915_private *dev_priv = to_i915(dev);
332 u32 adpa; 332 u32 adpa;
333 bool ret; 333 bool ret;
334 u32 save_adpa; 334 u32 save_adpa;
@@ -371,7 +371,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
371static bool intel_crt_detect_hotplug(struct drm_connector *connector) 371static bool intel_crt_detect_hotplug(struct drm_connector *connector)
372{ 372{
373 struct drm_device *dev = connector->dev; 373 struct drm_device *dev = connector->dev;
374 struct drm_i915_private *dev_priv = dev->dev_private; 374 struct drm_i915_private *dev_priv = to_i915(dev);
375 u32 stat; 375 u32 stat;
376 bool ret = false; 376 bool ret = false;
377 int i, tries = 0; 377 int i, tries = 0;
@@ -453,7 +453,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,
453static bool intel_crt_detect_ddc(struct drm_connector *connector) 453static bool intel_crt_detect_ddc(struct drm_connector *connector)
454{ 454{
455 struct intel_crt *crt = intel_attached_crt(connector); 455 struct intel_crt *crt = intel_attached_crt(connector);
456 struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private; 456 struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
457 struct edid *edid; 457 struct edid *edid;
458 struct i2c_adapter *i2c; 458 struct i2c_adapter *i2c;
459 459
@@ -489,7 +489,7 @@ static enum drm_connector_status
489intel_crt_load_detect(struct intel_crt *crt, uint32_t pipe) 489intel_crt_load_detect(struct intel_crt *crt, uint32_t pipe)
490{ 490{
491 struct drm_device *dev = crt->base.base.dev; 491 struct drm_device *dev = crt->base.base.dev;
492 struct drm_i915_private *dev_priv = dev->dev_private; 492 struct drm_i915_private *dev_priv = to_i915(dev);
493 uint32_t save_bclrpat; 493 uint32_t save_bclrpat;
494 uint32_t save_vtotal; 494 uint32_t save_vtotal;
495 uint32_t vtotal, vactive; 495 uint32_t vtotal, vactive;
@@ -604,7 +604,7 @@ static enum drm_connector_status
604intel_crt_detect(struct drm_connector *connector, bool force) 604intel_crt_detect(struct drm_connector *connector, bool force)
605{ 605{
606 struct drm_device *dev = connector->dev; 606 struct drm_device *dev = connector->dev;
607 struct drm_i915_private *dev_priv = dev->dev_private; 607 struct drm_i915_private *dev_priv = to_i915(dev);
608 struct intel_crt *crt = intel_attached_crt(connector); 608 struct intel_crt *crt = intel_attached_crt(connector);
609 struct intel_encoder *intel_encoder = &crt->base; 609 struct intel_encoder *intel_encoder = &crt->base;
610 enum intel_display_power_domain power_domain; 610 enum intel_display_power_domain power_domain;
@@ -685,7 +685,7 @@ static void intel_crt_destroy(struct drm_connector *connector)
685static int intel_crt_get_modes(struct drm_connector *connector) 685static int intel_crt_get_modes(struct drm_connector *connector)
686{ 686{
687 struct drm_device *dev = connector->dev; 687 struct drm_device *dev = connector->dev;
688 struct drm_i915_private *dev_priv = dev->dev_private; 688 struct drm_i915_private *dev_priv = to_i915(dev);
689 struct intel_crt *crt = intel_attached_crt(connector); 689 struct intel_crt *crt = intel_attached_crt(connector);
690 struct intel_encoder *intel_encoder = &crt->base; 690 struct intel_encoder *intel_encoder = &crt->base;
691 enum intel_display_power_domain power_domain; 691 enum intel_display_power_domain power_domain;
@@ -720,7 +720,7 @@ static int intel_crt_set_property(struct drm_connector *connector,
720static void intel_crt_reset(struct drm_connector *connector) 720static void intel_crt_reset(struct drm_connector *connector)
721{ 721{
722 struct drm_device *dev = connector->dev; 722 struct drm_device *dev = connector->dev;
723 struct drm_i915_private *dev_priv = dev->dev_private; 723 struct drm_i915_private *dev_priv = to_i915(dev);
724 struct intel_crt *crt = intel_attached_crt(connector); 724 struct intel_crt *crt = intel_attached_crt(connector);
725 725
726 if (INTEL_INFO(dev)->gen >= 5) { 726 if (INTEL_INFO(dev)->gen >= 5) {
@@ -796,7 +796,7 @@ void intel_crt_init(struct drm_device *dev)
796 struct drm_connector *connector; 796 struct drm_connector *connector;
797 struct intel_crt *crt; 797 struct intel_crt *crt;
798 struct intel_connector *intel_connector; 798 struct intel_connector *intel_connector;
799 struct drm_i915_private *dev_priv = dev->dev_private; 799 struct drm_i915_private *dev_priv = to_i915(dev);
800 i915_reg_t adpa_reg; 800 i915_reg_t adpa_reg;
801 u32 adpa; 801 u32 adpa;
802 802
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 6bcd7ffbff43..d6efe8bf813b 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -543,7 +543,7 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,
543void hsw_fdi_link_train(struct drm_crtc *crtc) 543void hsw_fdi_link_train(struct drm_crtc *crtc)
544{ 544{
545 struct drm_device *dev = crtc->dev; 545 struct drm_device *dev = crtc->dev;
546 struct drm_i915_private *dev_priv = dev->dev_private; 546 struct drm_i915_private *dev_priv = to_i915(dev);
547 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 547 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
548 struct intel_encoder *encoder; 548 struct intel_encoder *encoder;
549 u32 temp, i, rx_ctl_val; 549 u32 temp, i, rx_ctl_val;
@@ -851,7 +851,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
851static void skl_ddi_clock_get(struct intel_encoder *encoder, 851static void skl_ddi_clock_get(struct intel_encoder *encoder,
852 struct intel_crtc_state *pipe_config) 852 struct intel_crtc_state *pipe_config)
853{ 853{
854 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 854 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
855 int link_clock = 0; 855 int link_clock = 0;
856 uint32_t dpll_ctl1, dpll; 856 uint32_t dpll_ctl1, dpll;
857 857
@@ -899,7 +899,7 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder,
899static void hsw_ddi_clock_get(struct intel_encoder *encoder, 899static void hsw_ddi_clock_get(struct intel_encoder *encoder,
900 struct intel_crtc_state *pipe_config) 900 struct intel_crtc_state *pipe_config)
901{ 901{
902 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 902 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
903 int link_clock = 0; 903 int link_clock = 0;
904 u32 val, pll; 904 u32 val, pll;
905 905
@@ -971,7 +971,7 @@ static int bxt_calc_pll_link(struct drm_i915_private *dev_priv,
971static void bxt_ddi_clock_get(struct intel_encoder *encoder, 971static void bxt_ddi_clock_get(struct intel_encoder *encoder,
972 struct intel_crtc_state *pipe_config) 972 struct intel_crtc_state *pipe_config)
973{ 973{
974 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 974 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
975 enum port port = intel_ddi_get_encoder_port(encoder); 975 enum port port = intel_ddi_get_encoder_port(encoder);
976 uint32_t dpll = port; 976 uint32_t dpll = port;
977 977
@@ -1061,7 +1061,7 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc,
1061 1061
1062void intel_ddi_set_pipe_settings(struct drm_crtc *crtc) 1062void intel_ddi_set_pipe_settings(struct drm_crtc *crtc)
1063{ 1063{
1064 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 1064 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
1065 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1065 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1066 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); 1066 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
1067 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 1067 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
@@ -1096,7 +1096,7 @@ void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state)
1096{ 1096{
1097 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1097 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1098 struct drm_device *dev = crtc->dev; 1098 struct drm_device *dev = crtc->dev;
1099 struct drm_i915_private *dev_priv = dev->dev_private; 1099 struct drm_i915_private *dev_priv = to_i915(dev);
1100 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 1100 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
1101 uint32_t temp; 1101 uint32_t temp;
1102 temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder)); 1102 temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
@@ -1113,7 +1113,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)
1113 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); 1113 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
1114 struct drm_encoder *encoder = &intel_encoder->base; 1114 struct drm_encoder *encoder = &intel_encoder->base;
1115 struct drm_device *dev = crtc->dev; 1115 struct drm_device *dev = crtc->dev;
1116 struct drm_i915_private *dev_priv = dev->dev_private; 1116 struct drm_i915_private *dev_priv = to_i915(dev);
1117 enum pipe pipe = intel_crtc->pipe; 1117 enum pipe pipe = intel_crtc->pipe;
1118 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 1118 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
1119 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1119 enum port port = intel_ddi_get_encoder_port(intel_encoder);
@@ -1223,7 +1223,7 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
1223bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) 1223bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
1224{ 1224{
1225 struct drm_device *dev = intel_connector->base.dev; 1225 struct drm_device *dev = intel_connector->base.dev;
1226 struct drm_i915_private *dev_priv = dev->dev_private; 1226 struct drm_i915_private *dev_priv = to_i915(dev);
1227 struct intel_encoder *intel_encoder = intel_connector->encoder; 1227 struct intel_encoder *intel_encoder = intel_connector->encoder;
1228 int type = intel_connector->base.connector_type; 1228 int type = intel_connector->base.connector_type;
1229 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1229 enum port port = intel_ddi_get_encoder_port(intel_encoder);
@@ -1285,7 +1285,7 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
1285 enum pipe *pipe) 1285 enum pipe *pipe)
1286{ 1286{
1287 struct drm_device *dev = encoder->base.dev; 1287 struct drm_device *dev = encoder->base.dev;
1288 struct drm_i915_private *dev_priv = dev->dev_private; 1288 struct drm_i915_private *dev_priv = to_i915(dev);
1289 enum port port = intel_ddi_get_encoder_port(encoder); 1289 enum port port = intel_ddi_get_encoder_port(encoder);
1290 enum intel_display_power_domain power_domain; 1290 enum intel_display_power_domain power_domain;
1291 u32 tmp; 1291 u32 tmp;
@@ -1359,7 +1359,7 @@ void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc)
1359{ 1359{
1360 struct drm_crtc *crtc = &intel_crtc->base; 1360 struct drm_crtc *crtc = &intel_crtc->base;
1361 struct drm_device *dev = crtc->dev; 1361 struct drm_device *dev = crtc->dev;
1362 struct drm_i915_private *dev_priv = dev->dev_private; 1362 struct drm_i915_private *dev_priv = to_i915(dev);
1363 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); 1363 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
1364 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1364 enum port port = intel_ddi_get_encoder_port(intel_encoder);
1365 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 1365 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
@@ -1371,7 +1371,7 @@ void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc)
1371 1371
1372void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc) 1372void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc)
1373{ 1373{
1374 struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private; 1374 struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
1375 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 1375 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
1376 1376
1377 if (cpu_transcoder != TRANSCODER_EDP) 1377 if (cpu_transcoder != TRANSCODER_EDP)
@@ -1648,7 +1648,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
1648{ 1648{
1649 struct drm_encoder *encoder = &intel_encoder->base; 1649 struct drm_encoder *encoder = &intel_encoder->base;
1650 struct drm_device *dev = encoder->dev; 1650 struct drm_device *dev = encoder->dev;
1651 struct drm_i915_private *dev_priv = dev->dev_private; 1651 struct drm_i915_private *dev_priv = to_i915(dev);
1652 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1652 enum port port = intel_ddi_get_encoder_port(intel_encoder);
1653 int type = intel_encoder->type; 1653 int type = intel_encoder->type;
1654 uint32_t val; 1654 uint32_t val;
@@ -1695,7 +1695,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
1695 struct drm_crtc *crtc = encoder->crtc; 1695 struct drm_crtc *crtc = encoder->crtc;
1696 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1696 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1697 struct drm_device *dev = encoder->dev; 1697 struct drm_device *dev = encoder->dev;
1698 struct drm_i915_private *dev_priv = dev->dev_private; 1698 struct drm_i915_private *dev_priv = to_i915(dev);
1699 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1699 enum port port = intel_ddi_get_encoder_port(intel_encoder);
1700 int type = intel_encoder->type; 1700 int type = intel_encoder->type;
1701 1701
@@ -1734,7 +1734,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
1734 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1734 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1735 int type = intel_encoder->type; 1735 int type = intel_encoder->type;
1736 struct drm_device *dev = encoder->dev; 1736 struct drm_device *dev = encoder->dev;
1737 struct drm_i915_private *dev_priv = dev->dev_private; 1737 struct drm_i915_private *dev_priv = to_i915(dev);
1738 1738
1739 if (intel_crtc->config->has_audio) { 1739 if (intel_crtc->config->has_audio) {
1740 intel_audio_codec_disable(intel_encoder); 1740 intel_audio_codec_disable(intel_encoder);
@@ -2124,7 +2124,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
2124 2124
2125void intel_ddi_fdi_disable(struct drm_crtc *crtc) 2125void intel_ddi_fdi_disable(struct drm_crtc *crtc)
2126{ 2126{
2127 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 2127 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
2128 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); 2128 struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
2129 uint32_t val; 2129 uint32_t val;
2130 2130
@@ -2157,7 +2157,7 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)
2157void intel_ddi_get_config(struct intel_encoder *encoder, 2157void intel_ddi_get_config(struct intel_encoder *encoder,
2158 struct intel_crtc_state *pipe_config) 2158 struct intel_crtc_state *pipe_config)
2159{ 2159{
2160 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 2160 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
2161 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 2161 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
2162 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; 2162 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
2163 struct intel_hdmi *intel_hdmi; 2163 struct intel_hdmi *intel_hdmi;
@@ -2256,7 +2256,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
2256static bool intel_ddi_compute_config(struct intel_encoder *encoder, 2256static bool intel_ddi_compute_config(struct intel_encoder *encoder,
2257 struct intel_crtc_state *pipe_config) 2257 struct intel_crtc_state *pipe_config)
2258{ 2258{
2259 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 2259 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
2260 int type = encoder->type; 2260 int type = encoder->type;
2261 int port = intel_ddi_get_encoder_port(encoder); 2261 int port = intel_ddi_get_encoder_port(encoder);
2262 int ret; 2262 int ret;
@@ -2322,7 +2322,7 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)
2322 2322
2323void intel_ddi_init(struct drm_device *dev, enum port port) 2323void intel_ddi_init(struct drm_device *dev, enum port port)
2324{ 2324{
2325 struct drm_i915_private *dev_priv = dev->dev_private; 2325 struct drm_i915_private *dev_priv = to_i915(dev);
2326 struct intel_digital_port *intel_dig_port; 2326 struct intel_digital_port *intel_dig_port;
2327 struct intel_encoder *intel_encoder; 2327 struct intel_encoder *intel_encoder;
2328 struct drm_encoder *encoder; 2328 struct drm_encoder *encoder;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index acb89e7edd61..c3c620b4f589 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1080,7 +1080,7 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
1080 1080
1081static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe) 1081static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)
1082{ 1082{
1083 struct drm_i915_private *dev_priv = dev->dev_private; 1083 struct drm_i915_private *dev_priv = to_i915(dev);
1084 i915_reg_t reg = PIPEDSL(pipe); 1084 i915_reg_t reg = PIPEDSL(pipe);
1085 u32 line1, line2; 1085 u32 line1, line2;
1086 u32 line_mask; 1086 u32 line_mask;
@@ -1116,7 +1116,7 @@ static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)
1116static void intel_wait_for_pipe_off(struct intel_crtc *crtc) 1116static void intel_wait_for_pipe_off(struct intel_crtc *crtc)
1117{ 1117{
1118 struct drm_device *dev = crtc->base.dev; 1118 struct drm_device *dev = crtc->base.dev;
1119 struct drm_i915_private *dev_priv = dev->dev_private; 1119 struct drm_i915_private *dev_priv = to_i915(dev);
1120 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 1120 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
1121 enum pipe pipe = crtc->pipe; 1121 enum pipe pipe = crtc->pipe;
1122 1122
@@ -1656,7 +1656,7 @@ static int intel_num_dvo_pipes(struct drm_device *dev)
1656static void i9xx_enable_pll(struct intel_crtc *crtc) 1656static void i9xx_enable_pll(struct intel_crtc *crtc)
1657{ 1657{
1658 struct drm_device *dev = crtc->base.dev; 1658 struct drm_device *dev = crtc->base.dev;
1659 struct drm_i915_private *dev_priv = dev->dev_private; 1659 struct drm_i915_private *dev_priv = to_i915(dev);
1660 i915_reg_t reg = DPLL(crtc->pipe); 1660 i915_reg_t reg = DPLL(crtc->pipe);
1661 u32 dpll = crtc->config->dpll_hw_state.dpll; 1661 u32 dpll = crtc->config->dpll_hw_state.dpll;
1662 1662
@@ -1728,7 +1728,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)
1728static void i9xx_disable_pll(struct intel_crtc *crtc) 1728static void i9xx_disable_pll(struct intel_crtc *crtc)
1729{ 1729{
1730 struct drm_device *dev = crtc->base.dev; 1730 struct drm_device *dev = crtc->base.dev;
1731 struct drm_i915_private *dev_priv = dev->dev_private; 1731 struct drm_i915_private *dev_priv = to_i915(dev);
1732 enum pipe pipe = crtc->pipe; 1732 enum pipe pipe = crtc->pipe;
1733 1733
1734 /* Disable DVO 2x clock on both PLLs if necessary */ 1734 /* Disable DVO 2x clock on both PLLs if necessary */
@@ -1980,7 +1980,7 @@ static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv)
1980static void intel_enable_pipe(struct intel_crtc *crtc) 1980static void intel_enable_pipe(struct intel_crtc *crtc)
1981{ 1981{
1982 struct drm_device *dev = crtc->base.dev; 1982 struct drm_device *dev = crtc->base.dev;
1983 struct drm_i915_private *dev_priv = dev->dev_private; 1983 struct drm_i915_private *dev_priv = to_i915(dev);
1984 enum pipe pipe = crtc->pipe; 1984 enum pipe pipe = crtc->pipe;
1985 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 1985 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
1986 enum pipe pch_transcoder; 1986 enum pipe pch_transcoder;
@@ -2053,7 +2053,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc)
2053 */ 2053 */
2054static void intel_disable_pipe(struct intel_crtc *crtc) 2054static void intel_disable_pipe(struct intel_crtc *crtc)
2055{ 2055{
2056 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 2056 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
2057 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 2057 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
2058 enum pipe pipe = crtc->pipe; 2058 enum pipe pipe = crtc->pipe;
2059 i915_reg_t reg; 2059 i915_reg_t reg;
@@ -2264,7 +2264,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
2264 unsigned int rotation) 2264 unsigned int rotation)
2265{ 2265{
2266 struct drm_device *dev = fb->dev; 2266 struct drm_device *dev = fb->dev;
2267 struct drm_i915_private *dev_priv = dev->dev_private; 2267 struct drm_i915_private *dev_priv = to_i915(dev);
2268 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 2268 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
2269 struct i915_ggtt_view view; 2269 struct i915_ggtt_view view;
2270 u32 alignment; 2270 u32 alignment;
@@ -2566,7 +2566,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
2566 struct intel_initial_plane_config *plane_config) 2566 struct intel_initial_plane_config *plane_config)
2567{ 2567{
2568 struct drm_device *dev = intel_crtc->base.dev; 2568 struct drm_device *dev = intel_crtc->base.dev;
2569 struct drm_i915_private *dev_priv = dev->dev_private; 2569 struct drm_i915_private *dev_priv = to_i915(dev);
2570 struct drm_crtc *c; 2570 struct drm_crtc *c;
2571 struct intel_crtc *i; 2571 struct intel_crtc *i;
2572 struct drm_i915_gem_object *obj; 2572 struct drm_i915_gem_object *obj;
@@ -2662,7 +2662,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,
2662 const struct intel_plane_state *plane_state) 2662 const struct intel_plane_state *plane_state)
2663{ 2663{
2664 struct drm_device *dev = primary->dev; 2664 struct drm_device *dev = primary->dev;
2665 struct drm_i915_private *dev_priv = dev->dev_private; 2665 struct drm_i915_private *dev_priv = to_i915(dev);
2666 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); 2666 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
2667 struct drm_framebuffer *fb = plane_state->base.fb; 2667 struct drm_framebuffer *fb = plane_state->base.fb;
2668 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 2668 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -2775,7 +2775,7 @@ static void i9xx_disable_primary_plane(struct drm_plane *primary,
2775 struct drm_crtc *crtc) 2775 struct drm_crtc *crtc)
2776{ 2776{
2777 struct drm_device *dev = crtc->dev; 2777 struct drm_device *dev = crtc->dev;
2778 struct drm_i915_private *dev_priv = dev->dev_private; 2778 struct drm_i915_private *dev_priv = to_i915(dev);
2779 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 2779 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
2780 int plane = intel_crtc->plane; 2780 int plane = intel_crtc->plane;
2781 2781
@@ -2792,7 +2792,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
2792 const struct intel_plane_state *plane_state) 2792 const struct intel_plane_state *plane_state)
2793{ 2793{
2794 struct drm_device *dev = primary->dev; 2794 struct drm_device *dev = primary->dev;
2795 struct drm_i915_private *dev_priv = dev->dev_private; 2795 struct drm_i915_private *dev_priv = to_i915(dev);
2796 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); 2796 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
2797 struct drm_framebuffer *fb = plane_state->base.fb; 2797 struct drm_framebuffer *fb = plane_state->base.fb;
2798 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 2798 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -2920,7 +2920,7 @@ u32 intel_plane_obj_offset(struct intel_plane *intel_plane,
2920static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id) 2920static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
2921{ 2921{
2922 struct drm_device *dev = intel_crtc->base.dev; 2922 struct drm_device *dev = intel_crtc->base.dev;
2923 struct drm_i915_private *dev_priv = dev->dev_private; 2923 struct drm_i915_private *dev_priv = to_i915(dev);
2924 2924
2925 I915_WRITE(SKL_PS_CTRL(intel_crtc->pipe, id), 0); 2925 I915_WRITE(SKL_PS_CTRL(intel_crtc->pipe, id), 0);
2926 I915_WRITE(SKL_PS_WIN_POS(intel_crtc->pipe, id), 0); 2926 I915_WRITE(SKL_PS_WIN_POS(intel_crtc->pipe, id), 0);
@@ -3030,7 +3030,7 @@ static void skylake_update_primary_plane(struct drm_plane *plane,
3030 const struct intel_plane_state *plane_state) 3030 const struct intel_plane_state *plane_state)
3031{ 3031{
3032 struct drm_device *dev = plane->dev; 3032 struct drm_device *dev = plane->dev;
3033 struct drm_i915_private *dev_priv = dev->dev_private; 3033 struct drm_i915_private *dev_priv = to_i915(dev);
3034 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); 3034 struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
3035 struct drm_framebuffer *fb = plane_state->base.fb; 3035 struct drm_framebuffer *fb = plane_state->base.fb;
3036 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 3036 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -3114,7 +3114,7 @@ static void skylake_disable_primary_plane(struct drm_plane *primary,
3114 struct drm_crtc *crtc) 3114 struct drm_crtc *crtc)
3115{ 3115{
3116 struct drm_device *dev = crtc->dev; 3116 struct drm_device *dev = crtc->dev;
3117 struct drm_i915_private *dev_priv = dev->dev_private; 3117 struct drm_i915_private *dev_priv = to_i915(dev);
3118 int pipe = to_intel_crtc(crtc)->pipe; 3118 int pipe = to_intel_crtc(crtc)->pipe;
3119 3119
3120 I915_WRITE(PLANE_CTL(pipe, 0), 0); 3120 I915_WRITE(PLANE_CTL(pipe, 0), 0);
@@ -3250,7 +3250,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
3250 struct intel_crtc_state *old_crtc_state) 3250 struct intel_crtc_state *old_crtc_state)
3251{ 3251{
3252 struct drm_device *dev = crtc->base.dev; 3252 struct drm_device *dev = crtc->base.dev;
3253 struct drm_i915_private *dev_priv = dev->dev_private; 3253 struct drm_i915_private *dev_priv = to_i915(dev);
3254 struct intel_crtc_state *pipe_config = 3254 struct intel_crtc_state *pipe_config =
3255 to_intel_crtc_state(crtc->base.state); 3255 to_intel_crtc_state(crtc->base.state);
3256 3256
@@ -3291,7 +3291,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
3291static void intel_fdi_normal_train(struct drm_crtc *crtc) 3291static void intel_fdi_normal_train(struct drm_crtc *crtc)
3292{ 3292{
3293 struct drm_device *dev = crtc->dev; 3293 struct drm_device *dev = crtc->dev;
3294 struct drm_i915_private *dev_priv = dev->dev_private; 3294 struct drm_i915_private *dev_priv = to_i915(dev);
3295 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 3295 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
3296 int pipe = intel_crtc->pipe; 3296 int pipe = intel_crtc->pipe;
3297 i915_reg_t reg; 3297 i915_reg_t reg;
@@ -3334,7 +3334,7 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc)
3334static void ironlake_fdi_link_train(struct drm_crtc *crtc) 3334static void ironlake_fdi_link_train(struct drm_crtc *crtc)
3335{ 3335{
3336 struct drm_device *dev = crtc->dev; 3336 struct drm_device *dev = crtc->dev;
3337 struct drm_i915_private *dev_priv = dev->dev_private; 3337 struct drm_i915_private *dev_priv = to_i915(dev);
3338 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 3338 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
3339 int pipe = intel_crtc->pipe; 3339 int pipe = intel_crtc->pipe;
3340 i915_reg_t reg; 3340 i915_reg_t reg;
@@ -3435,7 +3435,7 @@ static const int snb_b_fdi_train_param[] = {
3435static void gen6_fdi_link_train(struct drm_crtc *crtc) 3435static void gen6_fdi_link_train(struct drm_crtc *crtc)
3436{ 3436{
3437 struct drm_device *dev = crtc->dev; 3437 struct drm_device *dev = crtc->dev;
3438 struct drm_i915_private *dev_priv = dev->dev_private; 3438 struct drm_i915_private *dev_priv = to_i915(dev);
3439 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 3439 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
3440 int pipe = intel_crtc->pipe; 3440 int pipe = intel_crtc->pipe;
3441 i915_reg_t reg; 3441 i915_reg_t reg;
@@ -3568,7 +3568,7 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
3568static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) 3568static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
3569{ 3569{
3570 struct drm_device *dev = crtc->dev; 3570 struct drm_device *dev = crtc->dev;
3571 struct drm_i915_private *dev_priv = dev->dev_private; 3571 struct drm_i915_private *dev_priv = to_i915(dev);
3572 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 3572 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
3573 int pipe = intel_crtc->pipe; 3573 int pipe = intel_crtc->pipe;
3574 i915_reg_t reg; 3574 i915_reg_t reg;
@@ -3687,7 +3687,7 @@ train_done:
3687static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc) 3687static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc)
3688{ 3688{
3689 struct drm_device *dev = intel_crtc->base.dev; 3689 struct drm_device *dev = intel_crtc->base.dev;
3690 struct drm_i915_private *dev_priv = dev->dev_private; 3690 struct drm_i915_private *dev_priv = to_i915(dev);
3691 int pipe = intel_crtc->pipe; 3691 int pipe = intel_crtc->pipe;
3692 i915_reg_t reg; 3692 i915_reg_t reg;
3693 u32 temp; 3693 u32 temp;
@@ -3724,7 +3724,7 @@ static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc)
3724static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc) 3724static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
3725{ 3725{
3726 struct drm_device *dev = intel_crtc->base.dev; 3726 struct drm_device *dev = intel_crtc->base.dev;
3727 struct drm_i915_private *dev_priv = dev->dev_private; 3727 struct drm_i915_private *dev_priv = to_i915(dev);
3728 int pipe = intel_crtc->pipe; 3728 int pipe = intel_crtc->pipe;
3729 i915_reg_t reg; 3729 i915_reg_t reg;
3730 u32 temp; 3730 u32 temp;
@@ -3754,7 +3754,7 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
3754static void ironlake_fdi_disable(struct drm_crtc *crtc) 3754static void ironlake_fdi_disable(struct drm_crtc *crtc)
3755{ 3755{
3756 struct drm_device *dev = crtc->dev; 3756 struct drm_device *dev = crtc->dev;
3757 struct drm_i915_private *dev_priv = dev->dev_private; 3757 struct drm_i915_private *dev_priv = to_i915(dev);
3758 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 3758 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
3759 int pipe = intel_crtc->pipe; 3759 int pipe = intel_crtc->pipe;
3760 i915_reg_t reg; 3760 i915_reg_t reg;
@@ -3850,7 +3850,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc)
3850static int intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) 3850static int intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
3851{ 3851{
3852 struct drm_device *dev = crtc->dev; 3852 struct drm_device *dev = crtc->dev;
3853 struct drm_i915_private *dev_priv = dev->dev_private; 3853 struct drm_i915_private *dev_priv = to_i915(dev);
3854 long ret; 3854 long ret;
3855 3855
3856 WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue)); 3856 WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue));
@@ -4013,7 +4013,7 @@ static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc,
4013 enum pipe pch_transcoder) 4013 enum pipe pch_transcoder)
4014{ 4014{
4015 struct drm_device *dev = crtc->base.dev; 4015 struct drm_device *dev = crtc->base.dev;
4016 struct drm_i915_private *dev_priv = dev->dev_private; 4016 struct drm_i915_private *dev_priv = to_i915(dev);
4017 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 4017 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
4018 4018
4019 I915_WRITE(PCH_TRANS_HTOTAL(pch_transcoder), 4019 I915_WRITE(PCH_TRANS_HTOTAL(pch_transcoder),
@@ -4035,7 +4035,7 @@ static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc,
4035 4035
4036static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable) 4036static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable)
4037{ 4037{
4038 struct drm_i915_private *dev_priv = dev->dev_private; 4038 struct drm_i915_private *dev_priv = to_i915(dev);
4039 uint32_t temp; 4039 uint32_t temp;
4040 4040
4041 temp = I915_READ(SOUTH_CHICKEN1); 4041 temp = I915_READ(SOUTH_CHICKEN1);
@@ -4104,7 +4104,7 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc)
4104static void ironlake_pch_enable(struct drm_crtc *crtc) 4104static void ironlake_pch_enable(struct drm_crtc *crtc)
4105{ 4105{
4106 struct drm_device *dev = crtc->dev; 4106 struct drm_device *dev = crtc->dev;
4107 struct drm_i915_private *dev_priv = dev->dev_private; 4107 struct drm_i915_private *dev_priv = to_i915(dev);
4108 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4108 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4109 int pipe = intel_crtc->pipe; 4109 int pipe = intel_crtc->pipe;
4110 u32 temp; 4110 u32 temp;
@@ -4194,7 +4194,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
4194static void lpt_pch_enable(struct drm_crtc *crtc) 4194static void lpt_pch_enable(struct drm_crtc *crtc)
4195{ 4195{
4196 struct drm_device *dev = crtc->dev; 4196 struct drm_device *dev = crtc->dev;
4197 struct drm_i915_private *dev_priv = dev->dev_private; 4197 struct drm_i915_private *dev_priv = to_i915(dev);
4198 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4198 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4199 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 4199 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
4200 4200
@@ -4210,7 +4210,7 @@ static void lpt_pch_enable(struct drm_crtc *crtc)
4210 4210
4211static void cpt_verify_modeset(struct drm_device *dev, int pipe) 4211static void cpt_verify_modeset(struct drm_device *dev, int pipe)
4212{ 4212{
4213 struct drm_i915_private *dev_priv = dev->dev_private; 4213 struct drm_i915_private *dev_priv = to_i915(dev);
4214 i915_reg_t dslreg = PIPEDSL(pipe); 4214 i915_reg_t dslreg = PIPEDSL(pipe);
4215 u32 temp; 4215 u32 temp;
4216 4216
@@ -4388,7 +4388,7 @@ static void skylake_scaler_disable(struct intel_crtc *crtc)
4388static void skylake_pfit_enable(struct intel_crtc *crtc) 4388static void skylake_pfit_enable(struct intel_crtc *crtc)
4389{ 4389{
4390 struct drm_device *dev = crtc->base.dev; 4390 struct drm_device *dev = crtc->base.dev;
4391 struct drm_i915_private *dev_priv = dev->dev_private; 4391 struct drm_i915_private *dev_priv = to_i915(dev);
4392 int pipe = crtc->pipe; 4392 int pipe = crtc->pipe;
4393 struct intel_crtc_scaler_state *scaler_state = 4393 struct intel_crtc_scaler_state *scaler_state =
4394 &crtc->config->scaler_state; 4394 &crtc->config->scaler_state;
@@ -4416,7 +4416,7 @@ static void skylake_pfit_enable(struct intel_crtc *crtc)
4416static void ironlake_pfit_enable(struct intel_crtc *crtc) 4416static void ironlake_pfit_enable(struct intel_crtc *crtc)
4417{ 4417{
4418 struct drm_device *dev = crtc->base.dev; 4418 struct drm_device *dev = crtc->base.dev;
4419 struct drm_i915_private *dev_priv = dev->dev_private; 4419 struct drm_i915_private *dev_priv = to_i915(dev);
4420 int pipe = crtc->pipe; 4420 int pipe = crtc->pipe;
4421 4421
4422 if (crtc->config->pch_pfit.enabled) { 4422 if (crtc->config->pch_pfit.enabled) {
@@ -4437,7 +4437,7 @@ static void ironlake_pfit_enable(struct intel_crtc *crtc)
4437void hsw_enable_ips(struct intel_crtc *crtc) 4437void hsw_enable_ips(struct intel_crtc *crtc)
4438{ 4438{
4439 struct drm_device *dev = crtc->base.dev; 4439 struct drm_device *dev = crtc->base.dev;
4440 struct drm_i915_private *dev_priv = dev->dev_private; 4440 struct drm_i915_private *dev_priv = to_i915(dev);
4441 4441
4442 if (!crtc->config->ips_enabled) 4442 if (!crtc->config->ips_enabled)
4443 return; 4443 return;
@@ -4475,7 +4475,7 @@ void hsw_enable_ips(struct intel_crtc *crtc)
4475void hsw_disable_ips(struct intel_crtc *crtc) 4475void hsw_disable_ips(struct intel_crtc *crtc)
4476{ 4476{
4477 struct drm_device *dev = crtc->base.dev; 4477 struct drm_device *dev = crtc->base.dev;
4478 struct drm_i915_private *dev_priv = dev->dev_private; 4478 struct drm_i915_private *dev_priv = to_i915(dev);
4479 4479
4480 if (!crtc->config->ips_enabled) 4480 if (!crtc->config->ips_enabled)
4481 return; 4481 return;
@@ -4503,7 +4503,7 @@ static void intel_crtc_dpms_overlay_disable(struct intel_crtc *intel_crtc)
4503{ 4503{
4504 if (intel_crtc->overlay) { 4504 if (intel_crtc->overlay) {
4505 struct drm_device *dev = intel_crtc->base.dev; 4505 struct drm_device *dev = intel_crtc->base.dev;
4506 struct drm_i915_private *dev_priv = dev->dev_private; 4506 struct drm_i915_private *dev_priv = to_i915(dev);
4507 4507
4508 mutex_lock(&dev->struct_mutex); 4508 mutex_lock(&dev->struct_mutex);
4509 dev_priv->mm.interruptible = false; 4509 dev_priv->mm.interruptible = false;
@@ -4531,7 +4531,7 @@ static void
4531intel_post_enable_primary(struct drm_crtc *crtc) 4531intel_post_enable_primary(struct drm_crtc *crtc)
4532{ 4532{
4533 struct drm_device *dev = crtc->dev; 4533 struct drm_device *dev = crtc->dev;
4534 struct drm_i915_private *dev_priv = dev->dev_private; 4534 struct drm_i915_private *dev_priv = to_i915(dev);
4535 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4535 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4536 int pipe = intel_crtc->pipe; 4536 int pipe = intel_crtc->pipe;
4537 4537
@@ -4563,7 +4563,7 @@ static void
4563intel_pre_disable_primary(struct drm_crtc *crtc) 4563intel_pre_disable_primary(struct drm_crtc *crtc)
4564{ 4564{
4565 struct drm_device *dev = crtc->dev; 4565 struct drm_device *dev = crtc->dev;
4566 struct drm_i915_private *dev_priv = dev->dev_private; 4566 struct drm_i915_private *dev_priv = to_i915(dev);
4567 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4567 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4568 int pipe = intel_crtc->pipe; 4568 int pipe = intel_crtc->pipe;
4569 4569
@@ -4590,7 +4590,7 @@ static void
4590intel_pre_disable_primary_noatomic(struct drm_crtc *crtc) 4590intel_pre_disable_primary_noatomic(struct drm_crtc *crtc)
4591{ 4591{
4592 struct drm_device *dev = crtc->dev; 4592 struct drm_device *dev = crtc->dev;
4593 struct drm_i915_private *dev_priv = dev->dev_private; 4593 struct drm_i915_private *dev_priv = to_i915(dev);
4594 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4594 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4595 int pipe = intel_crtc->pipe; 4595 int pipe = intel_crtc->pipe;
4596 4596
@@ -4649,7 +4649,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
4649{ 4649{
4650 struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc); 4650 struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
4651 struct drm_device *dev = crtc->base.dev; 4651 struct drm_device *dev = crtc->base.dev;
4652 struct drm_i915_private *dev_priv = dev->dev_private; 4652 struct drm_i915_private *dev_priv = to_i915(dev);
4653 struct intel_crtc_state *pipe_config = 4653 struct intel_crtc_state *pipe_config =
4654 to_intel_crtc_state(crtc->base.state); 4654 to_intel_crtc_state(crtc->base.state);
4655 struct drm_atomic_state *old_state = old_crtc_state->base.state; 4655 struct drm_atomic_state *old_state = old_crtc_state->base.state;
@@ -4752,7 +4752,7 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask
4752static void ironlake_crtc_enable(struct drm_crtc *crtc) 4752static void ironlake_crtc_enable(struct drm_crtc *crtc)
4753{ 4753{
4754 struct drm_device *dev = crtc->dev; 4754 struct drm_device *dev = crtc->dev;
4755 struct drm_i915_private *dev_priv = dev->dev_private; 4755 struct drm_i915_private *dev_priv = to_i915(dev);
4756 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4756 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4757 struct intel_encoder *encoder; 4757 struct intel_encoder *encoder;
4758 int pipe = intel_crtc->pipe; 4758 int pipe = intel_crtc->pipe;
@@ -4849,7 +4849,7 @@ static bool hsw_crtc_supports_ips(struct intel_crtc *crtc)
4849static void haswell_crtc_enable(struct drm_crtc *crtc) 4849static void haswell_crtc_enable(struct drm_crtc *crtc)
4850{ 4850{
4851 struct drm_device *dev = crtc->dev; 4851 struct drm_device *dev = crtc->dev;
4852 struct drm_i915_private *dev_priv = dev->dev_private; 4852 struct drm_i915_private *dev_priv = to_i915(dev);
4853 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4853 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4854 struct intel_encoder *encoder; 4854 struct intel_encoder *encoder;
4855 int pipe = intel_crtc->pipe, hsw_workaround_pipe; 4855 int pipe = intel_crtc->pipe, hsw_workaround_pipe;
@@ -4973,7 +4973,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
4973static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force) 4973static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force)
4974{ 4974{
4975 struct drm_device *dev = crtc->base.dev; 4975 struct drm_device *dev = crtc->base.dev;
4976 struct drm_i915_private *dev_priv = dev->dev_private; 4976 struct drm_i915_private *dev_priv = to_i915(dev);
4977 int pipe = crtc->pipe; 4977 int pipe = crtc->pipe;
4978 4978
4979 /* To avoid upsetting the power well on haswell only disable the pfit if 4979 /* To avoid upsetting the power well on haswell only disable the pfit if
@@ -4988,7 +4988,7 @@ static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force)
4988static void ironlake_crtc_disable(struct drm_crtc *crtc) 4988static void ironlake_crtc_disable(struct drm_crtc *crtc)
4989{ 4989{
4990 struct drm_device *dev = crtc->dev; 4990 struct drm_device *dev = crtc->dev;
4991 struct drm_i915_private *dev_priv = dev->dev_private; 4991 struct drm_i915_private *dev_priv = to_i915(dev);
4992 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4992 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4993 struct intel_encoder *encoder; 4993 struct intel_encoder *encoder;
4994 int pipe = intel_crtc->pipe; 4994 int pipe = intel_crtc->pipe;
@@ -5051,7 +5051,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
5051static void haswell_crtc_disable(struct drm_crtc *crtc) 5051static void haswell_crtc_disable(struct drm_crtc *crtc)
5052{ 5052{
5053 struct drm_device *dev = crtc->dev; 5053 struct drm_device *dev = crtc->dev;
5054 struct drm_i915_private *dev_priv = dev->dev_private; 5054 struct drm_i915_private *dev_priv = to_i915(dev);
5055 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 5055 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
5056 struct intel_encoder *encoder; 5056 struct intel_encoder *encoder;
5057 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 5057 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
@@ -5103,7 +5103,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
5103static void i9xx_pfit_enable(struct intel_crtc *crtc) 5103static void i9xx_pfit_enable(struct intel_crtc *crtc)
5104{ 5104{
5105 struct drm_device *dev = crtc->base.dev; 5105 struct drm_device *dev = crtc->base.dev;
5106 struct drm_i915_private *dev_priv = dev->dev_private; 5106 struct drm_i915_private *dev_priv = to_i915(dev);
5107 struct intel_crtc_state *pipe_config = crtc->config; 5107 struct intel_crtc_state *pipe_config = crtc->config;
5108 5108
5109 if (!pipe_config->gmch_pfit.control) 5109 if (!pipe_config->gmch_pfit.control)
@@ -5255,7 +5255,7 @@ static unsigned long
5255modeset_get_crtc_power_domains(struct drm_crtc *crtc, 5255modeset_get_crtc_power_domains(struct drm_crtc *crtc,
5256 struct intel_crtc_state *crtc_state) 5256 struct intel_crtc_state *crtc_state)
5257{ 5257{
5258 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 5258 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
5259 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 5259 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
5260 enum intel_display_power_domain domain; 5260 enum intel_display_power_domain domain;
5261 unsigned long domains, new_domains, old_domains; 5261 unsigned long domains, new_domains, old_domains;
@@ -5300,7 +5300,7 @@ static int skl_calc_cdclk(int max_pixclk, int vco);
5300 5300
5301static void intel_update_max_cdclk(struct drm_device *dev) 5301static void intel_update_max_cdclk(struct drm_device *dev)
5302{ 5302{
5303 struct drm_i915_private *dev_priv = dev->dev_private; 5303 struct drm_i915_private *dev_priv = to_i915(dev);
5304 5304
5305 if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) { 5305 if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
5306 u32 limit = I915_READ(SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK; 5306 u32 limit = I915_READ(SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK;
@@ -5361,7 +5361,7 @@ static void intel_update_max_cdclk(struct drm_device *dev)
5361 5361
5362static void intel_update_cdclk(struct drm_device *dev) 5362static void intel_update_cdclk(struct drm_device *dev)
5363{ 5363{
5364 struct drm_i915_private *dev_priv = dev->dev_private; 5364 struct drm_i915_private *dev_priv = to_i915(dev);
5365 5365
5366 dev_priv->cdclk_freq = dev_priv->display.get_display_clock_speed(dev); 5366 dev_priv->cdclk_freq = dev_priv->display.get_display_clock_speed(dev);
5367 5367
@@ -5887,7 +5887,7 @@ sanitize:
5887/* Adjust CDclk dividers to allow high res or save power if possible */ 5887/* Adjust CDclk dividers to allow high res or save power if possible */
5888static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) 5888static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)
5889{ 5889{
5890 struct drm_i915_private *dev_priv = dev->dev_private; 5890 struct drm_i915_private *dev_priv = to_i915(dev);
5891 u32 val, cmd; 5891 u32 val, cmd;
5892 5892
5893 WARN_ON(dev_priv->display.get_display_clock_speed(dev) 5893 WARN_ON(dev_priv->display.get_display_clock_speed(dev)
@@ -5952,7 +5952,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)
5952 5952
5953static void cherryview_set_cdclk(struct drm_device *dev, int cdclk) 5953static void cherryview_set_cdclk(struct drm_device *dev, int cdclk)
5954{ 5954{
5955 struct drm_i915_private *dev_priv = dev->dev_private; 5955 struct drm_i915_private *dev_priv = to_i915(dev);
5956 u32 val, cmd; 5956 u32 val, cmd;
5957 5957
5958 WARN_ON(dev_priv->display.get_display_clock_speed(dev) 5958 WARN_ON(dev_priv->display.get_display_clock_speed(dev)
@@ -6040,7 +6040,7 @@ static int intel_mode_max_pixclk(struct drm_device *dev,
6040 struct drm_atomic_state *state) 6040 struct drm_atomic_state *state)
6041{ 6041{
6042 struct intel_atomic_state *intel_state = to_intel_atomic_state(state); 6042 struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
6043 struct drm_i915_private *dev_priv = dev->dev_private; 6043 struct drm_i915_private *dev_priv = to_i915(dev);
6044 struct drm_crtc *crtc; 6044 struct drm_crtc *crtc;
6045 struct drm_crtc_state *crtc_state; 6045 struct drm_crtc_state *crtc_state;
6046 unsigned max_pixclk = 0, i; 6046 unsigned max_pixclk = 0, i;
@@ -6067,7 +6067,7 @@ static int intel_mode_max_pixclk(struct drm_device *dev,
6067static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state) 6067static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state)
6068{ 6068{
6069 struct drm_device *dev = state->dev; 6069 struct drm_device *dev = state->dev;
6070 struct drm_i915_private *dev_priv = dev->dev_private; 6070 struct drm_i915_private *dev_priv = to_i915(dev);
6071 int max_pixclk = intel_mode_max_pixclk(dev, state); 6071 int max_pixclk = intel_mode_max_pixclk(dev, state);
6072 struct intel_atomic_state *intel_state = 6072 struct intel_atomic_state *intel_state =
6073 to_intel_atomic_state(state); 6073 to_intel_atomic_state(state);
@@ -6135,7 +6135,7 @@ static void vlv_program_pfi_credits(struct drm_i915_private *dev_priv)
6135static void valleyview_modeset_commit_cdclk(struct drm_atomic_state *old_state) 6135static void valleyview_modeset_commit_cdclk(struct drm_atomic_state *old_state)
6136{ 6136{
6137 struct drm_device *dev = old_state->dev; 6137 struct drm_device *dev = old_state->dev;
6138 struct drm_i915_private *dev_priv = dev->dev_private; 6138 struct drm_i915_private *dev_priv = to_i915(dev);
6139 struct intel_atomic_state *old_intel_state = 6139 struct intel_atomic_state *old_intel_state =
6140 to_intel_atomic_state(old_state); 6140 to_intel_atomic_state(old_state);
6141 unsigned req_cdclk = old_intel_state->dev_cdclk; 6141 unsigned req_cdclk = old_intel_state->dev_cdclk;
@@ -6181,7 +6181,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
6181 intel_set_pipe_src_size(intel_crtc); 6181 intel_set_pipe_src_size(intel_crtc);
6182 6182
6183 if (IS_CHERRYVIEW(dev) && pipe == PIPE_B) { 6183 if (IS_CHERRYVIEW(dev) && pipe == PIPE_B) {
6184 struct drm_i915_private *dev_priv = dev->dev_private; 6184 struct drm_i915_private *dev_priv = to_i915(dev);
6185 6185
6186 I915_WRITE(CHV_BLEND(pipe), CHV_BLEND_LEGACY); 6186 I915_WRITE(CHV_BLEND(pipe), CHV_BLEND_LEGACY);
6187 I915_WRITE(CHV_CANVAS(pipe), 0); 6187 I915_WRITE(CHV_CANVAS(pipe), 0);
@@ -6226,7 +6226,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
6226static void i9xx_set_pll_dividers(struct intel_crtc *crtc) 6226static void i9xx_set_pll_dividers(struct intel_crtc *crtc)
6227{ 6227{
6228 struct drm_device *dev = crtc->base.dev; 6228 struct drm_device *dev = crtc->base.dev;
6229 struct drm_i915_private *dev_priv = dev->dev_private; 6229 struct drm_i915_private *dev_priv = to_i915(dev);
6230 6230
6231 I915_WRITE(FP0(crtc->pipe), crtc->config->dpll_hw_state.fp0); 6231 I915_WRITE(FP0(crtc->pipe), crtc->config->dpll_hw_state.fp0);
6232 I915_WRITE(FP1(crtc->pipe), crtc->config->dpll_hw_state.fp1); 6232 I915_WRITE(FP1(crtc->pipe), crtc->config->dpll_hw_state.fp1);
@@ -6283,7 +6283,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
6283static void i9xx_pfit_disable(struct intel_crtc *crtc) 6283static void i9xx_pfit_disable(struct intel_crtc *crtc)
6284{ 6284{
6285 struct drm_device *dev = crtc->base.dev; 6285 struct drm_device *dev = crtc->base.dev;
6286 struct drm_i915_private *dev_priv = dev->dev_private; 6286 struct drm_i915_private *dev_priv = to_i915(dev);
6287 6287
6288 if (!crtc->config->gmch_pfit.control) 6288 if (!crtc->config->gmch_pfit.control)
6289 return; 6289 return;
@@ -6298,7 +6298,7 @@ static void i9xx_pfit_disable(struct intel_crtc *crtc)
6298static void i9xx_crtc_disable(struct drm_crtc *crtc) 6298static void i9xx_crtc_disable(struct drm_crtc *crtc)
6299{ 6299{
6300 struct drm_device *dev = crtc->dev; 6300 struct drm_device *dev = crtc->dev;
6301 struct drm_i915_private *dev_priv = dev->dev_private; 6301 struct drm_i915_private *dev_priv = to_i915(dev);
6302 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 6302 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
6303 struct intel_encoder *encoder; 6303 struct intel_encoder *encoder;
6304 int pipe = intel_crtc->pipe; 6304 int pipe = intel_crtc->pipe;
@@ -6642,7 +6642,7 @@ static void hsw_compute_ips_config(struct intel_crtc *crtc,
6642 struct intel_crtc_state *pipe_config) 6642 struct intel_crtc_state *pipe_config)
6643{ 6643{
6644 struct drm_device *dev = crtc->base.dev; 6644 struct drm_device *dev = crtc->base.dev;
6645 struct drm_i915_private *dev_priv = dev->dev_private; 6645 struct drm_i915_private *dev_priv = to_i915(dev);
6646 6646
6647 pipe_config->ips_enabled = i915.enable_ips && 6647 pipe_config->ips_enabled = i915.enable_ips &&
6648 hsw_crtc_supports_ips(crtc) && 6648 hsw_crtc_supports_ips(crtc) &&
@@ -6662,7 +6662,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
6662 struct intel_crtc_state *pipe_config) 6662 struct intel_crtc_state *pipe_config)
6663{ 6663{
6664 struct drm_device *dev = crtc->base.dev; 6664 struct drm_device *dev = crtc->base.dev;
6665 struct drm_i915_private *dev_priv = dev->dev_private; 6665 struct drm_i915_private *dev_priv = to_i915(dev);
6666 const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; 6666 const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
6667 int clock_limit = dev_priv->max_dotclk_freq; 6667 int clock_limit = dev_priv->max_dotclk_freq;
6668 6668
@@ -6812,7 +6812,7 @@ static int broxton_get_display_clock_speed(struct drm_device *dev)
6812 6812
6813static int broadwell_get_display_clock_speed(struct drm_device *dev) 6813static int broadwell_get_display_clock_speed(struct drm_device *dev)
6814{ 6814{
6815 struct drm_i915_private *dev_priv = dev->dev_private; 6815 struct drm_i915_private *dev_priv = to_i915(dev);
6816 uint32_t lcpll = I915_READ(LCPLL_CTL); 6816 uint32_t lcpll = I915_READ(LCPLL_CTL);
6817 uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; 6817 uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK;
6818 6818
@@ -6832,7 +6832,7 @@ static int broadwell_get_display_clock_speed(struct drm_device *dev)
6832 6832
6833static int haswell_get_display_clock_speed(struct drm_device *dev) 6833static int haswell_get_display_clock_speed(struct drm_device *dev)
6834{ 6834{
6835 struct drm_i915_private *dev_priv = dev->dev_private; 6835 struct drm_i915_private *dev_priv = to_i915(dev);
6836 uint32_t lcpll = I915_READ(LCPLL_CTL); 6836 uint32_t lcpll = I915_READ(LCPLL_CTL);
6837 uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; 6837 uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK;
6838 6838
@@ -6966,7 +6966,7 @@ static int i830_get_display_clock_speed(struct drm_device *dev)
6966 6966
6967static unsigned int intel_hpll_vco(struct drm_device *dev) 6967static unsigned int intel_hpll_vco(struct drm_device *dev)
6968{ 6968{
6969 struct drm_i915_private *dev_priv = dev->dev_private; 6969 struct drm_i915_private *dev_priv = to_i915(dev);
6970 static const unsigned int blb_vco[8] = { 6970 static const unsigned int blb_vco[8] = {
6971 [0] = 3200000, 6971 [0] = 3200000,
6972 [1] = 4000000, 6972 [1] = 4000000,
@@ -7246,7 +7246,7 @@ static void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,
7246 struct intel_link_m_n *m_n) 7246 struct intel_link_m_n *m_n)
7247{ 7247{
7248 struct drm_device *dev = crtc->base.dev; 7248 struct drm_device *dev = crtc->base.dev;
7249 struct drm_i915_private *dev_priv = dev->dev_private; 7249 struct drm_i915_private *dev_priv = to_i915(dev);
7250 int pipe = crtc->pipe; 7250 int pipe = crtc->pipe;
7251 7251
7252 I915_WRITE(PCH_TRANS_DATA_M1(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m); 7252 I915_WRITE(PCH_TRANS_DATA_M1(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m);
@@ -7260,7 +7260,7 @@ static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,
7260 struct intel_link_m_n *m2_n2) 7260 struct intel_link_m_n *m2_n2)
7261{ 7261{
7262 struct drm_device *dev = crtc->base.dev; 7262 struct drm_device *dev = crtc->base.dev;
7263 struct drm_i915_private *dev_priv = dev->dev_private; 7263 struct drm_i915_private *dev_priv = to_i915(dev);
7264 int pipe = crtc->pipe; 7264 int pipe = crtc->pipe;
7265 enum transcoder transcoder = crtc->config->cpu_transcoder; 7265 enum transcoder transcoder = crtc->config->cpu_transcoder;
7266 7266
@@ -7351,7 +7351,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
7351 const struct intel_crtc_state *pipe_config) 7351 const struct intel_crtc_state *pipe_config)
7352{ 7352{
7353 struct drm_device *dev = crtc->base.dev; 7353 struct drm_device *dev = crtc->base.dev;
7354 struct drm_i915_private *dev_priv = dev->dev_private; 7354 struct drm_i915_private *dev_priv = to_i915(dev);
7355 enum pipe pipe = crtc->pipe; 7355 enum pipe pipe = crtc->pipe;
7356 u32 mdiv; 7356 u32 mdiv;
7357 u32 bestn, bestm1, bestm2, bestp1, bestp2; 7357 u32 bestn, bestm1, bestm2, bestp1, bestp2;
@@ -7451,7 +7451,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc,
7451 const struct intel_crtc_state *pipe_config) 7451 const struct intel_crtc_state *pipe_config)
7452{ 7452{
7453 struct drm_device *dev = crtc->base.dev; 7453 struct drm_device *dev = crtc->base.dev;
7454 struct drm_i915_private *dev_priv = dev->dev_private; 7454 struct drm_i915_private *dev_priv = to_i915(dev);
7455 enum pipe pipe = crtc->pipe; 7455 enum pipe pipe = crtc->pipe;
7456 enum dpio_channel port = vlv_pipe_to_channel(pipe); 7456 enum dpio_channel port = vlv_pipe_to_channel(pipe);
7457 u32 loopfilter, tribuf_calcntr; 7457 u32 loopfilter, tribuf_calcntr;
@@ -7613,7 +7613,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,
7613 struct dpll *reduced_clock) 7613 struct dpll *reduced_clock)
7614{ 7614{
7615 struct drm_device *dev = crtc->base.dev; 7615 struct drm_device *dev = crtc->base.dev;
7616 struct drm_i915_private *dev_priv = dev->dev_private; 7616 struct drm_i915_private *dev_priv = to_i915(dev);
7617 u32 dpll; 7617 u32 dpll;
7618 bool is_sdvo; 7618 bool is_sdvo;
7619 struct dpll *clock = &crtc_state->dpll; 7619 struct dpll *clock = &crtc_state->dpll;
@@ -7689,7 +7689,7 @@ static void i8xx_compute_dpll(struct intel_crtc *crtc,
7689 struct dpll *reduced_clock) 7689 struct dpll *reduced_clock)
7690{ 7690{
7691 struct drm_device *dev = crtc->base.dev; 7691 struct drm_device *dev = crtc->base.dev;
7692 struct drm_i915_private *dev_priv = dev->dev_private; 7692 struct drm_i915_private *dev_priv = to_i915(dev);
7693 u32 dpll; 7693 u32 dpll;
7694 struct dpll *clock = &crtc_state->dpll; 7694 struct dpll *clock = &crtc_state->dpll;
7695 7695
@@ -7724,7 +7724,7 @@ static void i8xx_compute_dpll(struct intel_crtc *crtc,
7724static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) 7724static void intel_set_pipe_timings(struct intel_crtc *intel_crtc)
7725{ 7725{
7726 struct drm_device *dev = intel_crtc->base.dev; 7726 struct drm_device *dev = intel_crtc->base.dev;
7727 struct drm_i915_private *dev_priv = dev->dev_private; 7727 struct drm_i915_private *dev_priv = to_i915(dev);
7728 enum pipe pipe = intel_crtc->pipe; 7728 enum pipe pipe = intel_crtc->pipe;
7729 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 7729 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
7730 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; 7730 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
@@ -7786,7 +7786,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc)
7786static void intel_set_pipe_src_size(struct intel_crtc *intel_crtc) 7786static void intel_set_pipe_src_size(struct intel_crtc *intel_crtc)
7787{ 7787{
7788 struct drm_device *dev = intel_crtc->base.dev; 7788 struct drm_device *dev = intel_crtc->base.dev;
7789 struct drm_i915_private *dev_priv = dev->dev_private; 7789 struct drm_i915_private *dev_priv = to_i915(dev);
7790 enum pipe pipe = intel_crtc->pipe; 7790 enum pipe pipe = intel_crtc->pipe;
7791 7791
7792 /* pipesrc controls the size that is scaled from, which should 7792 /* pipesrc controls the size that is scaled from, which should
@@ -7801,7 +7801,7 @@ static void intel_get_pipe_timings(struct intel_crtc *crtc,
7801 struct intel_crtc_state *pipe_config) 7801 struct intel_crtc_state *pipe_config)
7802{ 7802{
7803 struct drm_device *dev = crtc->base.dev; 7803 struct drm_device *dev = crtc->base.dev;
7804 struct drm_i915_private *dev_priv = dev->dev_private; 7804 struct drm_i915_private *dev_priv = to_i915(dev);
7805 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; 7805 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
7806 uint32_t tmp; 7806 uint32_t tmp;
7807 7807
@@ -7836,7 +7836,7 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc,
7836 struct intel_crtc_state *pipe_config) 7836 struct intel_crtc_state *pipe_config)
7837{ 7837{
7838 struct drm_device *dev = crtc->base.dev; 7838 struct drm_device *dev = crtc->base.dev;
7839 struct drm_i915_private *dev_priv = dev->dev_private; 7839 struct drm_i915_private *dev_priv = to_i915(dev);
7840 u32 tmp; 7840 u32 tmp;
7841 7841
7842 tmp = I915_READ(PIPESRC(crtc->pipe)); 7842 tmp = I915_READ(PIPESRC(crtc->pipe));
@@ -7874,7 +7874,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode,
7874static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) 7874static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
7875{ 7875{
7876 struct drm_device *dev = intel_crtc->base.dev; 7876 struct drm_device *dev = intel_crtc->base.dev;
7877 struct drm_i915_private *dev_priv = dev->dev_private; 7877 struct drm_i915_private *dev_priv = to_i915(dev);
7878 uint32_t pipeconf; 7878 uint32_t pipeconf;
7879 7879
7880 pipeconf = 0; 7880 pipeconf = 0;
@@ -7939,7 +7939,7 @@ static int i8xx_crtc_compute_clock(struct intel_crtc *crtc,
7939 struct intel_crtc_state *crtc_state) 7939 struct intel_crtc_state *crtc_state)
7940{ 7940{
7941 struct drm_device *dev = crtc->base.dev; 7941 struct drm_device *dev = crtc->base.dev;
7942 struct drm_i915_private *dev_priv = dev->dev_private; 7942 struct drm_i915_private *dev_priv = to_i915(dev);
7943 const struct intel_limit *limit; 7943 const struct intel_limit *limit;
7944 int refclk = 48000; 7944 int refclk = 48000;
7945 7945
@@ -7975,7 +7975,7 @@ static int g4x_crtc_compute_clock(struct intel_crtc *crtc,
7975 struct intel_crtc_state *crtc_state) 7975 struct intel_crtc_state *crtc_state)
7976{ 7976{
7977 struct drm_device *dev = crtc->base.dev; 7977 struct drm_device *dev = crtc->base.dev;
7978 struct drm_i915_private *dev_priv = dev->dev_private; 7978 struct drm_i915_private *dev_priv = to_i915(dev);
7979 const struct intel_limit *limit; 7979 const struct intel_limit *limit;
7980 int refclk = 96000; 7980 int refclk = 96000;
7981 7981
@@ -8018,7 +8018,7 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
8018 struct intel_crtc_state *crtc_state) 8018 struct intel_crtc_state *crtc_state)
8019{ 8019{
8020 struct drm_device *dev = crtc->base.dev; 8020 struct drm_device *dev = crtc->base.dev;
8021 struct drm_i915_private *dev_priv = dev->dev_private; 8021 struct drm_i915_private *dev_priv = to_i915(dev);
8022 const struct intel_limit *limit; 8022 const struct intel_limit *limit;
8023 int refclk = 96000; 8023 int refclk = 96000;
8024 8024
@@ -8052,7 +8052,7 @@ static int i9xx_crtc_compute_clock(struct intel_crtc *crtc,
8052 struct intel_crtc_state *crtc_state) 8052 struct intel_crtc_state *crtc_state)
8053{ 8053{
8054 struct drm_device *dev = crtc->base.dev; 8054 struct drm_device *dev = crtc->base.dev;
8055 struct drm_i915_private *dev_priv = dev->dev_private; 8055 struct drm_i915_private *dev_priv = to_i915(dev);
8056 const struct intel_limit *limit; 8056 const struct intel_limit *limit;
8057 int refclk = 96000; 8057 int refclk = 96000;
8058 8058
@@ -8128,7 +8128,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,
8128 struct intel_crtc_state *pipe_config) 8128 struct intel_crtc_state *pipe_config)
8129{ 8129{
8130 struct drm_device *dev = crtc->base.dev; 8130 struct drm_device *dev = crtc->base.dev;
8131 struct drm_i915_private *dev_priv = dev->dev_private; 8131 struct drm_i915_private *dev_priv = to_i915(dev);
8132 uint32_t tmp; 8132 uint32_t tmp;
8133 8133
8134 if (INTEL_INFO(dev)->gen <= 3 && (IS_I830(dev) || !IS_MOBILE(dev))) 8134 if (INTEL_INFO(dev)->gen <= 3 && (IS_I830(dev) || !IS_MOBILE(dev)))
@@ -8155,7 +8155,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,
8155 struct intel_crtc_state *pipe_config) 8155 struct intel_crtc_state *pipe_config)
8156{ 8156{
8157 struct drm_device *dev = crtc->base.dev; 8157 struct drm_device *dev = crtc->base.dev;
8158 struct drm_i915_private *dev_priv = dev->dev_private; 8158 struct drm_i915_private *dev_priv = to_i915(dev);
8159 int pipe = pipe_config->cpu_transcoder; 8159 int pipe = pipe_config->cpu_transcoder;
8160 struct dpll clock; 8160 struct dpll clock;
8161 u32 mdiv; 8161 u32 mdiv;
@@ -8183,7 +8183,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
8183 struct intel_initial_plane_config *plane_config) 8183 struct intel_initial_plane_config *plane_config)
8184{ 8184{
8185 struct drm_device *dev = crtc->base.dev; 8185 struct drm_device *dev = crtc->base.dev;
8186 struct drm_i915_private *dev_priv = dev->dev_private; 8186 struct drm_i915_private *dev_priv = to_i915(dev);
8187 u32 val, base, offset; 8187 u32 val, base, offset;
8188 int pipe = crtc->pipe, plane = crtc->plane; 8188 int pipe = crtc->pipe, plane = crtc->plane;
8189 int fourcc, pixel_format; 8189 int fourcc, pixel_format;
@@ -8251,7 +8251,7 @@ static void chv_crtc_clock_get(struct intel_crtc *crtc,
8251 struct intel_crtc_state *pipe_config) 8251 struct intel_crtc_state *pipe_config)
8252{ 8252{
8253 struct drm_device *dev = crtc->base.dev; 8253 struct drm_device *dev = crtc->base.dev;
8254 struct drm_i915_private *dev_priv = dev->dev_private; 8254 struct drm_i915_private *dev_priv = to_i915(dev);
8255 int pipe = pipe_config->cpu_transcoder; 8255 int pipe = pipe_config->cpu_transcoder;
8256 enum dpio_channel port = vlv_pipe_to_channel(pipe); 8256 enum dpio_channel port = vlv_pipe_to_channel(pipe);
8257 struct dpll clock; 8257 struct dpll clock;
@@ -8285,7 +8285,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
8285 struct intel_crtc_state *pipe_config) 8285 struct intel_crtc_state *pipe_config)
8286{ 8286{
8287 struct drm_device *dev = crtc->base.dev; 8287 struct drm_device *dev = crtc->base.dev;
8288 struct drm_i915_private *dev_priv = dev->dev_private; 8288 struct drm_i915_private *dev_priv = to_i915(dev);
8289 enum intel_display_power_domain power_domain; 8289 enum intel_display_power_domain power_domain;
8290 uint32_t tmp; 8290 uint32_t tmp;
8291 bool ret; 8291 bool ret;
@@ -8396,7 +8396,7 @@ out:
8396 8396
8397static void ironlake_init_pch_refclk(struct drm_device *dev) 8397static void ironlake_init_pch_refclk(struct drm_device *dev)
8398{ 8398{
8399 struct drm_i915_private *dev_priv = dev->dev_private; 8399 struct drm_i915_private *dev_priv = to_i915(dev);
8400 struct intel_encoder *encoder; 8400 struct intel_encoder *encoder;
8401 int i; 8401 int i;
8402 u32 val, final; 8402 u32 val, final;
@@ -8667,7 +8667,7 @@ static void lpt_program_fdi_mphy(struct drm_i915_private *dev_priv)
8667static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread, 8667static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
8668 bool with_fdi) 8668 bool with_fdi)
8669{ 8669{
8670 struct drm_i915_private *dev_priv = dev->dev_private; 8670 struct drm_i915_private *dev_priv = to_i915(dev);
8671 uint32_t reg, tmp; 8671 uint32_t reg, tmp;
8672 8672
8673 if (WARN(with_fdi && !with_spread, "FDI requires downspread\n")) 8673 if (WARN(with_fdi && !with_spread, "FDI requires downspread\n"))
@@ -8706,7 +8706,7 @@ static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
8706/* Sequence to disable CLKOUT_DP */ 8706/* Sequence to disable CLKOUT_DP */
8707static void lpt_disable_clkout_dp(struct drm_device *dev) 8707static void lpt_disable_clkout_dp(struct drm_device *dev)
8708{ 8708{
8709 struct drm_i915_private *dev_priv = dev->dev_private; 8709 struct drm_i915_private *dev_priv = to_i915(dev);
8710 uint32_t reg, tmp; 8710 uint32_t reg, tmp;
8711 8711
8712 mutex_lock(&dev_priv->sb_lock); 8712 mutex_lock(&dev_priv->sb_lock);
@@ -8827,7 +8827,7 @@ void intel_init_pch_refclk(struct drm_device *dev)
8827 8827
8828static void ironlake_set_pipeconf(struct drm_crtc *crtc) 8828static void ironlake_set_pipeconf(struct drm_crtc *crtc)
8829{ 8829{
8830 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 8830 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
8831 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8831 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8832 int pipe = intel_crtc->pipe; 8832 int pipe = intel_crtc->pipe;
8833 uint32_t val; 8833 uint32_t val;
@@ -8869,7 +8869,7 @@ static void ironlake_set_pipeconf(struct drm_crtc *crtc)
8869 8869
8870static void haswell_set_pipeconf(struct drm_crtc *crtc) 8870static void haswell_set_pipeconf(struct drm_crtc *crtc)
8871{ 8871{
8872 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 8872 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
8873 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8873 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8874 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 8874 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
8875 u32 val = 0; 8875 u32 val = 0;
@@ -8888,7 +8888,7 @@ static void haswell_set_pipeconf(struct drm_crtc *crtc)
8888 8888
8889static void haswell_set_pipemisc(struct drm_crtc *crtc) 8889static void haswell_set_pipemisc(struct drm_crtc *crtc)
8890{ 8890{
8891 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 8891 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
8892 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8892 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8893 8893
8894 if (IS_BROADWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 9) { 8894 if (IS_BROADWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 9) {
@@ -8941,7 +8941,7 @@ static void ironlake_compute_dpll(struct intel_crtc *intel_crtc,
8941{ 8941{
8942 struct drm_crtc *crtc = &intel_crtc->base; 8942 struct drm_crtc *crtc = &intel_crtc->base;
8943 struct drm_device *dev = crtc->dev; 8943 struct drm_device *dev = crtc->dev;
8944 struct drm_i915_private *dev_priv = dev->dev_private; 8944 struct drm_i915_private *dev_priv = to_i915(dev);
8945 struct drm_atomic_state *state = crtc_state->base.state; 8945 struct drm_atomic_state *state = crtc_state->base.state;
8946 struct drm_connector *connector; 8946 struct drm_connector *connector;
8947 struct drm_connector_state *connector_state; 8947 struct drm_connector_state *connector_state;
@@ -9044,7 +9044,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
9044 struct intel_crtc_state *crtc_state) 9044 struct intel_crtc_state *crtc_state)
9045{ 9045{
9046 struct drm_device *dev = crtc->base.dev; 9046 struct drm_device *dev = crtc->base.dev;
9047 struct drm_i915_private *dev_priv = dev->dev_private; 9047 struct drm_i915_private *dev_priv = to_i915(dev);
9048 struct dpll reduced_clock; 9048 struct dpll reduced_clock;
9049 bool has_reduced_clock = false; 9049 bool has_reduced_clock = false;
9050 struct intel_shared_dpll *pll; 9050 struct intel_shared_dpll *pll;
@@ -9110,7 +9110,7 @@ static void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,
9110 struct intel_link_m_n *m_n) 9110 struct intel_link_m_n *m_n)
9111{ 9111{
9112 struct drm_device *dev = crtc->base.dev; 9112 struct drm_device *dev = crtc->base.dev;
9113 struct drm_i915_private *dev_priv = dev->dev_private; 9113 struct drm_i915_private *dev_priv = to_i915(dev);
9114 enum pipe pipe = crtc->pipe; 9114 enum pipe pipe = crtc->pipe;
9115 9115
9116 m_n->link_m = I915_READ(PCH_TRANS_LINK_M1(pipe)); 9116 m_n->link_m = I915_READ(PCH_TRANS_LINK_M1(pipe));
@@ -9128,7 +9128,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
9128 struct intel_link_m_n *m2_n2) 9128 struct intel_link_m_n *m2_n2)
9129{ 9129{
9130 struct drm_device *dev = crtc->base.dev; 9130 struct drm_device *dev = crtc->base.dev;
9131 struct drm_i915_private *dev_priv = dev->dev_private; 9131 struct drm_i915_private *dev_priv = to_i915(dev);
9132 enum pipe pipe = crtc->pipe; 9132 enum pipe pipe = crtc->pipe;
9133 9133
9134 if (INTEL_INFO(dev)->gen >= 5) { 9134 if (INTEL_INFO(dev)->gen >= 5) {
@@ -9186,7 +9186,7 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
9186 struct intel_crtc_state *pipe_config) 9186 struct intel_crtc_state *pipe_config)
9187{ 9187{
9188 struct drm_device *dev = crtc->base.dev; 9188 struct drm_device *dev = crtc->base.dev;
9189 struct drm_i915_private *dev_priv = dev->dev_private; 9189 struct drm_i915_private *dev_priv = to_i915(dev);
9190 struct intel_crtc_scaler_state *scaler_state = &pipe_config->scaler_state; 9190 struct intel_crtc_scaler_state *scaler_state = &pipe_config->scaler_state;
9191 uint32_t ps_ctrl = 0; 9191 uint32_t ps_ctrl = 0;
9192 int id = -1; 9192 int id = -1;
@@ -9217,7 +9217,7 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
9217 struct intel_initial_plane_config *plane_config) 9217 struct intel_initial_plane_config *plane_config)
9218{ 9218{
9219 struct drm_device *dev = crtc->base.dev; 9219 struct drm_device *dev = crtc->base.dev;
9220 struct drm_i915_private *dev_priv = dev->dev_private; 9220 struct drm_i915_private *dev_priv = to_i915(dev);
9221 u32 val, base, offset, stride_mult, tiling; 9221 u32 val, base, offset, stride_mult, tiling;
9222 int pipe = crtc->pipe; 9222 int pipe = crtc->pipe;
9223 int fourcc, pixel_format; 9223 int fourcc, pixel_format;
@@ -9300,7 +9300,7 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
9300 struct intel_crtc_state *pipe_config) 9300 struct intel_crtc_state *pipe_config)
9301{ 9301{
9302 struct drm_device *dev = crtc->base.dev; 9302 struct drm_device *dev = crtc->base.dev;
9303 struct drm_i915_private *dev_priv = dev->dev_private; 9303 struct drm_i915_private *dev_priv = to_i915(dev);
9304 uint32_t tmp; 9304 uint32_t tmp;
9305 9305
9306 tmp = I915_READ(PF_CTL(crtc->pipe)); 9306 tmp = I915_READ(PF_CTL(crtc->pipe));
@@ -9325,7 +9325,7 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
9325 struct intel_initial_plane_config *plane_config) 9325 struct intel_initial_plane_config *plane_config)
9326{ 9326{
9327 struct drm_device *dev = crtc->base.dev; 9327 struct drm_device *dev = crtc->base.dev;
9328 struct drm_i915_private *dev_priv = dev->dev_private; 9328 struct drm_i915_private *dev_priv = to_i915(dev);
9329 u32 val, base, offset; 9329 u32 val, base, offset;
9330 int pipe = crtc->pipe; 9330 int pipe = crtc->pipe;
9331 int fourcc, pixel_format; 9331 int fourcc, pixel_format;
@@ -9393,7 +9393,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
9393 struct intel_crtc_state *pipe_config) 9393 struct intel_crtc_state *pipe_config)
9394{ 9394{
9395 struct drm_device *dev = crtc->base.dev; 9395 struct drm_device *dev = crtc->base.dev;
9396 struct drm_i915_private *dev_priv = dev->dev_private; 9396 struct drm_i915_private *dev_priv = to_i915(dev);
9397 enum intel_display_power_domain power_domain; 9397 enum intel_display_power_domain power_domain;
9398 uint32_t tmp; 9398 uint32_t tmp;
9399 bool ret; 9399 bool ret;
@@ -9723,7 +9723,7 @@ static void bxt_modeset_commit_cdclk(struct drm_atomic_state *old_state)
9723static int ilk_max_pixel_rate(struct drm_atomic_state *state) 9723static int ilk_max_pixel_rate(struct drm_atomic_state *state)
9724{ 9724{
9725 struct intel_atomic_state *intel_state = to_intel_atomic_state(state); 9725 struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
9726 struct drm_i915_private *dev_priv = state->dev->dev_private; 9726 struct drm_i915_private *dev_priv = to_i915(state->dev);
9727 struct drm_crtc *crtc; 9727 struct drm_crtc *crtc;
9728 struct drm_crtc_state *cstate; 9728 struct drm_crtc_state *cstate;
9729 struct intel_crtc_state *crtc_state; 9729 struct intel_crtc_state *crtc_state;
@@ -9759,7 +9759,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state)
9759 9759
9760static void broadwell_set_cdclk(struct drm_device *dev, int cdclk) 9760static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
9761{ 9761{
9762 struct drm_i915_private *dev_priv = dev->dev_private; 9762 struct drm_i915_private *dev_priv = to_i915(dev);
9763 uint32_t val, data; 9763 uint32_t val, data;
9764 int ret; 9764 int ret;
9765 9765
@@ -10041,7 +10041,7 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,
10041 unsigned long *power_domain_mask) 10041 unsigned long *power_domain_mask)
10042{ 10042{
10043 struct drm_device *dev = crtc->base.dev; 10043 struct drm_device *dev = crtc->base.dev;
10044 struct drm_i915_private *dev_priv = dev->dev_private; 10044 struct drm_i915_private *dev_priv = to_i915(dev);
10045 enum intel_display_power_domain power_domain; 10045 enum intel_display_power_domain power_domain;
10046 u32 tmp; 10046 u32 tmp;
10047 10047
@@ -10092,7 +10092,7 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
10092 unsigned long *power_domain_mask) 10092 unsigned long *power_domain_mask)
10093{ 10093{
10094 struct drm_device *dev = crtc->base.dev; 10094 struct drm_device *dev = crtc->base.dev;
10095 struct drm_i915_private *dev_priv = dev->dev_private; 10095 struct drm_i915_private *dev_priv = to_i915(dev);
10096 enum intel_display_power_domain power_domain; 10096 enum intel_display_power_domain power_domain;
10097 enum port port; 10097 enum port port;
10098 enum transcoder cpu_transcoder; 10098 enum transcoder cpu_transcoder;
@@ -10142,7 +10142,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
10142 struct intel_crtc_state *pipe_config) 10142 struct intel_crtc_state *pipe_config)
10143{ 10143{
10144 struct drm_device *dev = crtc->base.dev; 10144 struct drm_device *dev = crtc->base.dev;
10145 struct drm_i915_private *dev_priv = dev->dev_private; 10145 struct drm_i915_private *dev_priv = to_i915(dev);
10146 struct intel_shared_dpll *pll; 10146 struct intel_shared_dpll *pll;
10147 enum port port; 10147 enum port port;
10148 uint32_t tmp; 10148 uint32_t tmp;
@@ -10185,7 +10185,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
10185 struct intel_crtc_state *pipe_config) 10185 struct intel_crtc_state *pipe_config)
10186{ 10186{
10187 struct drm_device *dev = crtc->base.dev; 10187 struct drm_device *dev = crtc->base.dev;
10188 struct drm_i915_private *dev_priv = dev->dev_private; 10188 struct drm_i915_private *dev_priv = to_i915(dev);
10189 enum intel_display_power_domain power_domain; 10189 enum intel_display_power_domain power_domain;
10190 unsigned long power_domain_mask; 10190 unsigned long power_domain_mask;
10191 bool active; 10191 bool active;
@@ -10261,7 +10261,7 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base,
10261 const struct intel_plane_state *plane_state) 10261 const struct intel_plane_state *plane_state)
10262{ 10262{
10263 struct drm_device *dev = crtc->dev; 10263 struct drm_device *dev = crtc->dev;
10264 struct drm_i915_private *dev_priv = dev->dev_private; 10264 struct drm_i915_private *dev_priv = to_i915(dev);
10265 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 10265 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
10266 uint32_t cntl = 0, size = 0; 10266 uint32_t cntl = 0, size = 0;
10267 10267
@@ -10324,7 +10324,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,
10324 const struct intel_plane_state *plane_state) 10324 const struct intel_plane_state *plane_state)
10325{ 10325{
10326 struct drm_device *dev = crtc->dev; 10326 struct drm_device *dev = crtc->dev;
10327 struct drm_i915_private *dev_priv = dev->dev_private; 10327 struct drm_i915_private *dev_priv = to_i915(dev);
10328 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 10328 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
10329 int pipe = intel_crtc->pipe; 10329 int pipe = intel_crtc->pipe;
10330 uint32_t cntl = 0; 10330 uint32_t cntl = 0;
@@ -10372,7 +10372,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
10372 const struct intel_plane_state *plane_state) 10372 const struct intel_plane_state *plane_state)
10373{ 10373{
10374 struct drm_device *dev = crtc->dev; 10374 struct drm_device *dev = crtc->dev;
10375 struct drm_i915_private *dev_priv = dev->dev_private; 10375 struct drm_i915_private *dev_priv = to_i915(dev);
10376 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 10376 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
10377 int pipe = intel_crtc->pipe; 10377 int pipe = intel_crtc->pipe;
10378 u32 base = intel_crtc->cursor_addr; 10378 u32 base = intel_crtc->cursor_addr;
@@ -10539,7 +10539,7 @@ mode_fits_in_fbdev(struct drm_device *dev,
10539 struct drm_display_mode *mode) 10539 struct drm_display_mode *mode)
10540{ 10540{
10541#ifdef CONFIG_DRM_FBDEV_EMULATION 10541#ifdef CONFIG_DRM_FBDEV_EMULATION
10542 struct drm_i915_private *dev_priv = dev->dev_private; 10542 struct drm_i915_private *dev_priv = to_i915(dev);
10543 struct drm_i915_gem_object *obj; 10543 struct drm_i915_gem_object *obj;
10544 struct drm_framebuffer *fb; 10544 struct drm_framebuffer *fb;
10545 10545
@@ -10809,7 +10809,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
10809static int i9xx_pll_refclk(struct drm_device *dev, 10809static int i9xx_pll_refclk(struct drm_device *dev,
10810 const struct intel_crtc_state *pipe_config) 10810 const struct intel_crtc_state *pipe_config)
10811{ 10811{
10812 struct drm_i915_private *dev_priv = dev->dev_private; 10812 struct drm_i915_private *dev_priv = to_i915(dev);
10813 u32 dpll = pipe_config->dpll_hw_state.dpll; 10813 u32 dpll = pipe_config->dpll_hw_state.dpll;
10814 10814
10815 if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN) 10815 if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
@@ -10827,7 +10827,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
10827 struct intel_crtc_state *pipe_config) 10827 struct intel_crtc_state *pipe_config)
10828{ 10828{
10829 struct drm_device *dev = crtc->base.dev; 10829 struct drm_device *dev = crtc->base.dev;
10830 struct drm_i915_private *dev_priv = dev->dev_private; 10830 struct drm_i915_private *dev_priv = to_i915(dev);
10831 int pipe = pipe_config->cpu_transcoder; 10831 int pipe = pipe_config->cpu_transcoder;
10832 u32 dpll = pipe_config->dpll_hw_state.dpll; 10832 u32 dpll = pipe_config->dpll_hw_state.dpll;
10833 u32 fp; 10833 u32 fp;
@@ -10953,7 +10953,7 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc,
10953struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, 10953struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
10954 struct drm_crtc *crtc) 10954 struct drm_crtc *crtc)
10955{ 10955{
10956 struct drm_i915_private *dev_priv = dev->dev_private; 10956 struct drm_i915_private *dev_priv = to_i915(dev);
10957 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 10957 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
10958 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 10958 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
10959 struct drm_display_mode *mode; 10959 struct drm_display_mode *mode;
@@ -11066,7 +11066,7 @@ static bool __pageflip_finished_cs(struct intel_crtc *crtc,
11066 struct intel_flip_work *work) 11066 struct intel_flip_work *work)
11067{ 11067{
11068 struct drm_device *dev = crtc->base.dev; 11068 struct drm_device *dev = crtc->base.dev;
11069 struct drm_i915_private *dev_priv = dev->dev_private; 11069 struct drm_i915_private *dev_priv = to_i915(dev);
11070 unsigned reset_counter; 11070 unsigned reset_counter;
11071 11071
11072 reset_counter = i915_reset_counter(&dev_priv->gpu_error); 11072 reset_counter = i915_reset_counter(&dev_priv->gpu_error);
@@ -11277,7 +11277,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev,
11277 uint32_t flags) 11277 uint32_t flags)
11278{ 11278{
11279 struct intel_engine_cs *engine = req->engine; 11279 struct intel_engine_cs *engine = req->engine;
11280 struct drm_i915_private *dev_priv = dev->dev_private; 11280 struct drm_i915_private *dev_priv = to_i915(dev);
11281 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 11281 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
11282 uint32_t pf, pipesrc; 11282 uint32_t pf, pipesrc;
11283 int ret; 11283 int ret;
@@ -11315,7 +11315,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
11315 uint32_t flags) 11315 uint32_t flags)
11316{ 11316{
11317 struct intel_engine_cs *engine = req->engine; 11317 struct intel_engine_cs *engine = req->engine;
11318 struct drm_i915_private *dev_priv = dev->dev_private; 11318 struct drm_i915_private *dev_priv = to_i915(dev);
11319 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 11319 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
11320 uint32_t pf, pipesrc; 11320 uint32_t pf, pipesrc;
11321 int ret; 11321 int ret;
@@ -11474,7 +11474,7 @@ static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
11474 struct intel_flip_work *work) 11474 struct intel_flip_work *work)
11475{ 11475{
11476 struct drm_device *dev = intel_crtc->base.dev; 11476 struct drm_device *dev = intel_crtc->base.dev;
11477 struct drm_i915_private *dev_priv = dev->dev_private; 11477 struct drm_i915_private *dev_priv = to_i915(dev);
11478 struct drm_framebuffer *fb = intel_crtc->base.primary->fb; 11478 struct drm_framebuffer *fb = intel_crtc->base.primary->fb;
11479 const enum pipe pipe = intel_crtc->pipe; 11479 const enum pipe pipe = intel_crtc->pipe;
11480 u32 ctl, stride, tile_height; 11480 u32 ctl, stride, tile_height;
@@ -11526,7 +11526,7 @@ static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc,
11526 struct intel_flip_work *work) 11526 struct intel_flip_work *work)
11527{ 11527{
11528 struct drm_device *dev = intel_crtc->base.dev; 11528 struct drm_device *dev = intel_crtc->base.dev;
11529 struct drm_i915_private *dev_priv = dev->dev_private; 11529 struct drm_i915_private *dev_priv = to_i915(dev);
11530 struct intel_framebuffer *intel_fb = 11530 struct intel_framebuffer *intel_fb =
11531 to_intel_framebuffer(intel_crtc->base.primary->fb); 11531 to_intel_framebuffer(intel_crtc->base.primary->fb);
11532 struct drm_i915_gem_object *obj = intel_fb->obj; 11532 struct drm_i915_gem_object *obj = intel_fb->obj;
@@ -11662,7 +11662,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
11662 uint32_t page_flip_flags) 11662 uint32_t page_flip_flags)
11663{ 11663{
11664 struct drm_device *dev = crtc->dev; 11664 struct drm_device *dev = crtc->dev;
11665 struct drm_i915_private *dev_priv = dev->dev_private; 11665 struct drm_i915_private *dev_priv = to_i915(dev);
11666 struct drm_framebuffer *old_fb = crtc->primary->fb; 11666 struct drm_framebuffer *old_fb = crtc->primary->fb;
11667 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 11667 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
11668 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 11668 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -12099,7 +12099,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
12099 struct drm_crtc_state *crtc_state) 12099 struct drm_crtc_state *crtc_state)
12100{ 12100{
12101 struct drm_device *dev = crtc->dev; 12101 struct drm_device *dev = crtc->dev;
12102 struct drm_i915_private *dev_priv = dev->dev_private; 12102 struct drm_i915_private *dev_priv = to_i915(dev);
12103 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 12103 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
12104 struct intel_crtc_state *pipe_config = 12104 struct intel_crtc_state *pipe_config =
12105 to_intel_crtc_state(crtc_state); 12105 to_intel_crtc_state(crtc_state);
@@ -12960,7 +12960,7 @@ static void verify_wm_state(struct drm_crtc *crtc,
12960 struct drm_crtc_state *new_state) 12960 struct drm_crtc_state *new_state)
12961{ 12961{
12962 struct drm_device *dev = crtc->dev; 12962 struct drm_device *dev = crtc->dev;
12963 struct drm_i915_private *dev_priv = dev->dev_private; 12963 struct drm_i915_private *dev_priv = to_i915(dev);
12964 struct skl_ddb_allocation hw_ddb, *sw_ddb; 12964 struct skl_ddb_allocation hw_ddb, *sw_ddb;
12965 struct skl_ddb_entry *hw_entry, *sw_entry; 12965 struct skl_ddb_entry *hw_entry, *sw_entry;
12966 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 12966 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -13066,7 +13066,7 @@ verify_crtc_state(struct drm_crtc *crtc,
13066 struct drm_crtc_state *new_crtc_state) 13066 struct drm_crtc_state *new_crtc_state)
13067{ 13067{
13068 struct drm_device *dev = crtc->dev; 13068 struct drm_device *dev = crtc->dev;
13069 struct drm_i915_private *dev_priv = dev->dev_private; 13069 struct drm_i915_private *dev_priv = to_i915(dev);
13070 struct intel_encoder *encoder; 13070 struct intel_encoder *encoder;
13071 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 13071 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
13072 struct intel_crtc_state *pipe_config, *sw_config; 13072 struct intel_crtc_state *pipe_config, *sw_config;
@@ -13189,7 +13189,7 @@ verify_shared_dpll_state(struct drm_device *dev, struct drm_crtc *crtc,
13189 struct drm_crtc_state *old_crtc_state, 13189 struct drm_crtc_state *old_crtc_state,
13190 struct drm_crtc_state *new_crtc_state) 13190 struct drm_crtc_state *new_crtc_state)
13191{ 13191{
13192 struct drm_i915_private *dev_priv = dev->dev_private; 13192 struct drm_i915_private *dev_priv = to_i915(dev);
13193 struct intel_crtc_state *old_state = to_intel_crtc_state(old_crtc_state); 13193 struct intel_crtc_state *old_state = to_intel_crtc_state(old_crtc_state);
13194 struct intel_crtc_state *new_state = to_intel_crtc_state(new_crtc_state); 13194 struct intel_crtc_state *new_state = to_intel_crtc_state(new_crtc_state);
13195 13195
@@ -13228,7 +13228,7 @@ intel_modeset_verify_crtc(struct drm_crtc *crtc,
13228static void 13228static void
13229verify_disabled_dpll_state(struct drm_device *dev) 13229verify_disabled_dpll_state(struct drm_device *dev)
13230{ 13230{
13231 struct drm_i915_private *dev_priv = dev->dev_private; 13231 struct drm_i915_private *dev_priv = to_i915(dev);
13232 int i; 13232 int i;
13233 13233
13234 for (i = 0; i < dev_priv->num_shared_dpll; i++) 13234 for (i = 0; i < dev_priv->num_shared_dpll; i++)
@@ -13410,7 +13410,7 @@ static int intel_modeset_all_pipes(struct drm_atomic_state *state)
13410static int intel_modeset_checks(struct drm_atomic_state *state) 13410static int intel_modeset_checks(struct drm_atomic_state *state)
13411{ 13411{
13412 struct intel_atomic_state *intel_state = to_intel_atomic_state(state); 13412 struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
13413 struct drm_i915_private *dev_priv = state->dev->dev_private; 13413 struct drm_i915_private *dev_priv = to_i915(state->dev);
13414 struct drm_crtc *crtc; 13414 struct drm_crtc *crtc;
13415 struct drm_crtc_state *crtc_state; 13415 struct drm_crtc_state *crtc_state;
13416 int ret = 0, i; 13416 int ret = 0, i;
@@ -13576,7 +13576,7 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
13576 struct drm_atomic_state *state, 13576 struct drm_atomic_state *state,
13577 bool nonblock) 13577 bool nonblock)
13578{ 13578{
13579 struct drm_i915_private *dev_priv = dev->dev_private; 13579 struct drm_i915_private *dev_priv = to_i915(dev);
13580 struct drm_plane_state *plane_state; 13580 struct drm_plane_state *plane_state;
13581 struct drm_crtc_state *crtc_state; 13581 struct drm_crtc_state *crtc_state;
13582 struct drm_plane *plane; 13582 struct drm_plane *plane;
@@ -13705,7 +13705,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
13705{ 13705{
13706 struct drm_device *dev = state->dev; 13706 struct drm_device *dev = state->dev;
13707 struct intel_atomic_state *intel_state = to_intel_atomic_state(state); 13707 struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
13708 struct drm_i915_private *dev_priv = dev->dev_private; 13708 struct drm_i915_private *dev_priv = to_i915(dev);
13709 struct drm_crtc_state *old_crtc_state; 13709 struct drm_crtc_state *old_crtc_state;
13710 struct drm_crtc *crtc; 13710 struct drm_crtc *crtc;
13711 struct intel_crtc_state *intel_cstate; 13711 struct intel_crtc_state *intel_cstate;
@@ -13937,7 +13937,7 @@ static int intel_atomic_commit(struct drm_device *dev,
13937 bool nonblock) 13937 bool nonblock)
13938{ 13938{
13939 struct intel_atomic_state *intel_state = to_intel_atomic_state(state); 13939 struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
13940 struct drm_i915_private *dev_priv = dev->dev_private; 13940 struct drm_i915_private *dev_priv = to_i915(dev);
13941 int ret = 0; 13941 int ret = 0;
13942 13942
13943 if (intel_state->modeset && nonblock) { 13943 if (intel_state->modeset && nonblock) {
@@ -14542,7 +14542,7 @@ static void skl_init_scalers(struct drm_device *dev, struct intel_crtc *intel_cr
14542 14542
14543static void intel_crtc_init(struct drm_device *dev, int pipe) 14543static void intel_crtc_init(struct drm_device *dev, int pipe)
14544{ 14544{
14545 struct drm_i915_private *dev_priv = dev->dev_private; 14545 struct drm_i915_private *dev_priv = to_i915(dev);
14546 struct intel_crtc *intel_crtc; 14546 struct intel_crtc *intel_crtc;
14547 struct intel_crtc_state *crtc_state = NULL; 14547 struct intel_crtc_state *crtc_state = NULL;
14548 struct drm_plane *primary = NULL; 14548 struct drm_plane *primary = NULL;
@@ -14669,7 +14669,7 @@ static int intel_encoder_clones(struct intel_encoder *encoder)
14669 14669
14670static bool has_edp_a(struct drm_device *dev) 14670static bool has_edp_a(struct drm_device *dev)
14671{ 14671{
14672 struct drm_i915_private *dev_priv = dev->dev_private; 14672 struct drm_i915_private *dev_priv = to_i915(dev);
14673 14673
14674 if (!IS_MOBILE(dev)) 14674 if (!IS_MOBILE(dev))
14675 return false; 14675 return false;
@@ -14685,7 +14685,7 @@ static bool has_edp_a(struct drm_device *dev)
14685 14685
14686static bool intel_crt_present(struct drm_device *dev) 14686static bool intel_crt_present(struct drm_device *dev)
14687{ 14687{
14688 struct drm_i915_private *dev_priv = dev->dev_private; 14688 struct drm_i915_private *dev_priv = to_i915(dev);
14689 14689
14690 if (INTEL_INFO(dev)->gen >= 9) 14690 if (INTEL_INFO(dev)->gen >= 9)
14691 return false; 14691 return false;
@@ -14711,7 +14711,7 @@ static bool intel_crt_present(struct drm_device *dev)
14711 14711
14712static void intel_setup_outputs(struct drm_device *dev) 14712static void intel_setup_outputs(struct drm_device *dev)
14713{ 14713{
14714 struct drm_i915_private *dev_priv = dev->dev_private; 14714 struct drm_i915_private *dev_priv = to_i915(dev);
14715 struct intel_encoder *encoder; 14715 struct intel_encoder *encoder;
14716 bool dpd_is_edp = false; 14716 bool dpd_is_edp = false;
14717 14717
@@ -15364,7 +15364,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
15364 */ 15364 */
15365static void quirk_pipea_force(struct drm_device *dev) 15365static void quirk_pipea_force(struct drm_device *dev)
15366{ 15366{
15367 struct drm_i915_private *dev_priv = dev->dev_private; 15367 struct drm_i915_private *dev_priv = to_i915(dev);
15368 15368
15369 dev_priv->quirks |= QUIRK_PIPEA_FORCE; 15369 dev_priv->quirks |= QUIRK_PIPEA_FORCE;
15370 DRM_INFO("applying pipe a force quirk\n"); 15370 DRM_INFO("applying pipe a force quirk\n");
@@ -15372,7 +15372,7 @@ static void quirk_pipea_force(struct drm_device *dev)
15372 15372
15373static void quirk_pipeb_force(struct drm_device *dev) 15373static void quirk_pipeb_force(struct drm_device *dev)
15374{ 15374{
15375 struct drm_i915_private *dev_priv = dev->dev_private; 15375 struct drm_i915_private *dev_priv = to_i915(dev);
15376 15376
15377 dev_priv->quirks |= QUIRK_PIPEB_FORCE; 15377 dev_priv->quirks |= QUIRK_PIPEB_FORCE;
15378 DRM_INFO("applying pipe b force quirk\n"); 15378 DRM_INFO("applying pipe b force quirk\n");
@@ -15383,7 +15383,7 @@ static void quirk_pipeb_force(struct drm_device *dev)
15383 */ 15383 */
15384static void quirk_ssc_force_disable(struct drm_device *dev) 15384static void quirk_ssc_force_disable(struct drm_device *dev)
15385{ 15385{
15386 struct drm_i915_private *dev_priv = dev->dev_private; 15386 struct drm_i915_private *dev_priv = to_i915(dev);
15387 dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE; 15387 dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE;
15388 DRM_INFO("applying lvds SSC disable quirk\n"); 15388 DRM_INFO("applying lvds SSC disable quirk\n");
15389} 15389}
@@ -15394,7 +15394,7 @@ static void quirk_ssc_force_disable(struct drm_device *dev)
15394 */ 15394 */
15395static void quirk_invert_brightness(struct drm_device *dev) 15395static void quirk_invert_brightness(struct drm_device *dev)
15396{ 15396{
15397 struct drm_i915_private *dev_priv = dev->dev_private; 15397 struct drm_i915_private *dev_priv = to_i915(dev);
15398 dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS; 15398 dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS;
15399 DRM_INFO("applying inverted panel brightness quirk\n"); 15399 DRM_INFO("applying inverted panel brightness quirk\n");
15400} 15400}
@@ -15402,7 +15402,7 @@ static void quirk_invert_brightness(struct drm_device *dev)
15402/* Some VBT's incorrectly indicate no backlight is present */ 15402/* Some VBT's incorrectly indicate no backlight is present */
15403static void quirk_backlight_present(struct drm_device *dev) 15403static void quirk_backlight_present(struct drm_device *dev)
15404{ 15404{
15405 struct drm_i915_private *dev_priv = dev->dev_private; 15405 struct drm_i915_private *dev_priv = to_i915(dev);
15406 dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT; 15406 dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT;
15407 DRM_INFO("applying backlight present quirk\n"); 15407 DRM_INFO("applying backlight present quirk\n");
15408} 15408}
@@ -15528,7 +15528,7 @@ static void intel_init_quirks(struct drm_device *dev)
15528/* Disable the VGA plane that we never use */ 15528/* Disable the VGA plane that we never use */
15529static void i915_disable_vga(struct drm_device *dev) 15529static void i915_disable_vga(struct drm_device *dev)
15530{ 15530{
15531 struct drm_i915_private *dev_priv = dev->dev_private; 15531 struct drm_i915_private *dev_priv = to_i915(dev);
15532 u8 sr1; 15532 u8 sr1;
15533 i915_reg_t vga_reg = i915_vgacntrl_reg(dev); 15533 i915_reg_t vga_reg = i915_vgacntrl_reg(dev);
15534 15534
@@ -15546,7 +15546,7 @@ static void i915_disable_vga(struct drm_device *dev)
15546 15546
15547void intel_modeset_init_hw(struct drm_device *dev) 15547void intel_modeset_init_hw(struct drm_device *dev)
15548{ 15548{
15549 struct drm_i915_private *dev_priv = dev->dev_private; 15549 struct drm_i915_private *dev_priv = to_i915(dev);
15550 15550
15551 intel_update_cdclk(dev); 15551 intel_update_cdclk(dev);
15552 15552
@@ -15794,7 +15794,7 @@ static bool
15794intel_check_plane_mapping(struct intel_crtc *crtc) 15794intel_check_plane_mapping(struct intel_crtc *crtc)
15795{ 15795{
15796 struct drm_device *dev = crtc->base.dev; 15796 struct drm_device *dev = crtc->base.dev;
15797 struct drm_i915_private *dev_priv = dev->dev_private; 15797 struct drm_i915_private *dev_priv = to_i915(dev);
15798 u32 val; 15798 u32 val;
15799 15799
15800 if (INTEL_INFO(dev)->num_pipes == 1) 15800 if (INTEL_INFO(dev)->num_pipes == 1)
@@ -15834,7 +15834,7 @@ static bool intel_encoder_has_connectors(struct intel_encoder *encoder)
15834static void intel_sanitize_crtc(struct intel_crtc *crtc) 15834static void intel_sanitize_crtc(struct intel_crtc *crtc)
15835{ 15835{
15836 struct drm_device *dev = crtc->base.dev; 15836 struct drm_device *dev = crtc->base.dev;
15837 struct drm_i915_private *dev_priv = dev->dev_private; 15837 struct drm_i915_private *dev_priv = to_i915(dev);
15838 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 15838 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
15839 15839
15840 /* Clear any frame start delays used for debugging left by the BIOS */ 15840 /* Clear any frame start delays used for debugging left by the BIOS */
@@ -15959,7 +15959,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
15959 15959
15960void i915_redisable_vga_power_on(struct drm_device *dev) 15960void i915_redisable_vga_power_on(struct drm_device *dev)
15961{ 15961{
15962 struct drm_i915_private *dev_priv = dev->dev_private; 15962 struct drm_i915_private *dev_priv = to_i915(dev);
15963 i915_reg_t vga_reg = i915_vgacntrl_reg(dev); 15963 i915_reg_t vga_reg = i915_vgacntrl_reg(dev);
15964 15964
15965 if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) { 15965 if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
@@ -15970,7 +15970,7 @@ void i915_redisable_vga_power_on(struct drm_device *dev)
15970 15970
15971void i915_redisable_vga(struct drm_device *dev) 15971void i915_redisable_vga(struct drm_device *dev)
15972{ 15972{
15973 struct drm_i915_private *dev_priv = dev->dev_private; 15973 struct drm_i915_private *dev_priv = to_i915(dev);
15974 15974
15975 /* This function can be called both from intel_modeset_setup_hw_state or 15975 /* This function can be called both from intel_modeset_setup_hw_state or
15976 * at a very early point in our resume sequence, where the power well 15976 * at a very early point in our resume sequence, where the power well
@@ -16010,7 +16010,7 @@ static void readout_plane_state(struct intel_crtc *crtc)
16010 16010
16011static void intel_modeset_readout_hw_state(struct drm_device *dev) 16011static void intel_modeset_readout_hw_state(struct drm_device *dev)
16012{ 16012{
16013 struct drm_i915_private *dev_priv = dev->dev_private; 16013 struct drm_i915_private *dev_priv = to_i915(dev);
16014 enum pipe pipe; 16014 enum pipe pipe;
16015 struct intel_crtc *crtc; 16015 struct intel_crtc *crtc;
16016 struct intel_encoder *encoder; 16016 struct intel_encoder *encoder;
@@ -16163,7 +16163,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
16163static void 16163static void
16164intel_modeset_setup_hw_state(struct drm_device *dev) 16164intel_modeset_setup_hw_state(struct drm_device *dev)
16165{ 16165{
16166 struct drm_i915_private *dev_priv = dev->dev_private; 16166 struct drm_i915_private *dev_priv = to_i915(dev);
16167 enum pipe pipe; 16167 enum pipe pipe;
16168 struct intel_crtc *crtc; 16168 struct intel_crtc *crtc;
16169 struct intel_encoder *encoder; 16169 struct intel_encoder *encoder;
@@ -16346,7 +16346,7 @@ void intel_connector_unregister(struct drm_connector *connector)
16346 16346
16347void intel_modeset_cleanup(struct drm_device *dev) 16347void intel_modeset_cleanup(struct drm_device *dev)
16348{ 16348{
16349 struct drm_i915_private *dev_priv = dev->dev_private; 16349 struct drm_i915_private *dev_priv = to_i915(dev);
16350 16350
16351 intel_disable_gt_powersave(dev_priv); 16351 intel_disable_gt_powersave(dev_priv);
16352 16352
@@ -16392,7 +16392,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
16392 */ 16392 */
16393int intel_modeset_vga_set_state(struct drm_device *dev, bool state) 16393int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
16394{ 16394{
16395 struct drm_i915_private *dev_priv = dev->dev_private; 16395 struct drm_i915_private *dev_priv = to_i915(dev);
16396 unsigned reg = INTEL_INFO(dev)->gen >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL; 16396 unsigned reg = INTEL_INFO(dev)->gen >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;
16397 u16 gmch_ctrl; 16397 u16 gmch_ctrl;
16398 16398
@@ -16548,7 +16548,7 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m,
16548 struct drm_device *dev, 16548 struct drm_device *dev,
16549 struct intel_display_error_state *error) 16549 struct intel_display_error_state *error)
16550{ 16550{
16551 struct drm_i915_private *dev_priv = dev->dev_private; 16551 struct drm_i915_private *dev_priv = to_i915(dev);
16552 int i; 16552 int i;
16553 16553
16554 if (!error) 16554 if (!error)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0757ee427ad7..1083f5e2d45b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -262,7 +262,7 @@ static void pps_lock(struct intel_dp *intel_dp)
262 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 262 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
263 struct intel_encoder *encoder = &intel_dig_port->base; 263 struct intel_encoder *encoder = &intel_dig_port->base;
264 struct drm_device *dev = encoder->base.dev; 264 struct drm_device *dev = encoder->base.dev;
265 struct drm_i915_private *dev_priv = dev->dev_private; 265 struct drm_i915_private *dev_priv = to_i915(dev);
266 enum intel_display_power_domain power_domain; 266 enum intel_display_power_domain power_domain;
267 267
268 /* 268 /*
@@ -280,7 +280,7 @@ static void pps_unlock(struct intel_dp *intel_dp)
280 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 280 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
281 struct intel_encoder *encoder = &intel_dig_port->base; 281 struct intel_encoder *encoder = &intel_dig_port->base;
282 struct drm_device *dev = encoder->base.dev; 282 struct drm_device *dev = encoder->base.dev;
283 struct drm_i915_private *dev_priv = dev->dev_private; 283 struct drm_i915_private *dev_priv = to_i915(dev);
284 enum intel_display_power_domain power_domain; 284 enum intel_display_power_domain power_domain;
285 285
286 mutex_unlock(&dev_priv->pps_mutex); 286 mutex_unlock(&dev_priv->pps_mutex);
@@ -294,7 +294,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
294{ 294{
295 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 295 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
296 struct drm_device *dev = intel_dig_port->base.base.dev; 296 struct drm_device *dev = intel_dig_port->base.base.dev;
297 struct drm_i915_private *dev_priv = dev->dev_private; 297 struct drm_i915_private *dev_priv = to_i915(dev);
298 enum pipe pipe = intel_dp->pps_pipe; 298 enum pipe pipe = intel_dp->pps_pipe;
299 bool pll_enabled, release_cl_override = false; 299 bool pll_enabled, release_cl_override = false;
300 enum dpio_phy phy = DPIO_PHY(pipe); 300 enum dpio_phy phy = DPIO_PHY(pipe);
@@ -368,7 +368,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
368{ 368{
369 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 369 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
370 struct drm_device *dev = intel_dig_port->base.base.dev; 370 struct drm_device *dev = intel_dig_port->base.base.dev;
371 struct drm_i915_private *dev_priv = dev->dev_private; 371 struct drm_i915_private *dev_priv = to_i915(dev);
372 struct intel_encoder *encoder; 372 struct intel_encoder *encoder;
373 unsigned int pipes = (1 << PIPE_A) | (1 << PIPE_B); 373 unsigned int pipes = (1 << PIPE_A) | (1 << PIPE_B);
374 enum pipe pipe; 374 enum pipe pipe;
@@ -431,7 +431,7 @@ bxt_power_sequencer_idx(struct intel_dp *intel_dp)
431{ 431{
432 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 432 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
433 struct drm_device *dev = intel_dig_port->base.base.dev; 433 struct drm_device *dev = intel_dig_port->base.base.dev;
434 struct drm_i915_private *dev_priv = dev->dev_private; 434 struct drm_i915_private *dev_priv = to_i915(dev);
435 435
436 lockdep_assert_held(&dev_priv->pps_mutex); 436 lockdep_assert_held(&dev_priv->pps_mutex);
437 437
@@ -506,7 +506,7 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
506{ 506{
507 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 507 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
508 struct drm_device *dev = intel_dig_port->base.base.dev; 508 struct drm_device *dev = intel_dig_port->base.base.dev;
509 struct drm_i915_private *dev_priv = dev->dev_private; 509 struct drm_i915_private *dev_priv = to_i915(dev);
510 enum port port = intel_dig_port->port; 510 enum port port = intel_dig_port->port;
511 511
512 lockdep_assert_held(&dev_priv->pps_mutex); 512 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -639,7 +639,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,
639 struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp), 639 struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp),
640 edp_notifier); 640 edp_notifier);
641 struct drm_device *dev = intel_dp_to_dev(intel_dp); 641 struct drm_device *dev = intel_dp_to_dev(intel_dp);
642 struct drm_i915_private *dev_priv = dev->dev_private; 642 struct drm_i915_private *dev_priv = to_i915(dev);
643 643
644 if (!is_edp(intel_dp) || code != SYS_RESTART) 644 if (!is_edp(intel_dp) || code != SYS_RESTART)
645 return 0; 645 return 0;
@@ -670,7 +670,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,
670static bool edp_have_panel_power(struct intel_dp *intel_dp) 670static bool edp_have_panel_power(struct intel_dp *intel_dp)
671{ 671{
672 struct drm_device *dev = intel_dp_to_dev(intel_dp); 672 struct drm_device *dev = intel_dp_to_dev(intel_dp);
673 struct drm_i915_private *dev_priv = dev->dev_private; 673 struct drm_i915_private *dev_priv = to_i915(dev);
674 674
675 lockdep_assert_held(&dev_priv->pps_mutex); 675 lockdep_assert_held(&dev_priv->pps_mutex);
676 676
@@ -684,7 +684,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp)
684static bool edp_have_panel_vdd(struct intel_dp *intel_dp) 684static bool edp_have_panel_vdd(struct intel_dp *intel_dp)
685{ 685{
686 struct drm_device *dev = intel_dp_to_dev(intel_dp); 686 struct drm_device *dev = intel_dp_to_dev(intel_dp);
687 struct drm_i915_private *dev_priv = dev->dev_private; 687 struct drm_i915_private *dev_priv = to_i915(dev);
688 688
689 lockdep_assert_held(&dev_priv->pps_mutex); 689 lockdep_assert_held(&dev_priv->pps_mutex);
690 690
@@ -699,7 +699,7 @@ static void
699intel_dp_check_edp(struct intel_dp *intel_dp) 699intel_dp_check_edp(struct intel_dp *intel_dp)
700{ 700{
701 struct drm_device *dev = intel_dp_to_dev(intel_dp); 701 struct drm_device *dev = intel_dp_to_dev(intel_dp);
702 struct drm_i915_private *dev_priv = dev->dev_private; 702 struct drm_i915_private *dev_priv = to_i915(dev);
703 703
704 if (!is_edp(intel_dp)) 704 if (!is_edp(intel_dp))
705 return; 705 return;
@@ -717,7 +717,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)
717{ 717{
718 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 718 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
719 struct drm_device *dev = intel_dig_port->base.base.dev; 719 struct drm_device *dev = intel_dig_port->base.base.dev;
720 struct drm_i915_private *dev_priv = dev->dev_private; 720 struct drm_i915_private *dev_priv = to_i915(dev);
721 i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg; 721 i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;
722 uint32_t status; 722 uint32_t status;
723 bool done; 723 bool done;
@@ -850,7 +850,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
850{ 850{
851 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 851 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
852 struct drm_device *dev = intel_dig_port->base.base.dev; 852 struct drm_device *dev = intel_dig_port->base.base.dev;
853 struct drm_i915_private *dev_priv = dev->dev_private; 853 struct drm_i915_private *dev_priv = to_i915(dev);
854 i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg; 854 i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;
855 uint32_t aux_clock_divider; 855 uint32_t aux_clock_divider;
856 int i, ret, recv_bytes; 856 int i, ret, recv_bytes;
@@ -1473,7 +1473,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
1473 struct intel_crtc_state *pipe_config) 1473 struct intel_crtc_state *pipe_config)
1474{ 1474{
1475 struct drm_device *dev = encoder->base.dev; 1475 struct drm_device *dev = encoder->base.dev;
1476 struct drm_i915_private *dev_priv = dev->dev_private; 1476 struct drm_i915_private *dev_priv = to_i915(dev);
1477 struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; 1477 struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
1478 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 1478 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
1479 enum port port = dp_to_dig_port(intel_dp)->port; 1479 enum port port = dp_to_dig_port(intel_dp)->port;
@@ -1657,7 +1657,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,
1657static void intel_dp_prepare(struct intel_encoder *encoder) 1657static void intel_dp_prepare(struct intel_encoder *encoder)
1658{ 1658{
1659 struct drm_device *dev = encoder->base.dev; 1659 struct drm_device *dev = encoder->base.dev;
1660 struct drm_i915_private *dev_priv = dev->dev_private; 1660 struct drm_i915_private *dev_priv = to_i915(dev);
1661 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 1661 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
1662 enum port port = dp_to_dig_port(intel_dp)->port; 1662 enum port port = dp_to_dig_port(intel_dp)->port;
1663 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 1663 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
@@ -1753,7 +1753,7 @@ static void wait_panel_status(struct intel_dp *intel_dp,
1753 u32 value) 1753 u32 value)
1754{ 1754{
1755 struct drm_device *dev = intel_dp_to_dev(intel_dp); 1755 struct drm_device *dev = intel_dp_to_dev(intel_dp);
1756 struct drm_i915_private *dev_priv = dev->dev_private; 1756 struct drm_i915_private *dev_priv = to_i915(dev);
1757 i915_reg_t pp_stat_reg, pp_ctrl_reg; 1757 i915_reg_t pp_stat_reg, pp_ctrl_reg;
1758 1758
1759 lockdep_assert_held(&dev_priv->pps_mutex); 1759 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -1830,7 +1830,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)
1830static u32 ironlake_get_pp_control(struct intel_dp *intel_dp) 1830static u32 ironlake_get_pp_control(struct intel_dp *intel_dp)
1831{ 1831{
1832 struct drm_device *dev = intel_dp_to_dev(intel_dp); 1832 struct drm_device *dev = intel_dp_to_dev(intel_dp);
1833 struct drm_i915_private *dev_priv = dev->dev_private; 1833 struct drm_i915_private *dev_priv = to_i915(dev);
1834 u32 control; 1834 u32 control;
1835 1835
1836 lockdep_assert_held(&dev_priv->pps_mutex); 1836 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -1853,7 +1853,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
1853 struct drm_device *dev = intel_dp_to_dev(intel_dp); 1853 struct drm_device *dev = intel_dp_to_dev(intel_dp);
1854 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 1854 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
1855 struct intel_encoder *intel_encoder = &intel_dig_port->base; 1855 struct intel_encoder *intel_encoder = &intel_dig_port->base;
1856 struct drm_i915_private *dev_priv = dev->dev_private; 1856 struct drm_i915_private *dev_priv = to_i915(dev);
1857 enum intel_display_power_domain power_domain; 1857 enum intel_display_power_domain power_domain;
1858 u32 pp; 1858 u32 pp;
1859 i915_reg_t pp_stat_reg, pp_ctrl_reg; 1859 i915_reg_t pp_stat_reg, pp_ctrl_reg;
@@ -1926,7 +1926,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
1926static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) 1926static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
1927{ 1927{
1928 struct drm_device *dev = intel_dp_to_dev(intel_dp); 1928 struct drm_device *dev = intel_dp_to_dev(intel_dp);
1929 struct drm_i915_private *dev_priv = dev->dev_private; 1929 struct drm_i915_private *dev_priv = to_i915(dev);
1930 struct intel_digital_port *intel_dig_port = 1930 struct intel_digital_port *intel_dig_port =
1931 dp_to_dig_port(intel_dp); 1931 dp_to_dig_port(intel_dp);
1932 struct intel_encoder *intel_encoder = &intel_dig_port->base; 1932 struct intel_encoder *intel_encoder = &intel_dig_port->base;
@@ -1995,8 +1995,7 @@ static void edp_panel_vdd_schedule_off(struct intel_dp *intel_dp)
1995 */ 1995 */
1996static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) 1996static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
1997{ 1997{
1998 struct drm_i915_private *dev_priv = 1998 struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
1999 intel_dp_to_dev(intel_dp)->dev_private;
2000 1999
2001 lockdep_assert_held(&dev_priv->pps_mutex); 2000 lockdep_assert_held(&dev_priv->pps_mutex);
2002 2001
@@ -2017,7 +2016,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
2017static void edp_panel_on(struct intel_dp *intel_dp) 2016static void edp_panel_on(struct intel_dp *intel_dp)
2018{ 2017{
2019 struct drm_device *dev = intel_dp_to_dev(intel_dp); 2018 struct drm_device *dev = intel_dp_to_dev(intel_dp);
2020 struct drm_i915_private *dev_priv = dev->dev_private; 2019 struct drm_i915_private *dev_priv = to_i915(dev);
2021 u32 pp; 2020 u32 pp;
2022 i915_reg_t pp_ctrl_reg; 2021 i915_reg_t pp_ctrl_reg;
2023 2022
@@ -2078,7 +2077,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)
2078 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 2077 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
2079 struct intel_encoder *intel_encoder = &intel_dig_port->base; 2078 struct intel_encoder *intel_encoder = &intel_dig_port->base;
2080 struct drm_device *dev = intel_dp_to_dev(intel_dp); 2079 struct drm_device *dev = intel_dp_to_dev(intel_dp);
2081 struct drm_i915_private *dev_priv = dev->dev_private; 2080 struct drm_i915_private *dev_priv = to_i915(dev);
2082 enum intel_display_power_domain power_domain; 2081 enum intel_display_power_domain power_domain;
2083 u32 pp; 2082 u32 pp;
2084 i915_reg_t pp_ctrl_reg; 2083 i915_reg_t pp_ctrl_reg;
@@ -2130,7 +2129,7 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp)
2130{ 2129{
2131 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 2130 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
2132 struct drm_device *dev = intel_dig_port->base.base.dev; 2131 struct drm_device *dev = intel_dig_port->base.base.dev;
2133 struct drm_i915_private *dev_priv = dev->dev_private; 2132 struct drm_i915_private *dev_priv = to_i915(dev);
2134 u32 pp; 2133 u32 pp;
2135 i915_reg_t pp_ctrl_reg; 2134 i915_reg_t pp_ctrl_reg;
2136 2135
@@ -2171,7 +2170,7 @@ void intel_edp_backlight_on(struct intel_dp *intel_dp)
2171static void _intel_edp_backlight_off(struct intel_dp *intel_dp) 2170static void _intel_edp_backlight_off(struct intel_dp *intel_dp)
2172{ 2171{
2173 struct drm_device *dev = intel_dp_to_dev(intel_dp); 2172 struct drm_device *dev = intel_dp_to_dev(intel_dp);
2174 struct drm_i915_private *dev_priv = dev->dev_private; 2173 struct drm_i915_private *dev_priv = to_i915(dev);
2175 u32 pp; 2174 u32 pp;
2176 i915_reg_t pp_ctrl_reg; 2175 i915_reg_t pp_ctrl_reg;
2177 2176
@@ -2352,7 +2351,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
2352 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 2351 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
2353 enum port port = dp_to_dig_port(intel_dp)->port; 2352 enum port port = dp_to_dig_port(intel_dp)->port;
2354 struct drm_device *dev = encoder->base.dev; 2353 struct drm_device *dev = encoder->base.dev;
2355 struct drm_i915_private *dev_priv = dev->dev_private; 2354 struct drm_i915_private *dev_priv = to_i915(dev);
2356 enum intel_display_power_domain power_domain; 2355 enum intel_display_power_domain power_domain;
2357 u32 tmp; 2356 u32 tmp;
2358 bool ret; 2357 bool ret;
@@ -2405,7 +2404,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
2405 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 2404 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
2406 u32 tmp, flags = 0; 2405 u32 tmp, flags = 0;
2407 struct drm_device *dev = encoder->base.dev; 2406 struct drm_device *dev = encoder->base.dev;
2408 struct drm_i915_private *dev_priv = dev->dev_private; 2407 struct drm_i915_private *dev_priv = to_i915(dev);
2409 enum port port = dp_to_dig_port(intel_dp)->port; 2408 enum port port = dp_to_dig_port(intel_dp)->port;
2410 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 2409 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
2411 2410
@@ -2529,7 +2528,7 @@ static void chv_post_disable_dp(struct intel_encoder *encoder)
2529{ 2528{
2530 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 2529 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
2531 struct drm_device *dev = encoder->base.dev; 2530 struct drm_device *dev = encoder->base.dev;
2532 struct drm_i915_private *dev_priv = dev->dev_private; 2531 struct drm_i915_private *dev_priv = to_i915(dev);
2533 2532
2534 intel_dp_link_down(intel_dp); 2533 intel_dp_link_down(intel_dp);
2535 2534
@@ -2548,7 +2547,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,
2548{ 2547{
2549 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 2548 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
2550 struct drm_device *dev = intel_dig_port->base.base.dev; 2549 struct drm_device *dev = intel_dig_port->base.base.dev;
2551 struct drm_i915_private *dev_priv = dev->dev_private; 2550 struct drm_i915_private *dev_priv = to_i915(dev);
2552 enum port port = intel_dig_port->port; 2551 enum port port = intel_dig_port->port;
2553 2552
2554 if (HAS_DDI(dev)) { 2553 if (HAS_DDI(dev)) {
@@ -2628,7 +2627,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,
2628static void intel_dp_enable_port(struct intel_dp *intel_dp) 2627static void intel_dp_enable_port(struct intel_dp *intel_dp)
2629{ 2628{
2630 struct drm_device *dev = intel_dp_to_dev(intel_dp); 2629 struct drm_device *dev = intel_dp_to_dev(intel_dp);
2631 struct drm_i915_private *dev_priv = dev->dev_private; 2630 struct drm_i915_private *dev_priv = to_i915(dev);
2632 struct intel_crtc *crtc = 2631 struct intel_crtc *crtc =
2633 to_intel_crtc(dp_to_dig_port(intel_dp)->base.base.crtc); 2632 to_intel_crtc(dp_to_dig_port(intel_dp)->base.base.crtc);
2634 2633
@@ -2657,7 +2656,7 @@ static void intel_enable_dp(struct intel_encoder *encoder)
2657{ 2656{
2658 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 2657 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
2659 struct drm_device *dev = encoder->base.dev; 2658 struct drm_device *dev = encoder->base.dev;
2660 struct drm_i915_private *dev_priv = dev->dev_private; 2659 struct drm_i915_private *dev_priv = to_i915(dev);
2661 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 2660 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
2662 uint32_t dp_reg = I915_READ(intel_dp->output_reg); 2661 uint32_t dp_reg = I915_READ(intel_dp->output_reg);
2663 enum pipe pipe = crtc->pipe; 2662 enum pipe pipe = crtc->pipe;
@@ -2730,7 +2729,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder)
2730static void vlv_detach_power_sequencer(struct intel_dp *intel_dp) 2729static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
2731{ 2730{
2732 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 2731 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
2733 struct drm_i915_private *dev_priv = intel_dig_port->base.base.dev->dev_private; 2732 struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);
2734 enum pipe pipe = intel_dp->pps_pipe; 2733 enum pipe pipe = intel_dp->pps_pipe;
2735 i915_reg_t pp_on_reg = VLV_PIPE_PP_ON_DELAYS(pipe); 2734 i915_reg_t pp_on_reg = VLV_PIPE_PP_ON_DELAYS(pipe);
2736 2735
@@ -2756,7 +2755,7 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
2756static void vlv_steal_power_sequencer(struct drm_device *dev, 2755static void vlv_steal_power_sequencer(struct drm_device *dev,
2757 enum pipe pipe) 2756 enum pipe pipe)
2758{ 2757{
2759 struct drm_i915_private *dev_priv = dev->dev_private; 2758 struct drm_i915_private *dev_priv = to_i915(dev);
2760 struct intel_encoder *encoder; 2759 struct intel_encoder *encoder;
2761 2760
2762 lockdep_assert_held(&dev_priv->pps_mutex); 2761 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -2794,7 +2793,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp)
2794 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 2793 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
2795 struct intel_encoder *encoder = &intel_dig_port->base; 2794 struct intel_encoder *encoder = &intel_dig_port->base;
2796 struct drm_device *dev = encoder->base.dev; 2795 struct drm_device *dev = encoder->base.dev;
2797 struct drm_i915_private *dev_priv = dev->dev_private; 2796 struct drm_i915_private *dev_priv = to_i915(dev);
2798 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 2797 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
2799 2798
2800 lockdep_assert_held(&dev_priv->pps_mutex); 2799 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -2882,7 +2881,7 @@ uint8_t
2882intel_dp_voltage_max(struct intel_dp *intel_dp) 2881intel_dp_voltage_max(struct intel_dp *intel_dp)
2883{ 2882{
2884 struct drm_device *dev = intel_dp_to_dev(intel_dp); 2883 struct drm_device *dev = intel_dp_to_dev(intel_dp);
2885 struct drm_i915_private *dev_priv = dev->dev_private; 2884 struct drm_i915_private *dev_priv = to_i915(dev);
2886 enum port port = dp_to_dig_port(intel_dp)->port; 2885 enum port port = dp_to_dig_port(intel_dp)->port;
2887 2886
2888 if (IS_BROXTON(dev)) 2887 if (IS_BROXTON(dev))
@@ -3300,7 +3299,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)
3300{ 3299{
3301 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 3300 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
3302 struct drm_device *dev = intel_dig_port->base.base.dev; 3301 struct drm_device *dev = intel_dig_port->base.base.dev;
3303 struct drm_i915_private *dev_priv = dev->dev_private; 3302 struct drm_i915_private *dev_priv = to_i915(dev);
3304 enum port port = intel_dig_port->port; 3303 enum port port = intel_dig_port->port;
3305 uint32_t val; 3304 uint32_t val;
3306 3305
@@ -3336,7 +3335,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
3336 struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc); 3335 struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
3337 enum port port = intel_dig_port->port; 3336 enum port port = intel_dig_port->port;
3338 struct drm_device *dev = intel_dig_port->base.base.dev; 3337 struct drm_device *dev = intel_dig_port->base.base.dev;
3339 struct drm_i915_private *dev_priv = dev->dev_private; 3338 struct drm_i915_private *dev_priv = to_i915(dev);
3340 uint32_t DP = intel_dp->DP; 3339 uint32_t DP = intel_dp->DP;
3341 3340
3342 if (WARN_ON(HAS_DDI(dev))) 3341 if (WARN_ON(HAS_DDI(dev)))
@@ -3403,7 +3402,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
3403{ 3402{
3404 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 3403 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
3405 struct drm_device *dev = dig_port->base.base.dev; 3404 struct drm_device *dev = dig_port->base.base.dev;
3406 struct drm_i915_private *dev_priv = dev->dev_private; 3405 struct drm_i915_private *dev_priv = to_i915(dev);
3407 3406
3408 if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd, 3407 if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd,
3409 sizeof(intel_dp->dpcd)) < 0) 3408 sizeof(intel_dp->dpcd)) < 0)
@@ -4418,7 +4417,7 @@ intel_dp_set_property(struct drm_connector *connector,
4418 struct drm_property *property, 4417 struct drm_property *property,
4419 uint64_t val) 4418 uint64_t val)
4420{ 4419{
4421 struct drm_i915_private *dev_priv = connector->dev->dev_private; 4420 struct drm_i915_private *dev_priv = to_i915(connector->dev);
4422 struct intel_connector *intel_connector = to_intel_connector(connector); 4421 struct intel_connector *intel_connector = to_intel_connector(connector);
4423 struct intel_encoder *intel_encoder = intel_attached_encoder(connector); 4422 struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
4424 struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); 4423 struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
@@ -4600,7 +4599,7 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp)
4600{ 4599{
4601 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 4600 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
4602 struct drm_device *dev = intel_dig_port->base.base.dev; 4601 struct drm_device *dev = intel_dig_port->base.base.dev;
4603 struct drm_i915_private *dev_priv = dev->dev_private; 4602 struct drm_i915_private *dev_priv = to_i915(dev);
4604 enum intel_display_power_domain power_domain; 4603 enum intel_display_power_domain power_domain;
4605 4604
4606 lockdep_assert_held(&dev_priv->pps_mutex); 4605 lockdep_assert_held(&dev_priv->pps_mutex);
@@ -4676,7 +4675,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
4676 struct intel_dp *intel_dp = &intel_dig_port->dp; 4675 struct intel_dp *intel_dp = &intel_dig_port->dp;
4677 struct intel_encoder *intel_encoder = &intel_dig_port->base; 4676 struct intel_encoder *intel_encoder = &intel_dig_port->base;
4678 struct drm_device *dev = intel_dig_port->base.base.dev; 4677 struct drm_device *dev = intel_dig_port->base.base.dev;
4679 struct drm_i915_private *dev_priv = dev->dev_private; 4678 struct drm_i915_private *dev_priv = to_i915(dev);
4680 enum intel_display_power_domain power_domain; 4679 enum intel_display_power_domain power_domain;
4681 enum irqreturn ret = IRQ_NONE; 4680 enum irqreturn ret = IRQ_NONE;
4682 4681
@@ -4744,7 +4743,7 @@ put_power:
4744/* check the VBT to see whether the eDP is on another port */ 4743/* check the VBT to see whether the eDP is on another port */
4745bool intel_dp_is_edp(struct drm_device *dev, enum port port) 4744bool intel_dp_is_edp(struct drm_device *dev, enum port port)
4746{ 4745{
4747 struct drm_i915_private *dev_priv = dev->dev_private; 4746 struct drm_i915_private *dev_priv = to_i915(dev);
4748 4747
4749 /* 4748 /*
4750 * eDP not supported on g4x. so bail out early just 4749 * eDP not supported on g4x. so bail out early just
@@ -4860,7 +4859,7 @@ static void
4860intel_dp_init_panel_power_sequencer(struct drm_device *dev, 4859intel_dp_init_panel_power_sequencer(struct drm_device *dev,
4861 struct intel_dp *intel_dp) 4860 struct intel_dp *intel_dp)
4862{ 4861{
4863 struct drm_i915_private *dev_priv = dev->dev_private; 4862 struct drm_i915_private *dev_priv = to_i915(dev);
4864 struct edp_power_seq cur, vbt, spec, 4863 struct edp_power_seq cur, vbt, spec,
4865 *final = &intel_dp->pps_delays; 4864 *final = &intel_dp->pps_delays;
4866 4865
@@ -4932,7 +4931,7 @@ static void
4932intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev, 4931intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,
4933 struct intel_dp *intel_dp) 4932 struct intel_dp *intel_dp)
4934{ 4933{
4935 struct drm_i915_private *dev_priv = dev->dev_private; 4934 struct drm_i915_private *dev_priv = to_i915(dev);
4936 u32 pp_on, pp_off, pp_div, port_sel = 0; 4935 u32 pp_on, pp_off, pp_div, port_sel = 0;
4937 int div = dev_priv->rawclk_freq / 1000; 4936 int div = dev_priv->rawclk_freq / 1000;
4938 struct pps_registers regs; 4937 struct pps_registers regs;
@@ -5002,7 +5001,7 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,
5002 */ 5001 */
5003static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) 5002static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)
5004{ 5003{
5005 struct drm_i915_private *dev_priv = dev->dev_private; 5004 struct drm_i915_private *dev_priv = to_i915(dev);
5006 struct intel_encoder *encoder; 5005 struct intel_encoder *encoder;
5007 struct intel_digital_port *dig_port = NULL; 5006 struct intel_digital_port *dig_port = NULL;
5008 struct intel_dp *intel_dp = dev_priv->drrs.dp; 5007 struct intel_dp *intel_dp = dev_priv->drrs.dp;
@@ -5101,7 +5100,7 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)
5101void intel_edp_drrs_enable(struct intel_dp *intel_dp) 5100void intel_edp_drrs_enable(struct intel_dp *intel_dp)
5102{ 5101{
5103 struct drm_device *dev = intel_dp_to_dev(intel_dp); 5102 struct drm_device *dev = intel_dp_to_dev(intel_dp);
5104 struct drm_i915_private *dev_priv = dev->dev_private; 5103 struct drm_i915_private *dev_priv = to_i915(dev);
5105 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 5104 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
5106 struct drm_crtc *crtc = dig_port->base.base.crtc; 5105 struct drm_crtc *crtc = dig_port->base.base.crtc;
5107 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 5106 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -5133,7 +5132,7 @@ unlock:
5133void intel_edp_drrs_disable(struct intel_dp *intel_dp) 5132void intel_edp_drrs_disable(struct intel_dp *intel_dp)
5134{ 5133{
5135 struct drm_device *dev = intel_dp_to_dev(intel_dp); 5134 struct drm_device *dev = intel_dp_to_dev(intel_dp);
5136 struct drm_i915_private *dev_priv = dev->dev_private; 5135 struct drm_i915_private *dev_priv = to_i915(dev);
5137 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 5136 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
5138 struct drm_crtc *crtc = dig_port->base.base.crtc; 5137 struct drm_crtc *crtc = dig_port->base.base.crtc;
5139 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 5138 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -5201,7 +5200,7 @@ unlock:
5201void intel_edp_drrs_invalidate(struct drm_device *dev, 5200void intel_edp_drrs_invalidate(struct drm_device *dev,
5202 unsigned frontbuffer_bits) 5201 unsigned frontbuffer_bits)
5203{ 5202{
5204 struct drm_i915_private *dev_priv = dev->dev_private; 5203 struct drm_i915_private *dev_priv = to_i915(dev);
5205 struct drm_crtc *crtc; 5204 struct drm_crtc *crtc;
5206 enum pipe pipe; 5205 enum pipe pipe;
5207 5206
@@ -5246,7 +5245,7 @@ void intel_edp_drrs_invalidate(struct drm_device *dev,
5246void intel_edp_drrs_flush(struct drm_device *dev, 5245void intel_edp_drrs_flush(struct drm_device *dev,
5247 unsigned frontbuffer_bits) 5246 unsigned frontbuffer_bits)
5248{ 5247{
5249 struct drm_i915_private *dev_priv = dev->dev_private; 5248 struct drm_i915_private *dev_priv = to_i915(dev);
5250 struct drm_crtc *crtc; 5249 struct drm_crtc *crtc;
5251 enum pipe pipe; 5250 enum pipe pipe;
5252 5251
@@ -5339,7 +5338,7 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,
5339{ 5338{
5340 struct drm_connector *connector = &intel_connector->base; 5339 struct drm_connector *connector = &intel_connector->base;
5341 struct drm_device *dev = connector->dev; 5340 struct drm_device *dev = connector->dev;
5342 struct drm_i915_private *dev_priv = dev->dev_private; 5341 struct drm_i915_private *dev_priv = to_i915(dev);
5343 struct drm_display_mode *downclock_mode = NULL; 5342 struct drm_display_mode *downclock_mode = NULL;
5344 5343
5345 INIT_DELAYED_WORK(&dev_priv->drrs.work, intel_edp_drrs_downclock_work); 5344 INIT_DELAYED_WORK(&dev_priv->drrs.work, intel_edp_drrs_downclock_work);
@@ -5377,7 +5376,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
5377 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 5376 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
5378 struct intel_encoder *intel_encoder = &intel_dig_port->base; 5377 struct intel_encoder *intel_encoder = &intel_dig_port->base;
5379 struct drm_device *dev = intel_encoder->base.dev; 5378 struct drm_device *dev = intel_encoder->base.dev;
5380 struct drm_i915_private *dev_priv = dev->dev_private; 5379 struct drm_i915_private *dev_priv = to_i915(dev);
5381 struct drm_display_mode *fixed_mode = NULL; 5380 struct drm_display_mode *fixed_mode = NULL;
5382 struct drm_display_mode *downclock_mode = NULL; 5381 struct drm_display_mode *downclock_mode = NULL;
5383 bool has_dpcd; 5382 bool has_dpcd;
@@ -5519,7 +5518,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
5519 struct intel_dp *intel_dp = &intel_dig_port->dp; 5518 struct intel_dp *intel_dp = &intel_dig_port->dp;
5520 struct intel_encoder *intel_encoder = &intel_dig_port->base; 5519 struct intel_encoder *intel_encoder = &intel_dig_port->base;
5521 struct drm_device *dev = intel_encoder->base.dev; 5520 struct drm_device *dev = intel_encoder->base.dev;
5522 struct drm_i915_private *dev_priv = dev->dev_private; 5521 struct drm_i915_private *dev_priv = to_i915(dev);
5523 enum port port = intel_dig_port->port; 5522 enum port port = intel_dig_port->port;
5524 int type; 5523 int type;
5525 5524
@@ -5650,7 +5649,7 @@ bool intel_dp_init(struct drm_device *dev,
5650 i915_reg_t output_reg, 5649 i915_reg_t output_reg,
5651 enum port port) 5650 enum port port)
5652{ 5651{
5653 struct drm_i915_private *dev_priv = dev->dev_private; 5652 struct drm_i915_private *dev_priv = to_i915(dev);
5654 struct intel_digital_port *intel_dig_port; 5653 struct intel_digital_port *intel_dig_port;
5655 struct intel_encoder *intel_encoder; 5654 struct intel_encoder *intel_encoder;
5656 struct drm_encoder *encoder; 5655 struct drm_encoder *encoder;
@@ -5728,7 +5727,7 @@ err_connector_alloc:
5728 5727
5729void intel_dp_mst_suspend(struct drm_device *dev) 5728void intel_dp_mst_suspend(struct drm_device *dev)
5730{ 5729{
5731 struct drm_i915_private *dev_priv = dev->dev_private; 5730 struct drm_i915_private *dev_priv = to_i915(dev);
5732 int i; 5731 int i;
5733 5732
5734 /* disable MST */ 5733 /* disable MST */
@@ -5748,7 +5747,7 @@ void intel_dp_mst_suspend(struct drm_device *dev)
5748 5747
5749void intel_dp_mst_resume(struct drm_device *dev) 5748void intel_dp_mst_resume(struct drm_device *dev)
5750{ 5749{
5751 struct drm_i915_private *dev_priv = dev->dev_private; 5750 struct drm_i915_private *dev_priv = to_i915(dev);
5752 int i; 5751 int i;
5753 5752
5754 for (i = 0; i < I915_MAX_PORTS; i++) { 5753 for (i = 0; i < I915_MAX_PORTS; i++) {
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index c1d318601bf1..81800877b1af 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -140,7 +140,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
140 struct intel_digital_port *intel_dig_port = intel_mst->primary; 140 struct intel_digital_port *intel_dig_port = intel_mst->primary;
141 struct intel_dp *intel_dp = &intel_dig_port->dp; 141 struct intel_dp *intel_dp = &intel_dig_port->dp;
142 struct drm_device *dev = encoder->base.dev; 142 struct drm_device *dev = encoder->base.dev;
143 struct drm_i915_private *dev_priv = dev->dev_private; 143 struct drm_i915_private *dev_priv = to_i915(dev);
144 enum port port = intel_dig_port->port; 144 enum port port = intel_dig_port->port;
145 int ret; 145 int ret;
146 uint32_t temp; 146 uint32_t temp;
@@ -207,7 +207,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)
207 struct intel_digital_port *intel_dig_port = intel_mst->primary; 207 struct intel_digital_port *intel_dig_port = intel_mst->primary;
208 struct intel_dp *intel_dp = &intel_dig_port->dp; 208 struct intel_dp *intel_dp = &intel_dig_port->dp;
209 struct drm_device *dev = intel_dig_port->base.base.dev; 209 struct drm_device *dev = intel_dig_port->base.base.dev;
210 struct drm_i915_private *dev_priv = dev->dev_private; 210 struct drm_i915_private *dev_priv = to_i915(dev);
211 enum port port = intel_dig_port->port; 211 enum port port = intel_dig_port->port;
212 int ret; 212 int ret;
213 213
@@ -242,7 +242,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
242 struct intel_digital_port *intel_dig_port = intel_mst->primary; 242 struct intel_digital_port *intel_dig_port = intel_mst->primary;
243 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 243 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
244 struct drm_device *dev = encoder->base.dev; 244 struct drm_device *dev = encoder->base.dev;
245 struct drm_i915_private *dev_priv = dev->dev_private; 245 struct drm_i915_private *dev_priv = to_i915(dev);
246 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; 246 enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
247 u32 temp, flags = 0; 247 u32 temp, flags = 0;
248 248
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/intel_dpio_phy.c
index 288da35572b4..047f48748944 100644
--- a/drivers/gpu/drm/i915/intel_dpio_phy.c
+++ b/drivers/gpu/drm/i915/intel_dpio_phy.c
@@ -168,7 +168,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder)
168{ 168{
169 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); 169 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
170 struct drm_device *dev = encoder->base.dev; 170 struct drm_device *dev = encoder->base.dev;
171 struct drm_i915_private *dev_priv = dev->dev_private; 171 struct drm_i915_private *dev_priv = to_i915(dev);
172 struct intel_crtc *intel_crtc = 172 struct intel_crtc *intel_crtc =
173 to_intel_crtc(encoder->base.crtc); 173 to_intel_crtc(encoder->base.crtc);
174 enum dpio_channel ch = vlv_dport_to_channel(dport); 174 enum dpio_channel ch = vlv_dport_to_channel(dport);
@@ -250,7 +250,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder)
250 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 250 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
251 struct intel_digital_port *dport = dp_to_dig_port(intel_dp); 251 struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
252 struct drm_device *dev = encoder->base.dev; 252 struct drm_device *dev = encoder->base.dev;
253 struct drm_i915_private *dev_priv = dev->dev_private; 253 struct drm_i915_private *dev_priv = to_i915(dev);
254 struct intel_crtc *intel_crtc = 254 struct intel_crtc *intel_crtc =
255 to_intel_crtc(encoder->base.crtc); 255 to_intel_crtc(encoder->base.crtc);
256 enum dpio_channel ch = vlv_dport_to_channel(dport); 256 enum dpio_channel ch = vlv_dport_to_channel(dport);
@@ -400,7 +400,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder)
400{ 400{
401 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); 401 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
402 struct drm_device *dev = encoder->base.dev; 402 struct drm_device *dev = encoder->base.dev;
403 struct drm_i915_private *dev_priv = dev->dev_private; 403 struct drm_i915_private *dev_priv = to_i915(dev);
404 struct intel_crtc *intel_crtc = 404 struct intel_crtc *intel_crtc =
405 to_intel_crtc(encoder->base.crtc); 405 to_intel_crtc(encoder->base.crtc);
406 enum dpio_channel port = vlv_dport_to_channel(dport); 406 enum dpio_channel port = vlv_dport_to_channel(dport);
@@ -429,7 +429,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder)
429 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); 429 struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
430 struct intel_digital_port *dport = dp_to_dig_port(intel_dp); 430 struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
431 struct drm_device *dev = encoder->base.dev; 431 struct drm_device *dev = encoder->base.dev;
432 struct drm_i915_private *dev_priv = dev->dev_private; 432 struct drm_i915_private *dev_priv = to_i915(dev);
433 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 433 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
434 enum dpio_channel port = vlv_dport_to_channel(dport); 434 enum dpio_channel port = vlv_dport_to_channel(dport);
435 int pipe = intel_crtc->pipe; 435 int pipe = intel_crtc->pipe;
@@ -457,7 +457,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder)
457void vlv_phy_reset_lanes(struct intel_encoder *encoder) 457void vlv_phy_reset_lanes(struct intel_encoder *encoder)
458{ 458{
459 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); 459 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
460 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 460 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
461 struct intel_crtc *intel_crtc = 461 struct intel_crtc *intel_crtc =
462 to_intel_crtc(encoder->base.crtc); 462 to_intel_crtc(encoder->base.crtc);
463 enum dpio_channel port = vlv_dport_to_channel(dport); 463 enum dpio_channel port = vlv_dport_to_channel(dport);
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index e19757c76db6..8a4dac98b3d5 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -83,7 +83,7 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,
83void intel_prepare_shared_dpll(struct intel_crtc *crtc) 83void intel_prepare_shared_dpll(struct intel_crtc *crtc)
84{ 84{
85 struct drm_device *dev = crtc->base.dev; 85 struct drm_device *dev = crtc->base.dev;
86 struct drm_i915_private *dev_priv = dev->dev_private; 86 struct drm_i915_private *dev_priv = to_i915(dev);
87 struct intel_shared_dpll *pll = crtc->config->shared_dpll; 87 struct intel_shared_dpll *pll = crtc->config->shared_dpll;
88 88
89 if (WARN_ON(pll == NULL)) 89 if (WARN_ON(pll == NULL))
@@ -112,7 +112,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc)
112void intel_enable_shared_dpll(struct intel_crtc *crtc) 112void intel_enable_shared_dpll(struct intel_crtc *crtc)
113{ 113{
114 struct drm_device *dev = crtc->base.dev; 114 struct drm_device *dev = crtc->base.dev;
115 struct drm_i915_private *dev_priv = dev->dev_private; 115 struct drm_i915_private *dev_priv = to_i915(dev);
116 struct intel_shared_dpll *pll = crtc->config->shared_dpll; 116 struct intel_shared_dpll *pll = crtc->config->shared_dpll;
117 unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base); 117 unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
118 unsigned old_mask; 118 unsigned old_mask;
@@ -151,7 +151,7 @@ out:
151void intel_disable_shared_dpll(struct intel_crtc *crtc) 151void intel_disable_shared_dpll(struct intel_crtc *crtc)
152{ 152{
153 struct drm_device *dev = crtc->base.dev; 153 struct drm_device *dev = crtc->base.dev;
154 struct drm_i915_private *dev_priv = dev->dev_private; 154 struct drm_i915_private *dev_priv = to_i915(dev);
155 struct intel_shared_dpll *pll = crtc->config->shared_dpll; 155 struct intel_shared_dpll *pll = crtc->config->shared_dpll;
156 unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base); 156 unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
157 157
@@ -191,7 +191,7 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
191 enum intel_dpll_id range_min, 191 enum intel_dpll_id range_min,
192 enum intel_dpll_id range_max) 192 enum intel_dpll_id range_max)
193{ 193{
194 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 194 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
195 struct intel_shared_dpll *pll; 195 struct intel_shared_dpll *pll;
196 struct intel_shared_dpll_config *shared_dpll; 196 struct intel_shared_dpll_config *shared_dpll;
197 enum intel_dpll_id i; 197 enum intel_dpll_id i;
@@ -1636,7 +1636,7 @@ static const struct intel_shared_dpll_funcs bxt_ddi_pll_funcs = {
1636 1636
1637static void intel_ddi_pll_init(struct drm_device *dev) 1637static void intel_ddi_pll_init(struct drm_device *dev)
1638{ 1638{
1639 struct drm_i915_private *dev_priv = dev->dev_private; 1639 struct drm_i915_private *dev_priv = to_i915(dev);
1640 1640
1641 if (INTEL_GEN(dev_priv) < 9) { 1641 if (INTEL_GEN(dev_priv) < 9) {
1642 uint32_t val = I915_READ(LCPLL_CTL); 1642 uint32_t val = I915_READ(LCPLL_CTL);
@@ -1723,7 +1723,7 @@ static const struct intel_dpll_mgr bxt_pll_mgr = {
1723 1723
1724void intel_shared_dpll_init(struct drm_device *dev) 1724void intel_shared_dpll_init(struct drm_device *dev)
1725{ 1725{
1726 struct drm_i915_private *dev_priv = dev->dev_private; 1726 struct drm_i915_private *dev_priv = to_i915(dev);
1727 const struct intel_dpll_mgr *dpll_mgr = NULL; 1727 const struct intel_dpll_mgr *dpll_mgr = NULL;
1728 const struct dpll_info *dpll_info; 1728 const struct dpll_info *dpll_info;
1729 int i; 1729 int i;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 98a5be4ec8c5..e6a24d2154d1 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -987,14 +987,14 @@ vlv_pipe_to_channel(enum pipe pipe)
987static inline struct drm_crtc * 987static inline struct drm_crtc *
988intel_get_crtc_for_pipe(struct drm_device *dev, int pipe) 988intel_get_crtc_for_pipe(struct drm_device *dev, int pipe)
989{ 989{
990 struct drm_i915_private *dev_priv = dev->dev_private; 990 struct drm_i915_private *dev_priv = to_i915(dev);
991 return dev_priv->pipe_to_crtc_mapping[pipe]; 991 return dev_priv->pipe_to_crtc_mapping[pipe];
992} 992}
993 993
994static inline struct drm_crtc * 994static inline struct drm_crtc *
995intel_get_crtc_for_plane(struct drm_device *dev, int plane) 995intel_get_crtc_for_plane(struct drm_device *dev, int plane)
996{ 996{
997 struct drm_i915_private *dev_priv = dev->dev_private; 997 struct drm_i915_private *dev_priv = to_i915(dev);
998 return dev_priv->plane_to_crtc_mapping[plane]; 998 return dev_priv->plane_to_crtc_mapping[plane];
999} 999}
1000 1000
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 448741d8653b..51109ac945bf 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -84,7 +84,7 @@ static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)
84{ 84{
85 struct drm_encoder *encoder = &intel_dsi->base.base; 85 struct drm_encoder *encoder = &intel_dsi->base.base;
86 struct drm_device *dev = encoder->dev; 86 struct drm_device *dev = encoder->dev;
87 struct drm_i915_private *dev_priv = dev->dev_private; 87 struct drm_i915_private *dev_priv = to_i915(dev);
88 u32 mask; 88 u32 mask;
89 89
90 mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY | 90 mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
@@ -131,7 +131,7 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
131{ 131{
132 struct intel_dsi_host *intel_dsi_host = to_intel_dsi_host(host); 132 struct intel_dsi_host *intel_dsi_host = to_intel_dsi_host(host);
133 struct drm_device *dev = intel_dsi_host->intel_dsi->base.base.dev; 133 struct drm_device *dev = intel_dsi_host->intel_dsi->base.base.dev;
134 struct drm_i915_private *dev_priv = dev->dev_private; 134 struct drm_i915_private *dev_priv = to_i915(dev);
135 enum port port = intel_dsi_host->port; 135 enum port port = intel_dsi_host->port;
136 struct mipi_dsi_packet packet; 136 struct mipi_dsi_packet packet;
137 ssize_t ret; 137 ssize_t ret;
@@ -260,7 +260,7 @@ static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs,
260{ 260{
261 struct drm_encoder *encoder = &intel_dsi->base.base; 261 struct drm_encoder *encoder = &intel_dsi->base.base;
262 struct drm_device *dev = encoder->dev; 262 struct drm_device *dev = encoder->dev;
263 struct drm_i915_private *dev_priv = dev->dev_private; 263 struct drm_i915_private *dev_priv = to_i915(dev);
264 u32 mask; 264 u32 mask;
265 265
266 /* XXX: pipe, hs */ 266 /* XXX: pipe, hs */
@@ -314,7 +314,7 @@ static inline bool is_cmd_mode(struct intel_dsi *intel_dsi)
314static bool intel_dsi_compute_config(struct intel_encoder *encoder, 314static bool intel_dsi_compute_config(struct intel_encoder *encoder,
315 struct intel_crtc_state *pipe_config) 315 struct intel_crtc_state *pipe_config)
316{ 316{
317 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 317 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
318 struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, 318 struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
319 base); 319 base);
320 struct intel_connector *intel_connector = intel_dsi->attached_connector; 320 struct intel_connector *intel_connector = intel_dsi->attached_connector;
@@ -360,7 +360,7 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
360 360
361static void bxt_dsi_device_ready(struct intel_encoder *encoder) 361static void bxt_dsi_device_ready(struct intel_encoder *encoder)
362{ 362{
363 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 363 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
364 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 364 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
365 enum port port; 365 enum port port;
366 u32 val; 366 u32 val;
@@ -399,7 +399,7 @@ static void bxt_dsi_device_ready(struct intel_encoder *encoder)
399 399
400static void vlv_dsi_device_ready(struct intel_encoder *encoder) 400static void vlv_dsi_device_ready(struct intel_encoder *encoder)
401{ 401{
402 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 402 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
403 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 403 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
404 enum port port; 404 enum port port;
405 u32 val; 405 u32 val;
@@ -449,7 +449,7 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder)
449static void intel_dsi_port_enable(struct intel_encoder *encoder) 449static void intel_dsi_port_enable(struct intel_encoder *encoder)
450{ 450{
451 struct drm_device *dev = encoder->base.dev; 451 struct drm_device *dev = encoder->base.dev;
452 struct drm_i915_private *dev_priv = dev->dev_private; 452 struct drm_i915_private *dev_priv = to_i915(dev);
453 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 453 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
454 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 454 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
455 enum port port; 455 enum port port;
@@ -490,7 +490,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)
490static void intel_dsi_port_disable(struct intel_encoder *encoder) 490static void intel_dsi_port_disable(struct intel_encoder *encoder)
491{ 491{
492 struct drm_device *dev = encoder->base.dev; 492 struct drm_device *dev = encoder->base.dev;
493 struct drm_i915_private *dev_priv = dev->dev_private; 493 struct drm_i915_private *dev_priv = to_i915(dev);
494 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 494 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
495 enum port port; 495 enum port port;
496 496
@@ -509,7 +509,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)
509static void intel_dsi_enable(struct intel_encoder *encoder) 509static void intel_dsi_enable(struct intel_encoder *encoder)
510{ 510{
511 struct drm_device *dev = encoder->base.dev; 511 struct drm_device *dev = encoder->base.dev;
512 struct drm_i915_private *dev_priv = dev->dev_private; 512 struct drm_i915_private *dev_priv = to_i915(dev);
513 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 513 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
514 enum port port; 514 enum port port;
515 515
@@ -540,7 +540,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder);
540static void intel_dsi_pre_enable(struct intel_encoder *encoder) 540static void intel_dsi_pre_enable(struct intel_encoder *encoder)
541{ 541{
542 struct drm_device *dev = encoder->base.dev; 542 struct drm_device *dev = encoder->base.dev;
543 struct drm_i915_private *dev_priv = dev->dev_private; 543 struct drm_i915_private *dev_priv = to_i915(dev);
544 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 544 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
545 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 545 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
546 enum port port; 546 enum port port;
@@ -614,7 +614,7 @@ static void intel_dsi_pre_disable(struct intel_encoder *encoder)
614static void intel_dsi_disable(struct intel_encoder *encoder) 614static void intel_dsi_disable(struct intel_encoder *encoder)
615{ 615{
616 struct drm_device *dev = encoder->base.dev; 616 struct drm_device *dev = encoder->base.dev;
617 struct drm_i915_private *dev_priv = dev->dev_private; 617 struct drm_i915_private *dev_priv = to_i915(dev);
618 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 618 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
619 enum port port; 619 enum port port;
620 u32 temp; 620 u32 temp;
@@ -653,7 +653,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
653static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) 653static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
654{ 654{
655 struct drm_device *dev = encoder->base.dev; 655 struct drm_device *dev = encoder->base.dev;
656 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 656 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
657 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 657 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
658 enum port port; 658 enum port port;
659 659
@@ -698,7 +698,7 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
698 698
699static void intel_dsi_post_disable(struct intel_encoder *encoder) 699static void intel_dsi_post_disable(struct intel_encoder *encoder)
700{ 700{
701 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 701 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
702 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 702 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
703 703
704 DRM_DEBUG_KMS("\n"); 704 DRM_DEBUG_KMS("\n");
@@ -733,7 +733,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
733static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, 733static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
734 enum pipe *pipe) 734 enum pipe *pipe)
735{ 735{
736 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 736 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
737 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 737 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
738 struct drm_device *dev = encoder->base.dev; 738 struct drm_device *dev = encoder->base.dev;
739 enum intel_display_power_domain power_domain; 739 enum intel_display_power_domain power_domain;
@@ -807,7 +807,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
807 struct intel_crtc_state *pipe_config) 807 struct intel_crtc_state *pipe_config)
808{ 808{
809 struct drm_device *dev = encoder->base.dev; 809 struct drm_device *dev = encoder->base.dev;
810 struct drm_i915_private *dev_priv = dev->dev_private; 810 struct drm_i915_private *dev_priv = to_i915(dev);
811 struct drm_display_mode *adjusted_mode = 811 struct drm_display_mode *adjusted_mode =
812 &pipe_config->base.adjusted_mode; 812 &pipe_config->base.adjusted_mode;
813 struct drm_display_mode *adjusted_mode_sw; 813 struct drm_display_mode *adjusted_mode_sw;
@@ -1026,7 +1026,7 @@ static void set_dsi_timings(struct drm_encoder *encoder,
1026 const struct drm_display_mode *adjusted_mode) 1026 const struct drm_display_mode *adjusted_mode)
1027{ 1027{
1028 struct drm_device *dev = encoder->dev; 1028 struct drm_device *dev = encoder->dev;
1029 struct drm_i915_private *dev_priv = dev->dev_private; 1029 struct drm_i915_private *dev_priv = to_i915(dev);
1030 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); 1030 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
1031 enum port port; 1031 enum port port;
1032 unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format); 1032 unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
@@ -1112,7 +1112,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
1112{ 1112{
1113 struct drm_encoder *encoder = &intel_encoder->base; 1113 struct drm_encoder *encoder = &intel_encoder->base;
1114 struct drm_device *dev = encoder->dev; 1114 struct drm_device *dev = encoder->dev;
1115 struct drm_i915_private *dev_priv = dev->dev_private; 1115 struct drm_i915_private *dev_priv = to_i915(dev);
1116 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 1116 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
1117 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); 1117 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
1118 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; 1118 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
@@ -1434,7 +1434,7 @@ void intel_dsi_init(struct drm_device *dev)
1434 struct intel_connector *intel_connector; 1434 struct intel_connector *intel_connector;
1435 struct drm_connector *connector; 1435 struct drm_connector *connector;
1436 struct drm_display_mode *scan, *fixed_mode = NULL; 1436 struct drm_display_mode *scan, *fixed_mode = NULL;
1437 struct drm_i915_private *dev_priv = dev->dev_private; 1437 struct drm_i915_private *dev_priv = to_i915(dev);
1438 enum port port; 1438 enum port port;
1439 unsigned int i; 1439 unsigned int i;
1440 1440
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
index f0dc427743f8..ac7c6020c443 100644
--- a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
+++ b/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
@@ -159,7 +159,7 @@ static int dcs_setup_backlight(struct intel_connector *connector,
159int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector) 159int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
160{ 160{
161 struct drm_device *dev = intel_connector->base.dev; 161 struct drm_device *dev = intel_connector->base.dev;
162 struct drm_i915_private *dev_priv = dev->dev_private; 162 struct drm_i915_private *dev_priv = to_i915(dev);
163 struct intel_encoder *encoder = intel_connector->encoder; 163 struct intel_encoder *encoder = intel_connector->encoder;
164 struct intel_panel *panel = &intel_connector->panel; 164 struct intel_panel *panel = &intel_connector->panel;
165 165
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 4a3da875b620..cd154ce6b6c1 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -303,7 +303,7 @@ static void chv_exec_gpio(struct drm_i915_private *dev_priv,
303static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) 303static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
304{ 304{
305 struct drm_device *dev = intel_dsi->base.base.dev; 305 struct drm_device *dev = intel_dsi->base.base.dev;
306 struct drm_i915_private *dev_priv = dev->dev_private; 306 struct drm_i915_private *dev_priv = to_i915(dev);
307 u8 gpio_source, gpio_index; 307 u8 gpio_source, gpio_index;
308 bool value; 308 bool value;
309 309
@@ -469,7 +469,7 @@ static int vbt_panel_get_modes(struct drm_panel *panel)
469 struct vbt_panel *vbt_panel = to_vbt_panel(panel); 469 struct vbt_panel *vbt_panel = to_vbt_panel(panel);
470 struct intel_dsi *intel_dsi = vbt_panel->intel_dsi; 470 struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
471 struct drm_device *dev = intel_dsi->base.base.dev; 471 struct drm_device *dev = intel_dsi->base.base.dev;
472 struct drm_i915_private *dev_priv = dev->dev_private; 472 struct drm_i915_private *dev_priv = to_i915(dev);
473 struct drm_display_mode *mode; 473 struct drm_display_mode *mode;
474 474
475 if (!panel->connector) 475 if (!panel->connector)
@@ -497,7 +497,7 @@ static const struct drm_panel_funcs vbt_panel_funcs = {
497struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id) 497struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
498{ 498{
499 struct drm_device *dev = intel_dsi->base.base.dev; 499 struct drm_device *dev = intel_dsi->base.base.dev;
500 struct drm_i915_private *dev_priv = dev->dev_private; 500 struct drm_i915_private *dev_priv = to_i915(dev);
501 struct mipi_config *mipi_config = dev_priv->vbt.dsi.config; 501 struct mipi_config *mipi_config = dev_priv->vbt.dsi.config;
502 struct mipi_pps_data *pps = dev_priv->vbt.dsi.pps; 502 struct mipi_pps_data *pps = dev_priv->vbt.dsi.pps;
503 struct drm_display_mode *mode = dev_priv->vbt.lfp_lvds_vbt_mode; 503 struct drm_display_mode *mode = dev_priv->vbt.lfp_lvds_vbt_mode;
diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c
index 1fcddeb3303d..6ab58a01b18e 100644
--- a/drivers/gpu/drm/i915/intel_dsi_pll.c
+++ b/drivers/gpu/drm/i915/intel_dsi_pll.c
@@ -114,7 +114,7 @@ static int dsi_calc_mnp(struct drm_i915_private *dev_priv,
114static int vlv_compute_dsi_pll(struct intel_encoder *encoder, 114static int vlv_compute_dsi_pll(struct intel_encoder *encoder,
115 struct intel_crtc_state *config) 115 struct intel_crtc_state *config)
116{ 116{
117 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 117 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
118 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 118 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
119 int ret; 119 int ret;
120 u32 dsi_clk; 120 u32 dsi_clk;
@@ -325,7 +325,7 @@ static u32 bxt_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp,
325 u32 dsi_clk; 325 u32 dsi_clk;
326 u32 dsi_ratio; 326 u32 dsi_ratio;
327 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 327 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
328 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 328 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
329 329
330 /* Divide by zero */ 330 /* Divide by zero */
331 if (!pipe_bpp) { 331 if (!pipe_bpp) {
@@ -360,7 +360,7 @@ u32 intel_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp,
360static void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port) 360static void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)
361{ 361{
362 u32 temp; 362 u32 temp;
363 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 363 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
364 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 364 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
365 365
366 temp = I915_READ(MIPI_CTRL(port)); 366 temp = I915_READ(MIPI_CTRL(port));
@@ -374,7 +374,7 @@ static void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)
374static void bxt_dsi_program_clocks(struct drm_device *dev, enum port port, 374static void bxt_dsi_program_clocks(struct drm_device *dev, enum port port,
375 const struct intel_crtc_state *config) 375 const struct intel_crtc_state *config)
376{ 376{
377 struct drm_i915_private *dev_priv = dev->dev_private; 377 struct drm_i915_private *dev_priv = to_i915(dev);
378 u32 tmp; 378 u32 tmp;
379 u32 dsi_rate = 0; 379 u32 dsi_rate = 0;
380 u32 pll_ratio = 0; 380 u32 pll_ratio = 0;
@@ -469,7 +469,7 @@ static int bxt_compute_dsi_pll(struct intel_encoder *encoder,
469static void bxt_enable_dsi_pll(struct intel_encoder *encoder, 469static void bxt_enable_dsi_pll(struct intel_encoder *encoder,
470 const struct intel_crtc_state *config) 470 const struct intel_crtc_state *config)
471{ 471{
472 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 472 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
473 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 473 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
474 enum port port; 474 enum port port;
475 u32 val; 475 u32 val;
@@ -550,7 +550,7 @@ static void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)
550{ 550{
551 u32 tmp; 551 u32 tmp;
552 struct drm_device *dev = encoder->base.dev; 552 struct drm_device *dev = encoder->base.dev;
553 struct drm_i915_private *dev_priv = dev->dev_private; 553 struct drm_i915_private *dev_priv = to_i915(dev);
554 554
555 /* Clear old configurations */ 555 /* Clear old configurations */
556 tmp = I915_READ(BXT_MIPI_CLOCK_CTL); 556 tmp = I915_READ(BXT_MIPI_CLOCK_CTL);
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 14b1d3f333a4..47bdf9dad0d3 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -122,7 +122,7 @@ static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
122static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector) 122static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)
123{ 123{
124 struct drm_device *dev = connector->base.dev; 124 struct drm_device *dev = connector->base.dev;
125 struct drm_i915_private *dev_priv = dev->dev_private; 125 struct drm_i915_private *dev_priv = to_i915(dev);
126 struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base); 126 struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base);
127 u32 tmp; 127 u32 tmp;
128 128
@@ -138,7 +138,7 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
138 enum pipe *pipe) 138 enum pipe *pipe)
139{ 139{
140 struct drm_device *dev = encoder->base.dev; 140 struct drm_device *dev = encoder->base.dev;
141 struct drm_i915_private *dev_priv = dev->dev_private; 141 struct drm_i915_private *dev_priv = to_i915(dev);
142 struct intel_dvo *intel_dvo = enc_to_dvo(encoder); 142 struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
143 u32 tmp; 143 u32 tmp;
144 144
@@ -155,7 +155,7 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
155static void intel_dvo_get_config(struct intel_encoder *encoder, 155static void intel_dvo_get_config(struct intel_encoder *encoder,
156 struct intel_crtc_state *pipe_config) 156 struct intel_crtc_state *pipe_config)
157{ 157{
158 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 158 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
159 struct intel_dvo *intel_dvo = enc_to_dvo(encoder); 159 struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
160 u32 tmp, flags = 0; 160 u32 tmp, flags = 0;
161 161
@@ -176,7 +176,7 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,
176 176
177static void intel_disable_dvo(struct intel_encoder *encoder) 177static void intel_disable_dvo(struct intel_encoder *encoder)
178{ 178{
179 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 179 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
180 struct intel_dvo *intel_dvo = enc_to_dvo(encoder); 180 struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
181 i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg; 181 i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg;
182 u32 temp = I915_READ(dvo_reg); 182 u32 temp = I915_READ(dvo_reg);
@@ -188,7 +188,7 @@ static void intel_disable_dvo(struct intel_encoder *encoder)
188 188
189static void intel_enable_dvo(struct intel_encoder *encoder) 189static void intel_enable_dvo(struct intel_encoder *encoder)
190{ 190{
191 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 191 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
192 struct intel_dvo *intel_dvo = enc_to_dvo(encoder); 192 struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
193 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 193 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
194 i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg; 194 i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg;
@@ -256,7 +256,7 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,
256static void intel_dvo_pre_enable(struct intel_encoder *encoder) 256static void intel_dvo_pre_enable(struct intel_encoder *encoder)
257{ 257{
258 struct drm_device *dev = encoder->base.dev; 258 struct drm_device *dev = encoder->base.dev;
259 struct drm_i915_private *dev_priv = dev->dev_private; 259 struct drm_i915_private *dev_priv = to_i915(dev);
260 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 260 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
261 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 261 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
262 struct intel_dvo *intel_dvo = enc_to_dvo(encoder); 262 struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
@@ -305,7 +305,7 @@ intel_dvo_detect(struct drm_connector *connector, bool force)
305 305
306static int intel_dvo_get_modes(struct drm_connector *connector) 306static int intel_dvo_get_modes(struct drm_connector *connector)
307{ 307{
308 struct drm_i915_private *dev_priv = connector->dev->dev_private; 308 struct drm_i915_private *dev_priv = to_i915(connector->dev);
309 const struct drm_display_mode *fixed_mode = 309 const struct drm_display_mode *fixed_mode =
310 to_intel_connector(connector)->panel.fixed_mode; 310 to_intel_connector(connector)->panel.fixed_mode;
311 311
@@ -379,7 +379,7 @@ static struct drm_display_mode *
379intel_dvo_get_current_mode(struct drm_connector *connector) 379intel_dvo_get_current_mode(struct drm_connector *connector)
380{ 380{
381 struct drm_device *dev = connector->dev; 381 struct drm_device *dev = connector->dev;
382 struct drm_i915_private *dev_priv = dev->dev_private; 382 struct drm_i915_private *dev_priv = to_i915(dev);
383 struct intel_dvo *intel_dvo = intel_attached_dvo(connector); 383 struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
384 uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg); 384 uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg);
385 struct drm_display_mode *mode = NULL; 385 struct drm_display_mode *mode = NULL;
@@ -421,7 +421,7 @@ static char intel_dvo_port_name(i915_reg_t dvo_reg)
421 421
422void intel_dvo_init(struct drm_device *dev) 422void intel_dvo_init(struct drm_device *dev)
423{ 423{
424 struct drm_i915_private *dev_priv = dev->dev_private; 424 struct drm_i915_private *dev_priv = to_i915(dev);
425 struct intel_encoder *intel_encoder; 425 struct intel_encoder *intel_encoder;
426 struct intel_dvo *intel_dvo; 426 struct intel_dvo *intel_dvo;
427 struct intel_connector *intel_connector; 427 struct intel_connector *intel_connector;
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 978d79532f96..067b6f518e48 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -445,7 +445,7 @@ out:
445 445
446static void intel_fbc_schedule_activation(struct intel_crtc *crtc) 446static void intel_fbc_schedule_activation(struct intel_crtc *crtc)
447{ 447{
448 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 448 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
449 struct intel_fbc *fbc = &dev_priv->fbc; 449 struct intel_fbc *fbc = &dev_priv->fbc;
450 struct intel_fbc_work *work = &fbc->work; 450 struct intel_fbc_work *work = &fbc->work;
451 451
@@ -555,7 +555,7 @@ again:
555 555
556static int intel_fbc_alloc_cfb(struct intel_crtc *crtc) 556static int intel_fbc_alloc_cfb(struct intel_crtc *crtc)
557{ 557{
558 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 558 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
559 struct intel_fbc *fbc = &dev_priv->fbc; 559 struct intel_fbc *fbc = &dev_priv->fbc;
560 struct drm_mm_node *uninitialized_var(compressed_llb); 560 struct drm_mm_node *uninitialized_var(compressed_llb);
561 int size, fb_cpp, ret; 561 int size, fb_cpp, ret;
@@ -686,7 +686,7 @@ static bool pixel_format_is_valid(struct drm_i915_private *dev_priv,
686 */ 686 */
687static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc) 687static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)
688{ 688{
689 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 689 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
690 struct intel_fbc *fbc = &dev_priv->fbc; 690 struct intel_fbc *fbc = &dev_priv->fbc;
691 unsigned int effective_w, effective_h, max_w, max_h; 691 unsigned int effective_w, effective_h, max_w, max_h;
692 692
@@ -713,7 +713,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
713 struct intel_crtc_state *crtc_state, 713 struct intel_crtc_state *crtc_state,
714 struct intel_plane_state *plane_state) 714 struct intel_plane_state *plane_state)
715{ 715{
716 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 716 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
717 struct intel_fbc *fbc = &dev_priv->fbc; 717 struct intel_fbc *fbc = &dev_priv->fbc;
718 struct intel_fbc_state_cache *cache = &fbc->state_cache; 718 struct intel_fbc_state_cache *cache = &fbc->state_cache;
719 struct drm_framebuffer *fb = plane_state->base.fb; 719 struct drm_framebuffer *fb = plane_state->base.fb;
@@ -746,7 +746,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
746 746
747static bool intel_fbc_can_activate(struct intel_crtc *crtc) 747static bool intel_fbc_can_activate(struct intel_crtc *crtc)
748{ 748{
749 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 749 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
750 struct intel_fbc *fbc = &dev_priv->fbc; 750 struct intel_fbc *fbc = &dev_priv->fbc;
751 struct intel_fbc_state_cache *cache = &fbc->state_cache; 751 struct intel_fbc_state_cache *cache = &fbc->state_cache;
752 752
@@ -818,7 +818,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)
818 818
819static bool intel_fbc_can_choose(struct intel_crtc *crtc) 819static bool intel_fbc_can_choose(struct intel_crtc *crtc)
820{ 820{
821 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 821 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
822 struct intel_fbc *fbc = &dev_priv->fbc; 822 struct intel_fbc *fbc = &dev_priv->fbc;
823 823
824 if (intel_vgpu_active(dev_priv)) { 824 if (intel_vgpu_active(dev_priv)) {
@@ -847,7 +847,7 @@ static bool intel_fbc_can_choose(struct intel_crtc *crtc)
847static void intel_fbc_get_reg_params(struct intel_crtc *crtc, 847static void intel_fbc_get_reg_params(struct intel_crtc *crtc,
848 struct intel_fbc_reg_params *params) 848 struct intel_fbc_reg_params *params)
849{ 849{
850 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 850 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
851 struct intel_fbc *fbc = &dev_priv->fbc; 851 struct intel_fbc *fbc = &dev_priv->fbc;
852 struct intel_fbc_state_cache *cache = &fbc->state_cache; 852 struct intel_fbc_state_cache *cache = &fbc->state_cache;
853 853
@@ -880,7 +880,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc,
880 struct intel_crtc_state *crtc_state, 880 struct intel_crtc_state *crtc_state,
881 struct intel_plane_state *plane_state) 881 struct intel_plane_state *plane_state)
882{ 882{
883 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 883 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
884 struct intel_fbc *fbc = &dev_priv->fbc; 884 struct intel_fbc *fbc = &dev_priv->fbc;
885 885
886 if (!fbc_supported(dev_priv)) 886 if (!fbc_supported(dev_priv))
@@ -906,7 +906,7 @@ unlock:
906 906
907static void __intel_fbc_post_update(struct intel_crtc *crtc) 907static void __intel_fbc_post_update(struct intel_crtc *crtc)
908{ 908{
909 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 909 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
910 struct intel_fbc *fbc = &dev_priv->fbc; 910 struct intel_fbc *fbc = &dev_priv->fbc;
911 struct intel_fbc_reg_params old_params; 911 struct intel_fbc_reg_params old_params;
912 912
@@ -939,7 +939,7 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
939 939
940void intel_fbc_post_update(struct intel_crtc *crtc) 940void intel_fbc_post_update(struct intel_crtc *crtc)
941{ 941{
942 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 942 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
943 struct intel_fbc *fbc = &dev_priv->fbc; 943 struct intel_fbc *fbc = &dev_priv->fbc;
944 944
945 if (!fbc_supported(dev_priv)) 945 if (!fbc_supported(dev_priv))
@@ -1085,7 +1085,7 @@ void intel_fbc_enable(struct intel_crtc *crtc,
1085 struct intel_crtc_state *crtc_state, 1085 struct intel_crtc_state *crtc_state,
1086 struct intel_plane_state *plane_state) 1086 struct intel_plane_state *plane_state)
1087{ 1087{
1088 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 1088 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
1089 struct intel_fbc *fbc = &dev_priv->fbc; 1089 struct intel_fbc *fbc = &dev_priv->fbc;
1090 1090
1091 if (!fbc_supported(dev_priv)) 1091 if (!fbc_supported(dev_priv))
@@ -1156,7 +1156,7 @@ static void __intel_fbc_disable(struct drm_i915_private *dev_priv)
1156 */ 1156 */
1157void intel_fbc_disable(struct intel_crtc *crtc) 1157void intel_fbc_disable(struct intel_crtc *crtc)
1158{ 1158{
1159 struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; 1159 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
1160 struct intel_fbc *fbc = &dev_priv->fbc; 1160 struct intel_fbc *fbc = &dev_priv->fbc;
1161 1161
1162 if (!fbc_supported(dev_priv)) 1162 if (!fbc_supported(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 224180e402be..5205afd69ff6 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -703,7 +703,7 @@ static void intel_fbdev_suspend_worker(struct work_struct *work)
703int intel_fbdev_init(struct drm_device *dev) 703int intel_fbdev_init(struct drm_device *dev)
704{ 704{
705 struct intel_fbdev *ifbdev; 705 struct intel_fbdev *ifbdev;
706 struct drm_i915_private *dev_priv = dev->dev_private; 706 struct drm_i915_private *dev_priv = to_i915(dev);
707 int ret; 707 int ret;
708 708
709 if (WARN_ON(INTEL_INFO(dev)->num_pipes == 0)) 709 if (WARN_ON(INTEL_INFO(dev)->num_pipes == 0))
@@ -762,7 +762,7 @@ static void intel_fbdev_sync(struct intel_fbdev *ifbdev)
762 762
763void intel_fbdev_fini(struct drm_device *dev) 763void intel_fbdev_fini(struct drm_device *dev)
764{ 764{
765 struct drm_i915_private *dev_priv = dev->dev_private; 765 struct drm_i915_private *dev_priv = to_i915(dev);
766 struct intel_fbdev *ifbdev = dev_priv->fbdev; 766 struct intel_fbdev *ifbdev = dev_priv->fbdev;
767 767
768 if (!ifbdev) 768 if (!ifbdev)
@@ -778,7 +778,7 @@ void intel_fbdev_fini(struct drm_device *dev)
778 778
779void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous) 779void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous)
780{ 780{
781 struct drm_i915_private *dev_priv = dev->dev_private; 781 struct drm_i915_private *dev_priv = to_i915(dev);
782 struct intel_fbdev *ifbdev = dev_priv->fbdev; 782 struct intel_fbdev *ifbdev = dev_priv->fbdev;
783 struct fb_info *info; 783 struct fb_info *info;
784 784
@@ -827,7 +827,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
827 827
828void intel_fbdev_output_poll_changed(struct drm_device *dev) 828void intel_fbdev_output_poll_changed(struct drm_device *dev)
829{ 829{
830 struct drm_i915_private *dev_priv = dev->dev_private; 830 struct drm_i915_private *dev_priv = to_i915(dev);
831 if (dev_priv->fbdev) 831 if (dev_priv->fbdev)
832 drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); 832 drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);
833} 833}
@@ -835,7 +835,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
835void intel_fbdev_restore_mode(struct drm_device *dev) 835void intel_fbdev_restore_mode(struct drm_device *dev)
836{ 836{
837 int ret; 837 int ret;
838 struct drm_i915_private *dev_priv = dev->dev_private; 838 struct drm_i915_private *dev_priv = to_i915(dev);
839 struct intel_fbdev *ifbdev = dev_priv->fbdev; 839 struct intel_fbdev *ifbdev = dev_priv->fbdev;
840 struct drm_fb_helper *fb_helper; 840 struct drm_fb_helper *fb_helper;
841 841
diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.c b/drivers/gpu/drm/i915/intel_fifo_underrun.c
index 9be839a242f9..3fca95501890 100644
--- a/drivers/gpu/drm/i915/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/intel_fifo_underrun.c
@@ -50,7 +50,7 @@
50 50
51static bool ivb_can_enable_err_int(struct drm_device *dev) 51static bool ivb_can_enable_err_int(struct drm_device *dev)
52{ 52{
53 struct drm_i915_private *dev_priv = dev->dev_private; 53 struct drm_i915_private *dev_priv = to_i915(dev);
54 struct intel_crtc *crtc; 54 struct intel_crtc *crtc;
55 enum pipe pipe; 55 enum pipe pipe;
56 56
@@ -68,7 +68,7 @@ static bool ivb_can_enable_err_int(struct drm_device *dev)
68 68
69static bool cpt_can_enable_serr_int(struct drm_device *dev) 69static bool cpt_can_enable_serr_int(struct drm_device *dev)
70{ 70{
71 struct drm_i915_private *dev_priv = dev->dev_private; 71 struct drm_i915_private *dev_priv = to_i915(dev);
72 enum pipe pipe; 72 enum pipe pipe;
73 struct intel_crtc *crtc; 73 struct intel_crtc *crtc;
74 74
@@ -105,7 +105,7 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
105 enum pipe pipe, 105 enum pipe pipe,
106 bool enable, bool old) 106 bool enable, bool old)
107{ 107{
108 struct drm_i915_private *dev_priv = dev->dev_private; 108 struct drm_i915_private *dev_priv = to_i915(dev);
109 i915_reg_t reg = PIPESTAT(pipe); 109 i915_reg_t reg = PIPESTAT(pipe);
110 u32 pipestat = I915_READ(reg) & 0xffff0000; 110 u32 pipestat = I915_READ(reg) & 0xffff0000;
111 111
@@ -123,7 +123,7 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
123static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev, 123static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
124 enum pipe pipe, bool enable) 124 enum pipe pipe, bool enable)
125{ 125{
126 struct drm_i915_private *dev_priv = dev->dev_private; 126 struct drm_i915_private *dev_priv = to_i915(dev);
127 uint32_t bit = (pipe == PIPE_A) ? DE_PIPEA_FIFO_UNDERRUN : 127 uint32_t bit = (pipe == PIPE_A) ? DE_PIPEA_FIFO_UNDERRUN :
128 DE_PIPEB_FIFO_UNDERRUN; 128 DE_PIPEB_FIFO_UNDERRUN;
129 129
@@ -154,7 +154,7 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
154 enum pipe pipe, 154 enum pipe pipe,
155 bool enable, bool old) 155 bool enable, bool old)
156{ 156{
157 struct drm_i915_private *dev_priv = dev->dev_private; 157 struct drm_i915_private *dev_priv = to_i915(dev);
158 if (enable) { 158 if (enable) {
159 I915_WRITE(GEN7_ERR_INT, ERR_INT_FIFO_UNDERRUN(pipe)); 159 I915_WRITE(GEN7_ERR_INT, ERR_INT_FIFO_UNDERRUN(pipe));
160 160
@@ -176,7 +176,7 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
176static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev, 176static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev,
177 enum pipe pipe, bool enable) 177 enum pipe pipe, bool enable)
178{ 178{
179 struct drm_i915_private *dev_priv = dev->dev_private; 179 struct drm_i915_private *dev_priv = to_i915(dev);
180 180
181 if (enable) 181 if (enable)
182 bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_FIFO_UNDERRUN); 182 bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_FIFO_UNDERRUN);
@@ -188,7 +188,7 @@ static void ibx_set_fifo_underrun_reporting(struct drm_device *dev,
188 enum transcoder pch_transcoder, 188 enum transcoder pch_transcoder,
189 bool enable) 189 bool enable)
190{ 190{
191 struct drm_i915_private *dev_priv = dev->dev_private; 191 struct drm_i915_private *dev_priv = to_i915(dev);
192 uint32_t bit = (pch_transcoder == TRANSCODER_A) ? 192 uint32_t bit = (pch_transcoder == TRANSCODER_A) ?
193 SDE_TRANSA_FIFO_UNDER : SDE_TRANSB_FIFO_UNDER; 193 SDE_TRANSA_FIFO_UNDER : SDE_TRANSB_FIFO_UNDER;
194 194
@@ -220,7 +220,7 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,
220 enum transcoder pch_transcoder, 220 enum transcoder pch_transcoder,
221 bool enable, bool old) 221 bool enable, bool old)
222{ 222{
223 struct drm_i915_private *dev_priv = dev->dev_private; 223 struct drm_i915_private *dev_priv = to_i915(dev);
224 224
225 if (enable) { 225 if (enable) {
226 I915_WRITE(SERR_INT, 226 I915_WRITE(SERR_INT,
@@ -244,7 +244,7 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,
244static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, 244static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
245 enum pipe pipe, bool enable) 245 enum pipe pipe, bool enable)
246{ 246{
247 struct drm_i915_private *dev_priv = dev->dev_private; 247 struct drm_i915_private *dev_priv = to_i915(dev);
248 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; 248 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
249 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 249 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
250 bool old; 250 bool old;
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index d80b617ad9af..7d8cc3e90b34 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -413,7 +413,7 @@ static int i915_reset_guc(struct drm_i915_private *dev_priv)
413 */ 413 */
414int intel_guc_setup(struct drm_device *dev) 414int intel_guc_setup(struct drm_device *dev)
415{ 415{
416 struct drm_i915_private *dev_priv = dev->dev_private; 416 struct drm_i915_private *dev_priv = to_i915(dev);
417 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; 417 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
418 const char *fw_path = guc_fw->guc_fw_path; 418 const char *fw_path = guc_fw->guc_fw_path;
419 int retries, ret, err; 419 int retries, ret, err;
@@ -681,7 +681,7 @@ fail:
681 */ 681 */
682void intel_guc_init(struct drm_device *dev) 682void intel_guc_init(struct drm_device *dev)
683{ 683{
684 struct drm_i915_private *dev_priv = dev->dev_private; 684 struct drm_i915_private *dev_priv = to_i915(dev);
685 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; 685 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
686 const char *fw_path; 686 const char *fw_path;
687 687
@@ -734,7 +734,7 @@ void intel_guc_init(struct drm_device *dev)
734 */ 734 */
735void intel_guc_fini(struct drm_device *dev) 735void intel_guc_fini(struct drm_device *dev)
736{ 736{
737 struct drm_i915_private *dev_priv = dev->dev_private; 737 struct drm_i915_private *dev_priv = to_i915(dev);
738 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; 738 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
739 739
740 mutex_lock(&dev->struct_mutex); 740 mutex_lock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 86e1fdb70141..4f4e4b535683 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -47,7 +47,7 @@ static void
47assert_hdmi_port_disabled(struct intel_hdmi *intel_hdmi) 47assert_hdmi_port_disabled(struct intel_hdmi *intel_hdmi)
48{ 48{
49 struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi); 49 struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi);
50 struct drm_i915_private *dev_priv = dev->dev_private; 50 struct drm_i915_private *dev_priv = to_i915(dev);
51 uint32_t enabled_bits; 51 uint32_t enabled_bits;
52 52
53 enabled_bits = HAS_DDI(dev) ? DDI_BUF_CTL_ENABLE : SDVO_ENABLE; 53 enabled_bits = HAS_DDI(dev) ? DDI_BUF_CTL_ENABLE : SDVO_ENABLE;
@@ -138,7 +138,7 @@ static void g4x_write_infoframe(struct drm_encoder *encoder,
138{ 138{
139 const uint32_t *data = frame; 139 const uint32_t *data = frame;
140 struct drm_device *dev = encoder->dev; 140 struct drm_device *dev = encoder->dev;
141 struct drm_i915_private *dev_priv = dev->dev_private; 141 struct drm_i915_private *dev_priv = to_i915(dev);
142 u32 val = I915_READ(VIDEO_DIP_CTL); 142 u32 val = I915_READ(VIDEO_DIP_CTL);
143 int i; 143 int i;
144 144
@@ -192,7 +192,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,
192{ 192{
193 const uint32_t *data = frame; 193 const uint32_t *data = frame;
194 struct drm_device *dev = encoder->dev; 194 struct drm_device *dev = encoder->dev;
195 struct drm_i915_private *dev_priv = dev->dev_private; 195 struct drm_i915_private *dev_priv = to_i915(dev);
196 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 196 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
197 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe); 197 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
198 u32 val = I915_READ(reg); 198 u32 val = I915_READ(reg);
@@ -251,7 +251,7 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,
251{ 251{
252 const uint32_t *data = frame; 252 const uint32_t *data = frame;
253 struct drm_device *dev = encoder->dev; 253 struct drm_device *dev = encoder->dev;
254 struct drm_i915_private *dev_priv = dev->dev_private; 254 struct drm_i915_private *dev_priv = to_i915(dev);
255 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 255 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
256 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe); 256 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
257 u32 val = I915_READ(reg); 257 u32 val = I915_READ(reg);
@@ -308,7 +308,7 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,
308{ 308{
309 const uint32_t *data = frame; 309 const uint32_t *data = frame;
310 struct drm_device *dev = encoder->dev; 310 struct drm_device *dev = encoder->dev;
311 struct drm_i915_private *dev_priv = dev->dev_private; 311 struct drm_i915_private *dev_priv = to_i915(dev);
312 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 312 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
313 i915_reg_t reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe); 313 i915_reg_t reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);
314 u32 val = I915_READ(reg); 314 u32 val = I915_READ(reg);
@@ -366,7 +366,7 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,
366{ 366{
367 const uint32_t *data = frame; 367 const uint32_t *data = frame;
368 struct drm_device *dev = encoder->dev; 368 struct drm_device *dev = encoder->dev;
369 struct drm_i915_private *dev_priv = dev->dev_private; 369 struct drm_i915_private *dev_priv = to_i915(dev);
370 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 370 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
371 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; 371 enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
372 i915_reg_t ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder); 372 i915_reg_t ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder);
@@ -508,7 +508,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
508 bool enable, 508 bool enable,
509 const struct drm_display_mode *adjusted_mode) 509 const struct drm_display_mode *adjusted_mode)
510{ 510{
511 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 511 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
512 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); 512 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
513 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; 513 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
514 i915_reg_t reg = VIDEO_DIP_CTL; 514 i915_reg_t reg = VIDEO_DIP_CTL;
@@ -629,7 +629,7 @@ static bool gcp_default_phase_possible(int pipe_bpp,
629 629
630static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder) 630static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder)
631{ 631{
632 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 632 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
633 struct intel_crtc *crtc = to_intel_crtc(encoder->crtc); 633 struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
634 i915_reg_t reg; 634 i915_reg_t reg;
635 u32 val = 0; 635 u32 val = 0;
@@ -661,7 +661,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
661 bool enable, 661 bool enable,
662 const struct drm_display_mode *adjusted_mode) 662 const struct drm_display_mode *adjusted_mode)
663{ 663{
664 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 664 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
665 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 665 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
666 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); 666 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
667 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; 667 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
@@ -713,7 +713,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
713 bool enable, 713 bool enable,
714 const struct drm_display_mode *adjusted_mode) 714 const struct drm_display_mode *adjusted_mode)
715{ 715{
716 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 716 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
717 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 717 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
718 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); 718 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
719 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe); 719 i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
@@ -755,7 +755,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
755 bool enable, 755 bool enable,
756 const struct drm_display_mode *adjusted_mode) 756 const struct drm_display_mode *adjusted_mode)
757{ 757{
758 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 758 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
759 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); 759 struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
760 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 760 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
761 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); 761 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
@@ -807,7 +807,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
807 bool enable, 807 bool enable,
808 const struct drm_display_mode *adjusted_mode) 808 const struct drm_display_mode *adjusted_mode)
809{ 809{
810 struct drm_i915_private *dev_priv = encoder->dev->dev_private; 810 struct drm_i915_private *dev_priv = to_i915(encoder->dev);
811 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); 811 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
812 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); 812 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
813 i915_reg_t reg = HSW_TVIDEO_DIP_CTL(intel_crtc->config->cpu_transcoder); 813 i915_reg_t reg = HSW_TVIDEO_DIP_CTL(intel_crtc->config->cpu_transcoder);
@@ -855,7 +855,7 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
855static void intel_hdmi_prepare(struct intel_encoder *encoder) 855static void intel_hdmi_prepare(struct intel_encoder *encoder)
856{ 856{
857 struct drm_device *dev = encoder->base.dev; 857 struct drm_device *dev = encoder->base.dev;
858 struct drm_i915_private *dev_priv = dev->dev_private; 858 struct drm_i915_private *dev_priv = to_i915(dev);
859 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 859 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
860 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 860 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
861 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 861 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
@@ -894,7 +894,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
894 enum pipe *pipe) 894 enum pipe *pipe)
895{ 895{
896 struct drm_device *dev = encoder->base.dev; 896 struct drm_device *dev = encoder->base.dev;
897 struct drm_i915_private *dev_priv = dev->dev_private; 897 struct drm_i915_private *dev_priv = to_i915(dev);
898 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 898 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
899 enum intel_display_power_domain power_domain; 899 enum intel_display_power_domain power_domain;
900 u32 tmp; 900 u32 tmp;
@@ -931,7 +931,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
931{ 931{
932 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 932 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
933 struct drm_device *dev = encoder->base.dev; 933 struct drm_device *dev = encoder->base.dev;
934 struct drm_i915_private *dev_priv = dev->dev_private; 934 struct drm_i915_private *dev_priv = to_i915(dev);
935 u32 tmp, flags = 0; 935 u32 tmp, flags = 0;
936 int dotclock; 936 int dotclock;
937 937
@@ -988,7 +988,7 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder)
988static void g4x_enable_hdmi(struct intel_encoder *encoder) 988static void g4x_enable_hdmi(struct intel_encoder *encoder)
989{ 989{
990 struct drm_device *dev = encoder->base.dev; 990 struct drm_device *dev = encoder->base.dev;
991 struct drm_i915_private *dev_priv = dev->dev_private; 991 struct drm_i915_private *dev_priv = to_i915(dev);
992 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 992 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
993 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 993 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
994 u32 temp; 994 u32 temp;
@@ -1009,7 +1009,7 @@ static void g4x_enable_hdmi(struct intel_encoder *encoder)
1009static void ibx_enable_hdmi(struct intel_encoder *encoder) 1009static void ibx_enable_hdmi(struct intel_encoder *encoder)
1010{ 1010{
1011 struct drm_device *dev = encoder->base.dev; 1011 struct drm_device *dev = encoder->base.dev;
1012 struct drm_i915_private *dev_priv = dev->dev_private; 1012 struct drm_i915_private *dev_priv = to_i915(dev);
1013 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 1013 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
1014 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 1014 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
1015 u32 temp; 1015 u32 temp;
@@ -1058,7 +1058,7 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder)
1058static void cpt_enable_hdmi(struct intel_encoder *encoder) 1058static void cpt_enable_hdmi(struct intel_encoder *encoder)
1059{ 1059{
1060 struct drm_device *dev = encoder->base.dev; 1060 struct drm_device *dev = encoder->base.dev;
1061 struct drm_i915_private *dev_priv = dev->dev_private; 1061 struct drm_i915_private *dev_priv = to_i915(dev);
1062 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 1062 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
1063 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 1063 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
1064 enum pipe pipe = crtc->pipe; 1064 enum pipe pipe = crtc->pipe;
@@ -1115,7 +1115,7 @@ static void vlv_enable_hdmi(struct intel_encoder *encoder)
1115static void intel_disable_hdmi(struct intel_encoder *encoder) 1115static void intel_disable_hdmi(struct intel_encoder *encoder)
1116{ 1116{
1117 struct drm_device *dev = encoder->base.dev; 1117 struct drm_device *dev = encoder->base.dev;
1118 struct drm_i915_private *dev_priv = dev->dev_private; 1118 struct drm_i915_private *dev_priv = to_i915(dev);
1119 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 1119 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
1120 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 1120 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
1121 u32 temp; 1121 u32 temp;
@@ -1575,7 +1575,7 @@ intel_hdmi_set_property(struct drm_connector *connector,
1575 struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); 1575 struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
1576 struct intel_digital_port *intel_dig_port = 1576 struct intel_digital_port *intel_dig_port =
1577 hdmi_to_dig_port(intel_hdmi); 1577 hdmi_to_dig_port(intel_hdmi);
1578 struct drm_i915_private *dev_priv = connector->dev->dev_private; 1578 struct drm_i915_private *dev_priv = to_i915(connector->dev);
1579 int ret; 1579 int ret;
1580 1580
1581 ret = drm_object_property_set_value(&connector->base, property, val); 1581 ret = drm_object_property_set_value(&connector->base, property, val);
@@ -1674,7 +1674,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
1674 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); 1674 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
1675 struct intel_hdmi *intel_hdmi = &dport->hdmi; 1675 struct intel_hdmi *intel_hdmi = &dport->hdmi;
1676 struct drm_device *dev = encoder->base.dev; 1676 struct drm_device *dev = encoder->base.dev;
1677 struct drm_i915_private *dev_priv = dev->dev_private; 1677 struct drm_i915_private *dev_priv = to_i915(dev);
1678 struct intel_crtc *intel_crtc = 1678 struct intel_crtc *intel_crtc =
1679 to_intel_crtc(encoder->base.crtc); 1679 to_intel_crtc(encoder->base.crtc);
1680 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; 1680 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
@@ -1722,7 +1722,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)
1722static void chv_hdmi_post_disable(struct intel_encoder *encoder) 1722static void chv_hdmi_post_disable(struct intel_encoder *encoder)
1723{ 1723{
1724 struct drm_device *dev = encoder->base.dev; 1724 struct drm_device *dev = encoder->base.dev;
1725 struct drm_i915_private *dev_priv = dev->dev_private; 1725 struct drm_i915_private *dev_priv = to_i915(dev);
1726 1726
1727 mutex_lock(&dev_priv->sb_lock); 1727 mutex_lock(&dev_priv->sb_lock);
1728 1728
@@ -1737,7 +1737,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
1737 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); 1737 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
1738 struct intel_hdmi *intel_hdmi = &dport->hdmi; 1738 struct intel_hdmi *intel_hdmi = &dport->hdmi;
1739 struct drm_device *dev = encoder->base.dev; 1739 struct drm_device *dev = encoder->base.dev;
1740 struct drm_i915_private *dev_priv = dev->dev_private; 1740 struct drm_i915_private *dev_priv = to_i915(dev);
1741 struct intel_crtc *intel_crtc = 1741 struct intel_crtc *intel_crtc =
1742 to_intel_crtc(encoder->base.crtc); 1742 to_intel_crtc(encoder->base.crtc);
1743 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; 1743 const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
@@ -1807,7 +1807,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
1807 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; 1807 struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
1808 struct intel_encoder *intel_encoder = &intel_dig_port->base; 1808 struct intel_encoder *intel_encoder = &intel_dig_port->base;
1809 struct drm_device *dev = intel_encoder->base.dev; 1809 struct drm_device *dev = intel_encoder->base.dev;
1810 struct drm_i915_private *dev_priv = dev->dev_private; 1810 struct drm_i915_private *dev_priv = to_i915(dev);
1811 enum port port = intel_dig_port->port; 1811 enum port port = intel_dig_port->port;
1812 uint8_t alternate_ddc_pin; 1812 uint8_t alternate_ddc_pin;
1813 1813
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 6bc4c064df0b..3c6f338866da 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -113,7 +113,7 @@ to_intel_gmbus(struct i2c_adapter *i2c)
113void 113void
114intel_i2c_reset(struct drm_device *dev) 114intel_i2c_reset(struct drm_device *dev)
115{ 115{
116 struct drm_i915_private *dev_priv = dev->dev_private; 116 struct drm_i915_private *dev_priv = to_i915(dev);
117 117
118 I915_WRITE(GMBUS0, 0); 118 I915_WRITE(GMBUS0, 0);
119 I915_WRITE(GMBUS4, 0); 119 I915_WRITE(GMBUS4, 0);
@@ -632,7 +632,7 @@ static const struct i2c_algorithm gmbus_algorithm = {
632 */ 632 */
633int intel_setup_gmbus(struct drm_device *dev) 633int intel_setup_gmbus(struct drm_device *dev)
634{ 634{
635 struct drm_i915_private *dev_priv = dev->dev_private; 635 struct drm_i915_private *dev_priv = to_i915(dev);
636 struct intel_gmbus *bus; 636 struct intel_gmbus *bus;
637 unsigned int pin; 637 unsigned int pin;
638 int ret; 638 int ret;
@@ -736,7 +736,7 @@ void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)
736 736
737void intel_teardown_gmbus(struct drm_device *dev) 737void intel_teardown_gmbus(struct drm_device *dev)
738{ 738{
739 struct drm_i915_private *dev_priv = dev->dev_private; 739 struct drm_i915_private *dev_priv = to_i915(dev);
740 struct intel_gmbus *bus; 740 struct intel_gmbus *bus;
741 unsigned int pin; 741 unsigned int pin;
742 742
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 2e66f310595f..676b53200e94 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -823,7 +823,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,
823{ 823{
824 struct drm_device *dev = params->dev; 824 struct drm_device *dev = params->dev;
825 struct intel_engine_cs *engine = params->engine; 825 struct intel_engine_cs *engine = params->engine;
826 struct drm_i915_private *dev_priv = dev->dev_private; 826 struct drm_i915_private *dev_priv = to_i915(dev);
827 struct intel_ringbuffer *ringbuf = params->ctx->engine[engine->id].ringbuf; 827 struct intel_ringbuffer *ringbuf = params->ctx->engine[engine->id].ringbuf;
828 u64 exec_start; 828 u64 exec_start;
829 int instp_mode; 829 int instp_mode;
@@ -2172,7 +2172,7 @@ logical_ring_setup(struct drm_i915_private *dev_priv, enum intel_engine_id id)
2172 */ 2172 */
2173int intel_logical_rings_init(struct drm_device *dev) 2173int intel_logical_rings_init(struct drm_device *dev)
2174{ 2174{
2175 struct drm_i915_private *dev_priv = dev->dev_private; 2175 struct drm_i915_private *dev_priv = to_i915(dev);
2176 unsigned int mask = 0; 2176 unsigned int mask = 0;
2177 unsigned int i; 2177 unsigned int i;
2178 int ret; 2178 int ret;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 681c6fd72ff6..49550470483e 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -72,7 +72,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
72 enum pipe *pipe) 72 enum pipe *pipe)
73{ 73{
74 struct drm_device *dev = encoder->base.dev; 74 struct drm_device *dev = encoder->base.dev;
75 struct drm_i915_private *dev_priv = dev->dev_private; 75 struct drm_i915_private *dev_priv = to_i915(dev);
76 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 76 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
77 enum intel_display_power_domain power_domain; 77 enum intel_display_power_domain power_domain;
78 u32 tmp; 78 u32 tmp;
@@ -106,7 +106,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,
106 struct intel_crtc_state *pipe_config) 106 struct intel_crtc_state *pipe_config)
107{ 107{
108 struct drm_device *dev = encoder->base.dev; 108 struct drm_device *dev = encoder->base.dev;
109 struct drm_i915_private *dev_priv = dev->dev_private; 109 struct drm_i915_private *dev_priv = to_i915(dev);
110 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 110 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
111 u32 tmp, flags = 0; 111 u32 tmp, flags = 0;
112 112
@@ -140,7 +140,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)
140{ 140{
141 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 141 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
142 struct drm_device *dev = encoder->base.dev; 142 struct drm_device *dev = encoder->base.dev;
143 struct drm_i915_private *dev_priv = dev->dev_private; 143 struct drm_i915_private *dev_priv = to_i915(dev);
144 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 144 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
145 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 145 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
146 int pipe = crtc->pipe; 146 int pipe = crtc->pipe;
@@ -216,7 +216,7 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
216 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 216 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
217 struct intel_connector *intel_connector = 217 struct intel_connector *intel_connector =
218 &lvds_encoder->attached_connector->base; 218 &lvds_encoder->attached_connector->base;
219 struct drm_i915_private *dev_priv = dev->dev_private; 219 struct drm_i915_private *dev_priv = to_i915(dev);
220 i915_reg_t ctl_reg, stat_reg; 220 i915_reg_t ctl_reg, stat_reg;
221 221
222 if (HAS_PCH_SPLIT(dev)) { 222 if (HAS_PCH_SPLIT(dev)) {
@@ -241,7 +241,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
241{ 241{
242 struct drm_device *dev = encoder->base.dev; 242 struct drm_device *dev = encoder->base.dev;
243 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 243 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
244 struct drm_i915_private *dev_priv = dev->dev_private; 244 struct drm_i915_private *dev_priv = to_i915(dev);
245 i915_reg_t ctl_reg, stat_reg; 245 i915_reg_t ctl_reg, stat_reg;
246 246
247 if (HAS_PCH_SPLIT(dev)) { 247 if (HAS_PCH_SPLIT(dev)) {
@@ -442,7 +442,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
442 container_of(nb, struct intel_lvds_connector, lid_notifier); 442 container_of(nb, struct intel_lvds_connector, lid_notifier);
443 struct drm_connector *connector = &lvds_connector->base.base; 443 struct drm_connector *connector = &lvds_connector->base.base;
444 struct drm_device *dev = connector->dev; 444 struct drm_device *dev = connector->dev;
445 struct drm_i915_private *dev_priv = dev->dev_private; 445 struct drm_i915_private *dev_priv = to_i915(dev);
446 446
447 if (dev->switch_power_state != DRM_SWITCH_POWER_ON) 447 if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
448 return NOTIFY_OK; 448 return NOTIFY_OK;
@@ -833,7 +833,7 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
833{ 833{
834 struct drm_device *dev = lvds_encoder->base.base.dev; 834 struct drm_device *dev = lvds_encoder->base.base.dev;
835 unsigned int val; 835 unsigned int val;
836 struct drm_i915_private *dev_priv = dev->dev_private; 836 struct drm_i915_private *dev_priv = to_i915(dev);
837 837
838 /* use the module option value if specified */ 838 /* use the module option value if specified */
839 if (i915.lvds_channel_mode > 0) 839 if (i915.lvds_channel_mode > 0)
@@ -883,7 +883,7 @@ static bool intel_lvds_supported(struct drm_device *dev)
883 */ 883 */
884void intel_lvds_init(struct drm_device *dev) 884void intel_lvds_init(struct drm_device *dev)
885{ 885{
886 struct drm_i915_private *dev_priv = dev->dev_private; 886 struct drm_i915_private *dev_priv = to_i915(dev);
887 struct intel_lvds_encoder *lvds_encoder; 887 struct intel_lvds_encoder *lvds_encoder;
888 struct intel_encoder *intel_encoder; 888 struct intel_encoder *intel_encoder;
889 struct intel_lvds_connector *lvds_connector; 889 struct intel_lvds_connector *lvds_connector;
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index 38a4c8ce7e63..f2584d0a01ab 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -82,7 +82,7 @@ void
82intel_attach_force_audio_property(struct drm_connector *connector) 82intel_attach_force_audio_property(struct drm_connector *connector)
83{ 83{
84 struct drm_device *dev = connector->dev; 84 struct drm_device *dev = connector->dev;
85 struct drm_i915_private *dev_priv = dev->dev_private; 85 struct drm_i915_private *dev_priv = to_i915(dev);
86 struct drm_property *prop; 86 struct drm_property *prop;
87 87
88 prop = dev_priv->force_audio_property; 88 prop = dev_priv->force_audio_property;
@@ -109,7 +109,7 @@ void
109intel_attach_broadcast_rgb_property(struct drm_connector *connector) 109intel_attach_broadcast_rgb_property(struct drm_connector *connector)
110{ 110{
111 struct drm_device *dev = connector->dev; 111 struct drm_device *dev = connector->dev;
112 struct drm_i915_private *dev_priv = dev->dev_private; 112 struct drm_i915_private *dev_priv = to_i915(dev);
113 struct drm_property *prop; 113 struct drm_property *prop;
114 114
115 prop = dev_priv->broadcast_rgb_property; 115 prop = dev_priv->broadcast_rgb_property;
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index eb93f90bb74d..e9887d9321a3 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1084,7 +1084,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
1084 struct drm_file *file_priv) 1084 struct drm_file *file_priv)
1085{ 1085{
1086 struct drm_intel_overlay_put_image *put_image_rec = data; 1086 struct drm_intel_overlay_put_image *put_image_rec = data;
1087 struct drm_i915_private *dev_priv = dev->dev_private; 1087 struct drm_i915_private *dev_priv = to_i915(dev);
1088 struct intel_overlay *overlay; 1088 struct intel_overlay *overlay;
1089 struct drm_crtc *drmmode_crtc; 1089 struct drm_crtc *drmmode_crtc;
1090 struct intel_crtc *crtc; 1090 struct intel_crtc *crtc;
@@ -1282,7 +1282,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
1282 struct drm_file *file_priv) 1282 struct drm_file *file_priv)
1283{ 1283{
1284 struct drm_intel_overlay_attrs *attrs = data; 1284 struct drm_intel_overlay_attrs *attrs = data;
1285 struct drm_i915_private *dev_priv = dev->dev_private; 1285 struct drm_i915_private *dev_priv = to_i915(dev);
1286 struct intel_overlay *overlay; 1286 struct intel_overlay *overlay;
1287 struct overlay_registers __iomem *regs; 1287 struct overlay_registers __iomem *regs;
1288 int ret; 1288 int ret;
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 3c0b97f0bfae..a8b473350597 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -377,7 +377,7 @@ out:
377enum drm_connector_status 377enum drm_connector_status
378intel_panel_detect(struct drm_device *dev) 378intel_panel_detect(struct drm_device *dev)
379{ 379{
380 struct drm_i915_private *dev_priv = dev->dev_private; 380 struct drm_i915_private *dev_priv = to_i915(dev);
381 381
382 /* Assume that the BIOS does not lie through the OpRegion... */ 382 /* Assume that the BIOS does not lie through the OpRegion... */
383 if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) { 383 if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) {
@@ -1142,7 +1142,7 @@ static int intel_backlight_device_get_brightness(struct backlight_device *bd)
1142{ 1142{
1143 struct intel_connector *connector = bl_get_data(bd); 1143 struct intel_connector *connector = bl_get_data(bd);
1144 struct drm_device *dev = connector->base.dev; 1144 struct drm_device *dev = connector->base.dev;
1145 struct drm_i915_private *dev_priv = dev->dev_private; 1145 struct drm_i915_private *dev_priv = to_i915(dev);
1146 u32 hw_level; 1146 u32 hw_level;
1147 int ret; 1147 int ret;
1148 1148
@@ -1316,7 +1316,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
1316static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz) 1316static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
1317{ 1317{
1318 struct drm_device *dev = connector->base.dev; 1318 struct drm_device *dev = connector->base.dev;
1319 struct drm_i915_private *dev_priv = dev->dev_private; 1319 struct drm_i915_private *dev_priv = to_i915(dev);
1320 int clock; 1320 int clock;
1321 1321
1322 if (IS_G4X(dev_priv)) 1322 if (IS_G4X(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 814b0dfaf640..0560b7c90244 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -57,7 +57,7 @@
57 57
58static void gen9_init_clock_gating(struct drm_device *dev) 58static void gen9_init_clock_gating(struct drm_device *dev)
59{ 59{
60 struct drm_i915_private *dev_priv = dev->dev_private; 60 struct drm_i915_private *dev_priv = to_i915(dev);
61 61
62 /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */ 62 /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
63 I915_WRITE(CHICKEN_PAR1_1, 63 I915_WRITE(CHICKEN_PAR1_1,
@@ -83,7 +83,7 @@ static void gen9_init_clock_gating(struct drm_device *dev)
83 83
84static void bxt_init_clock_gating(struct drm_device *dev) 84static void bxt_init_clock_gating(struct drm_device *dev)
85{ 85{
86 struct drm_i915_private *dev_priv = dev->dev_private; 86 struct drm_i915_private *dev_priv = to_i915(dev);
87 87
88 gen9_init_clock_gating(dev); 88 gen9_init_clock_gating(dev);
89 89
@@ -109,7 +109,7 @@ static void bxt_init_clock_gating(struct drm_device *dev)
109 109
110static void i915_pineview_get_mem_freq(struct drm_device *dev) 110static void i915_pineview_get_mem_freq(struct drm_device *dev)
111{ 111{
112 struct drm_i915_private *dev_priv = dev->dev_private; 112 struct drm_i915_private *dev_priv = to_i915(dev);
113 u32 tmp; 113 u32 tmp;
114 114
115 tmp = I915_READ(CLKCFG); 115 tmp = I915_READ(CLKCFG);
@@ -148,7 +148,7 @@ static void i915_pineview_get_mem_freq(struct drm_device *dev)
148 148
149static void i915_ironlake_get_mem_freq(struct drm_device *dev) 149static void i915_ironlake_get_mem_freq(struct drm_device *dev)
150{ 150{
151 struct drm_i915_private *dev_priv = dev->dev_private; 151 struct drm_i915_private *dev_priv = to_i915(dev);
152 u16 ddrpll, csipll; 152 u16 ddrpll, csipll;
153 153
154 ddrpll = I915_READ16(DDRMPLL1); 154 ddrpll = I915_READ16(DDRMPLL1);
@@ -375,7 +375,7 @@ static const int pessimal_latency_ns = 5000;
375static int vlv_get_fifo_size(struct drm_device *dev, 375static int vlv_get_fifo_size(struct drm_device *dev,
376 enum pipe pipe, int plane) 376 enum pipe pipe, int plane)
377{ 377{
378 struct drm_i915_private *dev_priv = dev->dev_private; 378 struct drm_i915_private *dev_priv = to_i915(dev);
379 int sprite0_start, sprite1_start, size; 379 int sprite0_start, sprite1_start, size;
380 380
381 switch (pipe) { 381 switch (pipe) {
@@ -426,7 +426,7 @@ static int vlv_get_fifo_size(struct drm_device *dev,
426 426
427static int i9xx_get_fifo_size(struct drm_device *dev, int plane) 427static int i9xx_get_fifo_size(struct drm_device *dev, int plane)
428{ 428{
429 struct drm_i915_private *dev_priv = dev->dev_private; 429 struct drm_i915_private *dev_priv = to_i915(dev);
430 uint32_t dsparb = I915_READ(DSPARB); 430 uint32_t dsparb = I915_READ(DSPARB);
431 int size; 431 int size;
432 432
@@ -442,7 +442,7 @@ static int i9xx_get_fifo_size(struct drm_device *dev, int plane)
442 442
443static int i830_get_fifo_size(struct drm_device *dev, int plane) 443static int i830_get_fifo_size(struct drm_device *dev, int plane)
444{ 444{
445 struct drm_i915_private *dev_priv = dev->dev_private; 445 struct drm_i915_private *dev_priv = to_i915(dev);
446 uint32_t dsparb = I915_READ(DSPARB); 446 uint32_t dsparb = I915_READ(DSPARB);
447 int size; 447 int size;
448 448
@@ -459,7 +459,7 @@ static int i830_get_fifo_size(struct drm_device *dev, int plane)
459 459
460static int i845_get_fifo_size(struct drm_device *dev, int plane) 460static int i845_get_fifo_size(struct drm_device *dev, int plane)
461{ 461{
462 struct drm_i915_private *dev_priv = dev->dev_private; 462 struct drm_i915_private *dev_priv = to_i915(dev);
463 uint32_t dsparb = I915_READ(DSPARB); 463 uint32_t dsparb = I915_READ(DSPARB);
464 int size; 464 int size;
465 465
@@ -637,7 +637,7 @@ static struct drm_crtc *single_enabled_crtc(struct drm_device *dev)
637static void pineview_update_wm(struct drm_crtc *unused_crtc) 637static void pineview_update_wm(struct drm_crtc *unused_crtc)
638{ 638{
639 struct drm_device *dev = unused_crtc->dev; 639 struct drm_device *dev = unused_crtc->dev;
640 struct drm_i915_private *dev_priv = dev->dev_private; 640 struct drm_i915_private *dev_priv = to_i915(dev);
641 struct drm_crtc *crtc; 641 struct drm_crtc *crtc;
642 const struct cxsr_latency *latency; 642 const struct cxsr_latency *latency;
643 u32 reg; 643 u32 reg;
@@ -934,7 +934,7 @@ static unsigned int vlv_wm_method2(unsigned int pixel_rate,
934 934
935static void vlv_setup_wm_latency(struct drm_device *dev) 935static void vlv_setup_wm_latency(struct drm_device *dev)
936{ 936{
937 struct drm_i915_private *dev_priv = dev->dev_private; 937 struct drm_i915_private *dev_priv = to_i915(dev);
938 938
939 /* all latencies in usec */ 939 /* all latencies in usec */
940 dev_priv->wm.pri_latency[VLV_WM_LEVEL_PM2] = 3; 940 dev_priv->wm.pri_latency[VLV_WM_LEVEL_PM2] = 3;
@@ -1325,7 +1325,7 @@ static void vlv_merge_wm(struct drm_device *dev,
1325static void vlv_update_wm(struct drm_crtc *crtc) 1325static void vlv_update_wm(struct drm_crtc *crtc)
1326{ 1326{
1327 struct drm_device *dev = crtc->dev; 1327 struct drm_device *dev = crtc->dev;
1328 struct drm_i915_private *dev_priv = dev->dev_private; 1328 struct drm_i915_private *dev_priv = to_i915(dev);
1329 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1329 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1330 enum pipe pipe = intel_crtc->pipe; 1330 enum pipe pipe = intel_crtc->pipe;
1331 struct vlv_wm_values wm = {}; 1331 struct vlv_wm_values wm = {};
@@ -1381,7 +1381,7 @@ static void g4x_update_wm(struct drm_crtc *crtc)
1381{ 1381{
1382 struct drm_device *dev = crtc->dev; 1382 struct drm_device *dev = crtc->dev;
1383 static const int sr_latency_ns = 12000; 1383 static const int sr_latency_ns = 12000;
1384 struct drm_i915_private *dev_priv = dev->dev_private; 1384 struct drm_i915_private *dev_priv = to_i915(dev);
1385 int planea_wm, planeb_wm, cursora_wm, cursorb_wm; 1385 int planea_wm, planeb_wm, cursora_wm, cursorb_wm;
1386 int plane_sr, cursor_sr; 1386 int plane_sr, cursor_sr;
1387 unsigned int enabled = 0; 1387 unsigned int enabled = 0;
@@ -1438,7 +1438,7 @@ static void g4x_update_wm(struct drm_crtc *crtc)
1438static void i965_update_wm(struct drm_crtc *unused_crtc) 1438static void i965_update_wm(struct drm_crtc *unused_crtc)
1439{ 1439{
1440 struct drm_device *dev = unused_crtc->dev; 1440 struct drm_device *dev = unused_crtc->dev;
1441 struct drm_i915_private *dev_priv = dev->dev_private; 1441 struct drm_i915_private *dev_priv = to_i915(dev);
1442 struct drm_crtc *crtc; 1442 struct drm_crtc *crtc;
1443 int srwm = 1; 1443 int srwm = 1;
1444 int cursor_sr = 16; 1444 int cursor_sr = 16;
@@ -1512,7 +1512,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc)
1512static void i9xx_update_wm(struct drm_crtc *unused_crtc) 1512static void i9xx_update_wm(struct drm_crtc *unused_crtc)
1513{ 1513{
1514 struct drm_device *dev = unused_crtc->dev; 1514 struct drm_device *dev = unused_crtc->dev;
1515 struct drm_i915_private *dev_priv = dev->dev_private; 1515 struct drm_i915_private *dev_priv = to_i915(dev);
1516 const struct intel_watermark_params *wm_info; 1516 const struct intel_watermark_params *wm_info;
1517 uint32_t fwater_lo; 1517 uint32_t fwater_lo;
1518 uint32_t fwater_hi; 1518 uint32_t fwater_hi;
@@ -1642,7 +1642,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
1642static void i845_update_wm(struct drm_crtc *unused_crtc) 1642static void i845_update_wm(struct drm_crtc *unused_crtc)
1643{ 1643{
1644 struct drm_device *dev = unused_crtc->dev; 1644 struct drm_device *dev = unused_crtc->dev;
1645 struct drm_i915_private *dev_priv = dev->dev_private; 1645 struct drm_i915_private *dev_priv = to_i915(dev);
1646 struct drm_crtc *crtc; 1646 struct drm_crtc *crtc;
1647 const struct drm_display_mode *adjusted_mode; 1647 const struct drm_display_mode *adjusted_mode;
1648 uint32_t fwater_lo; 1648 uint32_t fwater_lo;
@@ -2070,7 +2070,7 @@ hsw_compute_linetime_wm(const struct intel_crtc_state *cstate)
2070 2070
2071static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8]) 2071static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8])
2072{ 2072{
2073 struct drm_i915_private *dev_priv = dev->dev_private; 2073 struct drm_i915_private *dev_priv = to_i915(dev);
2074 2074
2075 if (IS_GEN9(dev)) { 2075 if (IS_GEN9(dev)) {
2076 uint32_t val; 2076 uint32_t val;
@@ -2250,7 +2250,7 @@ static bool ilk_increase_wm_latency(struct drm_i915_private *dev_priv,
2250 2250
2251static void snb_wm_latency_quirk(struct drm_device *dev) 2251static void snb_wm_latency_quirk(struct drm_device *dev)
2252{ 2252{
2253 struct drm_i915_private *dev_priv = dev->dev_private; 2253 struct drm_i915_private *dev_priv = to_i915(dev);
2254 bool changed; 2254 bool changed;
2255 2255
2256 /* 2256 /*
@@ -2272,7 +2272,7 @@ static void snb_wm_latency_quirk(struct drm_device *dev)
2272 2272
2273static void ilk_setup_wm_latency(struct drm_device *dev) 2273static void ilk_setup_wm_latency(struct drm_device *dev)
2274{ 2274{
2275 struct drm_i915_private *dev_priv = dev->dev_private; 2275 struct drm_i915_private *dev_priv = to_i915(dev);
2276 2276
2277 intel_read_wm_latency(dev, dev_priv->wm.pri_latency); 2277 intel_read_wm_latency(dev, dev_priv->wm.pri_latency);
2278 2278
@@ -2294,7 +2294,7 @@ static void ilk_setup_wm_latency(struct drm_device *dev)
2294 2294
2295static void skl_setup_wm_latency(struct drm_device *dev) 2295static void skl_setup_wm_latency(struct drm_device *dev)
2296{ 2296{
2297 struct drm_i915_private *dev_priv = dev->dev_private; 2297 struct drm_i915_private *dev_priv = to_i915(dev);
2298 2298
2299 intel_read_wm_latency(dev, dev_priv->wm.skl_latency); 2299 intel_read_wm_latency(dev, dev_priv->wm.skl_latency);
2300 intel_print_wm_latency(dev, "Gen9 Plane", dev_priv->wm.skl_latency); 2300 intel_print_wm_latency(dev, "Gen9 Plane", dev_priv->wm.skl_latency);
@@ -2330,7 +2330,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
2330 struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc); 2330 struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
2331 struct intel_pipe_wm *pipe_wm; 2331 struct intel_pipe_wm *pipe_wm;
2332 struct drm_device *dev = state->dev; 2332 struct drm_device *dev = state->dev;
2333 const struct drm_i915_private *dev_priv = dev->dev_private; 2333 const struct drm_i915_private *dev_priv = to_i915(dev);
2334 struct intel_plane *intel_plane; 2334 struct intel_plane *intel_plane;
2335 struct intel_plane_state *pristate = NULL; 2335 struct intel_plane_state *pristate = NULL;
2336 struct intel_plane_state *sprstate = NULL; 2336 struct intel_plane_state *sprstate = NULL;
@@ -2505,7 +2505,7 @@ static void ilk_wm_merge(struct drm_device *dev,
2505 const struct ilk_wm_maximums *max, 2505 const struct ilk_wm_maximums *max,
2506 struct intel_pipe_wm *merged) 2506 struct intel_pipe_wm *merged)
2507{ 2507{
2508 struct drm_i915_private *dev_priv = dev->dev_private; 2508 struct drm_i915_private *dev_priv = to_i915(dev);
2509 int level, max_level = ilk_wm_max_level(dev); 2509 int level, max_level = ilk_wm_max_level(dev);
2510 int last_enabled_level = max_level; 2510 int last_enabled_level = max_level;
2511 2511
@@ -2565,7 +2565,7 @@ static int ilk_wm_lp_to_level(int wm_lp, const struct intel_pipe_wm *pipe_wm)
2565/* The value we need to program into the WM_LPx latency field */ 2565/* The value we need to program into the WM_LPx latency field */
2566static unsigned int ilk_wm_lp_latency(struct drm_device *dev, int level) 2566static unsigned int ilk_wm_lp_latency(struct drm_device *dev, int level)
2567{ 2567{
2568 struct drm_i915_private *dev_priv = dev->dev_private; 2568 struct drm_i915_private *dev_priv = to_i915(dev);
2569 2569
2570 if (IS_HASWELL(dev) || IS_BROADWELL(dev)) 2570 if (IS_HASWELL(dev) || IS_BROADWELL(dev))
2571 return 2 * level; 2571 return 2 * level;
@@ -2840,7 +2840,7 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv,
2840 2840
2841bool ilk_disable_lp_wm(struct drm_device *dev) 2841bool ilk_disable_lp_wm(struct drm_device *dev)
2842{ 2842{
2843 struct drm_i915_private *dev_priv = dev->dev_private; 2843 struct drm_i915_private *dev_priv = to_i915(dev);
2844 2844
2845 return _ilk_disable_lp_wm(dev_priv, WM_DIRTY_LP_ALL); 2845 return _ilk_disable_lp_wm(dev_priv, WM_DIRTY_LP_ALL);
2846} 2846}
@@ -3595,7 +3595,7 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
3595 struct skl_pipe_wm *pipe_wm) 3595 struct skl_pipe_wm *pipe_wm)
3596{ 3596{
3597 struct drm_device *dev = cstate->base.crtc->dev; 3597 struct drm_device *dev = cstate->base.crtc->dev;
3598 const struct drm_i915_private *dev_priv = dev->dev_private; 3598 const struct drm_i915_private *dev_priv = to_i915(dev);
3599 int level, max_level = ilk_wm_max_level(dev); 3599 int level, max_level = ilk_wm_max_level(dev);
3600 int ret; 3600 int ret;
3601 3601
@@ -4015,7 +4015,7 @@ static void skl_update_wm(struct drm_crtc *crtc)
4015{ 4015{
4016 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4016 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4017 struct drm_device *dev = crtc->dev; 4017 struct drm_device *dev = crtc->dev;
4018 struct drm_i915_private *dev_priv = dev->dev_private; 4018 struct drm_i915_private *dev_priv = to_i915(dev);
4019 struct skl_wm_values *results = &dev_priv->wm.skl_results; 4019 struct skl_wm_values *results = &dev_priv->wm.skl_results;
4020 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); 4020 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
4021 struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal; 4021 struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal;
@@ -4158,7 +4158,7 @@ static void skl_pipe_wm_active_state(uint32_t val,
4158static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc) 4158static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
4159{ 4159{
4160 struct drm_device *dev = crtc->dev; 4160 struct drm_device *dev = crtc->dev;
4161 struct drm_i915_private *dev_priv = dev->dev_private; 4161 struct drm_i915_private *dev_priv = to_i915(dev);
4162 struct skl_wm_values *hw = &dev_priv->wm.skl_hw; 4162 struct skl_wm_values *hw = &dev_priv->wm.skl_hw;
4163 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4163 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4164 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); 4164 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
@@ -4212,7 +4212,7 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
4212 4212
4213void skl_wm_get_hw_state(struct drm_device *dev) 4213void skl_wm_get_hw_state(struct drm_device *dev)
4214{ 4214{
4215 struct drm_i915_private *dev_priv = dev->dev_private; 4215 struct drm_i915_private *dev_priv = to_i915(dev);
4216 struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb; 4216 struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb;
4217 struct drm_crtc *crtc; 4217 struct drm_crtc *crtc;
4218 4218
@@ -4232,7 +4232,7 @@ void skl_wm_get_hw_state(struct drm_device *dev)
4232static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) 4232static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
4233{ 4233{
4234 struct drm_device *dev = crtc->dev; 4234 struct drm_device *dev = crtc->dev;
4235 struct drm_i915_private *dev_priv = dev->dev_private; 4235 struct drm_i915_private *dev_priv = to_i915(dev);
4236 struct ilk_wm_values *hw = &dev_priv->wm.hw; 4236 struct ilk_wm_values *hw = &dev_priv->wm.hw;
4237 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 4237 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
4238 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); 4238 struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
@@ -4436,7 +4436,7 @@ void vlv_wm_get_hw_state(struct drm_device *dev)
4436 4436
4437void ilk_wm_get_hw_state(struct drm_device *dev) 4437void ilk_wm_get_hw_state(struct drm_device *dev)
4438{ 4438{
4439 struct drm_i915_private *dev_priv = dev->dev_private; 4439 struct drm_i915_private *dev_priv = to_i915(dev);
4440 struct ilk_wm_values *hw = &dev_priv->wm.hw; 4440 struct ilk_wm_values *hw = &dev_priv->wm.hw;
4441 struct drm_crtc *crtc; 4441 struct drm_crtc *crtc;
4442 4442
@@ -4498,7 +4498,7 @@ void ilk_wm_get_hw_state(struct drm_device *dev)
4498 */ 4498 */
4499void intel_update_watermarks(struct drm_crtc *crtc) 4499void intel_update_watermarks(struct drm_crtc *crtc)
4500{ 4500{
4501 struct drm_i915_private *dev_priv = crtc->dev->dev_private; 4501 struct drm_i915_private *dev_priv = to_i915(crtc->dev);
4502 4502
4503 if (dev_priv->display.update_wm) 4503 if (dev_priv->display.update_wm)
4504 dev_priv->display.update_wm(crtc); 4504 dev_priv->display.update_wm(crtc);
@@ -6713,7 +6713,7 @@ void intel_reset_gt_powersave(struct drm_i915_private *dev_priv)
6713 6713
6714static void ibx_init_clock_gating(struct drm_device *dev) 6714static void ibx_init_clock_gating(struct drm_device *dev)
6715{ 6715{
6716 struct drm_i915_private *dev_priv = dev->dev_private; 6716 struct drm_i915_private *dev_priv = to_i915(dev);
6717 6717
6718 /* 6718 /*
6719 * On Ibex Peak and Cougar Point, we need to disable clock 6719 * On Ibex Peak and Cougar Point, we need to disable clock
@@ -6725,7 +6725,7 @@ static void ibx_init_clock_gating(struct drm_device *dev)
6725 6725
6726static void g4x_disable_trickle_feed(struct drm_device *dev) 6726static void g4x_disable_trickle_feed(struct drm_device *dev)
6727{ 6727{
6728 struct drm_i915_private *dev_priv = dev->dev_private; 6728 struct drm_i915_private *dev_priv = to_i915(dev);
6729 enum pipe pipe; 6729 enum pipe pipe;
6730 6730
6731 for_each_pipe(dev_priv, pipe) { 6731 for_each_pipe(dev_priv, pipe) {
@@ -6740,7 +6740,7 @@ static void g4x_disable_trickle_feed(struct drm_device *dev)
6740 6740
6741static void ilk_init_lp_watermarks(struct drm_device *dev) 6741static void ilk_init_lp_watermarks(struct drm_device *dev)
6742{ 6742{
6743 struct drm_i915_private *dev_priv = dev->dev_private; 6743 struct drm_i915_private *dev_priv = to_i915(dev);
6744 6744
6745 I915_WRITE(WM3_LP_ILK, I915_READ(WM3_LP_ILK) & ~WM1_LP_SR_EN); 6745 I915_WRITE(WM3_LP_ILK, I915_READ(WM3_LP_ILK) & ~WM1_LP_SR_EN);
6746 I915_WRITE(WM2_LP_ILK, I915_READ(WM2_LP_ILK) & ~WM1_LP_SR_EN); 6746 I915_WRITE(WM2_LP_ILK, I915_READ(WM2_LP_ILK) & ~WM1_LP_SR_EN);
@@ -6754,7 +6754,7 @@ static void ilk_init_lp_watermarks(struct drm_device *dev)
6754 6754
6755static void ironlake_init_clock_gating(struct drm_device *dev) 6755static void ironlake_init_clock_gating(struct drm_device *dev)
6756{ 6756{
6757 struct drm_i915_private *dev_priv = dev->dev_private; 6757 struct drm_i915_private *dev_priv = to_i915(dev);
6758 uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE; 6758 uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE;
6759 6759
6760 /* 6760 /*
@@ -6828,7 +6828,7 @@ static void ironlake_init_clock_gating(struct drm_device *dev)
6828 6828
6829static void cpt_init_clock_gating(struct drm_device *dev) 6829static void cpt_init_clock_gating(struct drm_device *dev)
6830{ 6830{
6831 struct drm_i915_private *dev_priv = dev->dev_private; 6831 struct drm_i915_private *dev_priv = to_i915(dev);
6832 int pipe; 6832 int pipe;
6833 uint32_t val; 6833 uint32_t val;
6834 6834
@@ -6865,7 +6865,7 @@ static void cpt_init_clock_gating(struct drm_device *dev)
6865 6865
6866static void gen6_check_mch_setup(struct drm_device *dev) 6866static void gen6_check_mch_setup(struct drm_device *dev)
6867{ 6867{
6868 struct drm_i915_private *dev_priv = dev->dev_private; 6868 struct drm_i915_private *dev_priv = to_i915(dev);
6869 uint32_t tmp; 6869 uint32_t tmp;
6870 6870
6871 tmp = I915_READ(MCH_SSKPD); 6871 tmp = I915_READ(MCH_SSKPD);
@@ -6876,7 +6876,7 @@ static void gen6_check_mch_setup(struct drm_device *dev)
6876 6876
6877static void gen6_init_clock_gating(struct drm_device *dev) 6877static void gen6_init_clock_gating(struct drm_device *dev)
6878{ 6878{
6879 struct drm_i915_private *dev_priv = dev->dev_private; 6879 struct drm_i915_private *dev_priv = to_i915(dev);
6880 uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE; 6880 uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE;
6881 6881
6882 I915_WRITE(ILK_DSPCLK_GATE_D, dspclk_gate); 6882 I915_WRITE(ILK_DSPCLK_GATE_D, dspclk_gate);
@@ -6991,7 +6991,7 @@ static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)
6991 6991
6992static void lpt_init_clock_gating(struct drm_device *dev) 6992static void lpt_init_clock_gating(struct drm_device *dev)
6993{ 6993{
6994 struct drm_i915_private *dev_priv = dev->dev_private; 6994 struct drm_i915_private *dev_priv = to_i915(dev);
6995 6995
6996 /* 6996 /*
6997 * TODO: this bit should only be enabled when really needed, then 6997 * TODO: this bit should only be enabled when really needed, then
@@ -7010,7 +7010,7 @@ static void lpt_init_clock_gating(struct drm_device *dev)
7010 7010
7011static void lpt_suspend_hw(struct drm_device *dev) 7011static void lpt_suspend_hw(struct drm_device *dev)
7012{ 7012{
7013 struct drm_i915_private *dev_priv = dev->dev_private; 7013 struct drm_i915_private *dev_priv = to_i915(dev);
7014 7014
7015 if (HAS_PCH_LPT_LP(dev)) { 7015 if (HAS_PCH_LPT_LP(dev)) {
7016 uint32_t val = I915_READ(SOUTH_DSPCLK_GATE_D); 7016 uint32_t val = I915_READ(SOUTH_DSPCLK_GATE_D);
@@ -7045,7 +7045,7 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
7045 7045
7046static void kabylake_init_clock_gating(struct drm_device *dev) 7046static void kabylake_init_clock_gating(struct drm_device *dev)
7047{ 7047{
7048 struct drm_i915_private *dev_priv = dev->dev_private; 7048 struct drm_i915_private *dev_priv = to_i915(dev);
7049 7049
7050 gen9_init_clock_gating(dev); 7050 gen9_init_clock_gating(dev);
7051 7051
@@ -7066,7 +7066,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
7066 7066
7067static void skylake_init_clock_gating(struct drm_device *dev) 7067static void skylake_init_clock_gating(struct drm_device *dev)
7068{ 7068{
7069 struct drm_i915_private *dev_priv = dev->dev_private; 7069 struct drm_i915_private *dev_priv = to_i915(dev);
7070 7070
7071 gen9_init_clock_gating(dev); 7071 gen9_init_clock_gating(dev);
7072 7072
@@ -7081,7 +7081,7 @@ static void skylake_init_clock_gating(struct drm_device *dev)
7081 7081
7082static void broadwell_init_clock_gating(struct drm_device *dev) 7082static void broadwell_init_clock_gating(struct drm_device *dev)
7083{ 7083{
7084 struct drm_i915_private *dev_priv = dev->dev_private; 7084 struct drm_i915_private *dev_priv = to_i915(dev);
7085 enum pipe pipe; 7085 enum pipe pipe;
7086 7086
7087 ilk_init_lp_watermarks(dev); 7087 ilk_init_lp_watermarks(dev);
@@ -7132,7 +7132,7 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
7132 7132
7133static void haswell_init_clock_gating(struct drm_device *dev) 7133static void haswell_init_clock_gating(struct drm_device *dev)
7134{ 7134{
7135 struct drm_i915_private *dev_priv = dev->dev_private; 7135 struct drm_i915_private *dev_priv = to_i915(dev);
7136 7136
7137 ilk_init_lp_watermarks(dev); 7137 ilk_init_lp_watermarks(dev);
7138 7138
@@ -7188,7 +7188,7 @@ static void haswell_init_clock_gating(struct drm_device *dev)
7188 7188
7189static void ivybridge_init_clock_gating(struct drm_device *dev) 7189static void ivybridge_init_clock_gating(struct drm_device *dev)
7190{ 7190{
7191 struct drm_i915_private *dev_priv = dev->dev_private; 7191 struct drm_i915_private *dev_priv = to_i915(dev);
7192 uint32_t snpcr; 7192 uint32_t snpcr;
7193 7193
7194 ilk_init_lp_watermarks(dev); 7194 ilk_init_lp_watermarks(dev);
@@ -7286,7 +7286,7 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
7286 7286
7287static void valleyview_init_clock_gating(struct drm_device *dev) 7287static void valleyview_init_clock_gating(struct drm_device *dev)
7288{ 7288{
7289 struct drm_i915_private *dev_priv = dev->dev_private; 7289 struct drm_i915_private *dev_priv = to_i915(dev);
7290 7290
7291 /* WaDisableEarlyCull:vlv */ 7291 /* WaDisableEarlyCull:vlv */
7292 I915_WRITE(_3D_CHICKEN3, 7292 I915_WRITE(_3D_CHICKEN3,
@@ -7368,7 +7368,7 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
7368 7368
7369static void cherryview_init_clock_gating(struct drm_device *dev) 7369static void cherryview_init_clock_gating(struct drm_device *dev)
7370{ 7370{
7371 struct drm_i915_private *dev_priv = dev->dev_private; 7371 struct drm_i915_private *dev_priv = to_i915(dev);
7372 7372
7373 /* WaVSRefCountFullforceMissDisable:chv */ 7373 /* WaVSRefCountFullforceMissDisable:chv */
7374 /* WaDSRefCountFullforceMissDisable:chv */ 7374 /* WaDSRefCountFullforceMissDisable:chv */
@@ -7404,7 +7404,7 @@ static void cherryview_init_clock_gating(struct drm_device *dev)
7404 7404
7405static void g4x_init_clock_gating(struct drm_device *dev) 7405static void g4x_init_clock_gating(struct drm_device *dev)
7406{ 7406{
7407 struct drm_i915_private *dev_priv = dev->dev_private; 7407 struct drm_i915_private *dev_priv = to_i915(dev);
7408 uint32_t dspclk_gate; 7408 uint32_t dspclk_gate;
7409 7409
7410 I915_WRITE(RENCLK_GATE_D1, 0); 7410 I915_WRITE(RENCLK_GATE_D1, 0);
@@ -7431,7 +7431,7 @@ static void g4x_init_clock_gating(struct drm_device *dev)
7431 7431
7432static void crestline_init_clock_gating(struct drm_device *dev) 7432static void crestline_init_clock_gating(struct drm_device *dev)
7433{ 7433{
7434 struct drm_i915_private *dev_priv = dev->dev_private; 7434 struct drm_i915_private *dev_priv = to_i915(dev);
7435 7435
7436 I915_WRITE(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE); 7436 I915_WRITE(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
7437 I915_WRITE(RENCLK_GATE_D2, 0); 7437 I915_WRITE(RENCLK_GATE_D2, 0);
@@ -7447,7 +7447,7 @@ static void crestline_init_clock_gating(struct drm_device *dev)
7447 7447
7448static void broadwater_init_clock_gating(struct drm_device *dev) 7448static void broadwater_init_clock_gating(struct drm_device *dev)
7449{ 7449{
7450 struct drm_i915_private *dev_priv = dev->dev_private; 7450 struct drm_i915_private *dev_priv = to_i915(dev);
7451 7451
7452 I915_WRITE(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE | 7452 I915_WRITE(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
7453 I965_RCC_CLOCK_GATE_DISABLE | 7453 I965_RCC_CLOCK_GATE_DISABLE |
@@ -7464,7 +7464,7 @@ static void broadwater_init_clock_gating(struct drm_device *dev)
7464 7464
7465static void gen3_init_clock_gating(struct drm_device *dev) 7465static void gen3_init_clock_gating(struct drm_device *dev)
7466{ 7466{
7467 struct drm_i915_private *dev_priv = dev->dev_private; 7467 struct drm_i915_private *dev_priv = to_i915(dev);
7468 u32 dstate = I915_READ(D_STATE); 7468 u32 dstate = I915_READ(D_STATE);
7469 7469
7470 dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING | 7470 dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |
@@ -7489,7 +7489,7 @@ static void gen3_init_clock_gating(struct drm_device *dev)
7489 7489
7490static void i85x_init_clock_gating(struct drm_device *dev) 7490static void i85x_init_clock_gating(struct drm_device *dev)
7491{ 7491{
7492 struct drm_i915_private *dev_priv = dev->dev_private; 7492 struct drm_i915_private *dev_priv = to_i915(dev);
7493 7493
7494 I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE); 7494 I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
7495 7495
@@ -7503,7 +7503,7 @@ static void i85x_init_clock_gating(struct drm_device *dev)
7503 7503
7504static void i830_init_clock_gating(struct drm_device *dev) 7504static void i830_init_clock_gating(struct drm_device *dev)
7505{ 7505{
7506 struct drm_i915_private *dev_priv = dev->dev_private; 7506 struct drm_i915_private *dev_priv = to_i915(dev);
7507 7507
7508 I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE); 7508 I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
7509 7509
@@ -7514,7 +7514,7 @@ static void i830_init_clock_gating(struct drm_device *dev)
7514 7514
7515void intel_init_clock_gating(struct drm_device *dev) 7515void intel_init_clock_gating(struct drm_device *dev)
7516{ 7516{
7517 struct drm_i915_private *dev_priv = dev->dev_private; 7517 struct drm_i915_private *dev_priv = to_i915(dev);
7518 7518
7519 dev_priv->display.init_clock_gating(dev); 7519 dev_priv->display.init_clock_gating(dev);
7520} 7520}
@@ -7582,7 +7582,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
7582/* Set up chip specific power management-related functions */ 7582/* Set up chip specific power management-related functions */
7583void intel_init_pm(struct drm_device *dev) 7583void intel_init_pm(struct drm_device *dev)
7584{ 7584{
7585 struct drm_i915_private *dev_priv = dev->dev_private; 7585 struct drm_i915_private *dev_priv = to_i915(dev);
7586 7586
7587 intel_fbc_init(dev_priv); 7587 intel_fbc_init(dev_priv);
7588 7588
@@ -7812,7 +7812,7 @@ void intel_queue_rps_boost_for_request(struct drm_i915_gem_request *req)
7812 7812
7813void intel_pm_setup(struct drm_device *dev) 7813void intel_pm_setup(struct drm_device *dev)
7814{ 7814{
7815 struct drm_i915_private *dev_priv = dev->dev_private; 7815 struct drm_i915_private *dev_priv = to_i915(dev);
7816 7816
7817 mutex_init(&dev_priv->rps.hw_lock); 7817 mutex_init(&dev_priv->rps.hw_lock);
7818 spin_lock_init(&dev_priv->rps.client_lock); 7818 spin_lock_init(&dev_priv->rps.client_lock);
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 8d25c45aa6fe..68bd0bb34817 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -63,7 +63,7 @@ static bool is_edp_psr(struct intel_dp *intel_dp)
63 63
64static bool vlv_is_psr_active_on_pipe(struct drm_device *dev, int pipe) 64static bool vlv_is_psr_active_on_pipe(struct drm_device *dev, int pipe)
65{ 65{
66 struct drm_i915_private *dev_priv = dev->dev_private; 66 struct drm_i915_private *dev_priv = to_i915(dev);
67 uint32_t val; 67 uint32_t val;
68 68
69 val = I915_READ(VLV_PSRSTAT(pipe)) & 69 val = I915_READ(VLV_PSRSTAT(pipe)) &
@@ -77,7 +77,7 @@ static void intel_psr_write_vsc(struct intel_dp *intel_dp,
77{ 77{
78 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 78 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
79 struct drm_device *dev = dig_port->base.base.dev; 79 struct drm_device *dev = dig_port->base.base.dev;
80 struct drm_i915_private *dev_priv = dev->dev_private; 80 struct drm_i915_private *dev_priv = to_i915(dev);
81 struct intel_crtc *crtc = to_intel_crtc(dig_port->base.base.crtc); 81 struct intel_crtc *crtc = to_intel_crtc(dig_port->base.base.crtc);
82 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; 82 enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
83 i915_reg_t ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder); 83 i915_reg_t ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder);
@@ -107,7 +107,7 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)
107{ 107{
108 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 108 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
109 struct drm_device *dev = intel_dig_port->base.base.dev; 109 struct drm_device *dev = intel_dig_port->base.base.dev;
110 struct drm_i915_private *dev_priv = dev->dev_private; 110 struct drm_i915_private *dev_priv = to_i915(dev);
111 struct drm_crtc *crtc = intel_dig_port->base.base.crtc; 111 struct drm_crtc *crtc = intel_dig_port->base.base.crtc;
112 enum pipe pipe = to_intel_crtc(crtc)->pipe; 112 enum pipe pipe = to_intel_crtc(crtc)->pipe;
113 uint32_t val; 113 uint32_t val;
@@ -173,7 +173,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
173{ 173{
174 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 174 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
175 struct drm_device *dev = dig_port->base.base.dev; 175 struct drm_device *dev = dig_port->base.base.dev;
176 struct drm_i915_private *dev_priv = dev->dev_private; 176 struct drm_i915_private *dev_priv = to_i915(dev);
177 uint32_t aux_clock_divider; 177 uint32_t aux_clock_divider;
178 i915_reg_t aux_ctl_reg; 178 i915_reg_t aux_ctl_reg;
179 static const uint8_t aux_msg[] = { 179 static const uint8_t aux_msg[] = {
@@ -220,7 +220,7 @@ static void vlv_psr_enable_source(struct intel_dp *intel_dp)
220{ 220{
221 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 221 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
222 struct drm_device *dev = dig_port->base.base.dev; 222 struct drm_device *dev = dig_port->base.base.dev;
223 struct drm_i915_private *dev_priv = dev->dev_private; 223 struct drm_i915_private *dev_priv = to_i915(dev);
224 struct drm_crtc *crtc = dig_port->base.base.crtc; 224 struct drm_crtc *crtc = dig_port->base.base.crtc;
225 enum pipe pipe = to_intel_crtc(crtc)->pipe; 225 enum pipe pipe = to_intel_crtc(crtc)->pipe;
226 226
@@ -235,7 +235,7 @@ static void vlv_psr_activate(struct intel_dp *intel_dp)
235{ 235{
236 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 236 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
237 struct drm_device *dev = dig_port->base.base.dev; 237 struct drm_device *dev = dig_port->base.base.dev;
238 struct drm_i915_private *dev_priv = dev->dev_private; 238 struct drm_i915_private *dev_priv = to_i915(dev);
239 struct drm_crtc *crtc = dig_port->base.base.crtc; 239 struct drm_crtc *crtc = dig_port->base.base.crtc;
240 enum pipe pipe = to_intel_crtc(crtc)->pipe; 240 enum pipe pipe = to_intel_crtc(crtc)->pipe;
241 241
@@ -252,7 +252,7 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)
252{ 252{
253 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 253 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
254 struct drm_device *dev = dig_port->base.base.dev; 254 struct drm_device *dev = dig_port->base.base.dev;
255 struct drm_i915_private *dev_priv = dev->dev_private; 255 struct drm_i915_private *dev_priv = to_i915(dev);
256 256
257 uint32_t max_sleep_time = 0x1f; 257 uint32_t max_sleep_time = 0x1f;
258 /* Lately it was identified that depending on panel idle frame count 258 /* Lately it was identified that depending on panel idle frame count
@@ -324,7 +324,7 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
324{ 324{
325 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 325 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
326 struct drm_device *dev = dig_port->base.base.dev; 326 struct drm_device *dev = dig_port->base.base.dev;
327 struct drm_i915_private *dev_priv = dev->dev_private; 327 struct drm_i915_private *dev_priv = to_i915(dev);
328 struct drm_crtc *crtc = dig_port->base.base.crtc; 328 struct drm_crtc *crtc = dig_port->base.base.crtc;
329 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 329 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
330 330
@@ -378,7 +378,7 @@ static void intel_psr_activate(struct intel_dp *intel_dp)
378{ 378{
379 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 379 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
380 struct drm_device *dev = intel_dig_port->base.base.dev; 380 struct drm_device *dev = intel_dig_port->base.base.dev;
381 struct drm_i915_private *dev_priv = dev->dev_private; 381 struct drm_i915_private *dev_priv = to_i915(dev);
382 382
383 WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE); 383 WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE);
384 WARN_ON(dev_priv->psr.active); 384 WARN_ON(dev_priv->psr.active);
@@ -407,7 +407,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
407{ 407{
408 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 408 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
409 struct drm_device *dev = intel_dig_port->base.base.dev; 409 struct drm_device *dev = intel_dig_port->base.base.dev;
410 struct drm_i915_private *dev_priv = dev->dev_private; 410 struct drm_i915_private *dev_priv = to_i915(dev);
411 struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc); 411 struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
412 412
413 if (!HAS_PSR(dev)) { 413 if (!HAS_PSR(dev)) {
@@ -494,7 +494,7 @@ static void vlv_psr_disable(struct intel_dp *intel_dp)
494{ 494{
495 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 495 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
496 struct drm_device *dev = intel_dig_port->base.base.dev; 496 struct drm_device *dev = intel_dig_port->base.base.dev;
497 struct drm_i915_private *dev_priv = dev->dev_private; 497 struct drm_i915_private *dev_priv = to_i915(dev);
498 struct intel_crtc *intel_crtc = 498 struct intel_crtc *intel_crtc =
499 to_intel_crtc(intel_dig_port->base.base.crtc); 499 to_intel_crtc(intel_dig_port->base.base.crtc);
500 uint32_t val; 500 uint32_t val;
@@ -524,7 +524,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)
524{ 524{
525 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 525 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
526 struct drm_device *dev = intel_dig_port->base.base.dev; 526 struct drm_device *dev = intel_dig_port->base.base.dev;
527 struct drm_i915_private *dev_priv = dev->dev_private; 527 struct drm_i915_private *dev_priv = to_i915(dev);
528 528
529 if (dev_priv->psr.active) { 529 if (dev_priv->psr.active) {
530 I915_WRITE(EDP_PSR_CTL, 530 I915_WRITE(EDP_PSR_CTL,
@@ -554,7 +554,7 @@ void intel_psr_disable(struct intel_dp *intel_dp)
554{ 554{
555 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); 555 struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
556 struct drm_device *dev = intel_dig_port->base.base.dev; 556 struct drm_device *dev = intel_dig_port->base.base.dev;
557 struct drm_i915_private *dev_priv = dev->dev_private; 557 struct drm_i915_private *dev_priv = to_i915(dev);
558 558
559 mutex_lock(&dev_priv->psr.lock); 559 mutex_lock(&dev_priv->psr.lock);
560 if (!dev_priv->psr.enabled) { 560 if (!dev_priv->psr.enabled) {
@@ -630,7 +630,7 @@ unlock:
630 630
631static void intel_psr_exit(struct drm_device *dev) 631static void intel_psr_exit(struct drm_device *dev)
632{ 632{
633 struct drm_i915_private *dev_priv = dev->dev_private; 633 struct drm_i915_private *dev_priv = to_i915(dev);
634 struct intel_dp *intel_dp = dev_priv->psr.enabled; 634 struct intel_dp *intel_dp = dev_priv->psr.enabled;
635 struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc; 635 struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
636 enum pipe pipe = to_intel_crtc(crtc)->pipe; 636 enum pipe pipe = to_intel_crtc(crtc)->pipe;
@@ -685,7 +685,7 @@ static void intel_psr_exit(struct drm_device *dev)
685void intel_psr_single_frame_update(struct drm_device *dev, 685void intel_psr_single_frame_update(struct drm_device *dev,
686 unsigned frontbuffer_bits) 686 unsigned frontbuffer_bits)
687{ 687{
688 struct drm_i915_private *dev_priv = dev->dev_private; 688 struct drm_i915_private *dev_priv = to_i915(dev);
689 struct drm_crtc *crtc; 689 struct drm_crtc *crtc;
690 enum pipe pipe; 690 enum pipe pipe;
691 u32 val; 691 u32 val;
@@ -733,7 +733,7 @@ void intel_psr_single_frame_update(struct drm_device *dev,
733void intel_psr_invalidate(struct drm_device *dev, 733void intel_psr_invalidate(struct drm_device *dev,
734 unsigned frontbuffer_bits) 734 unsigned frontbuffer_bits)
735{ 735{
736 struct drm_i915_private *dev_priv = dev->dev_private; 736 struct drm_i915_private *dev_priv = to_i915(dev);
737 struct drm_crtc *crtc; 737 struct drm_crtc *crtc;
738 enum pipe pipe; 738 enum pipe pipe;
739 739
@@ -771,7 +771,7 @@ void intel_psr_invalidate(struct drm_device *dev,
771void intel_psr_flush(struct drm_device *dev, 771void intel_psr_flush(struct drm_device *dev,
772 unsigned frontbuffer_bits, enum fb_op_origin origin) 772 unsigned frontbuffer_bits, enum fb_op_origin origin)
773{ 773{
774 struct drm_i915_private *dev_priv = dev->dev_private; 774 struct drm_i915_private *dev_priv = to_i915(dev);
775 struct drm_crtc *crtc; 775 struct drm_crtc *crtc;
776 enum pipe pipe; 776 enum pipe pipe;
777 777
@@ -807,7 +807,7 @@ void intel_psr_flush(struct drm_device *dev,
807 */ 807 */
808void intel_psr_init(struct drm_device *dev) 808void intel_psr_init(struct drm_device *dev)
809{ 809{
810 struct drm_i915_private *dev_priv = dev->dev_private; 810 struct drm_i915_private *dev_priv = to_i915(dev);
811 811
812 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ? 812 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
813 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE; 813 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 3fafc35d99c1..428ed62dc5de 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2837,7 +2837,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,
2837 2837
2838int intel_init_render_ring_buffer(struct drm_device *dev) 2838int intel_init_render_ring_buffer(struct drm_device *dev)
2839{ 2839{
2840 struct drm_i915_private *dev_priv = dev->dev_private; 2840 struct drm_i915_private *dev_priv = to_i915(dev);
2841 struct intel_engine_cs *engine = &dev_priv->engine[RCS]; 2841 struct intel_engine_cs *engine = &dev_priv->engine[RCS];
2842 int ret; 2842 int ret;
2843 2843
@@ -2899,7 +2899,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
2899 2899
2900int intel_init_bsd_ring_buffer(struct drm_device *dev) 2900int intel_init_bsd_ring_buffer(struct drm_device *dev)
2901{ 2901{
2902 struct drm_i915_private *dev_priv = dev->dev_private; 2902 struct drm_i915_private *dev_priv = to_i915(dev);
2903 struct intel_engine_cs *engine = &dev_priv->engine[VCS]; 2903 struct intel_engine_cs *engine = &dev_priv->engine[VCS];
2904 2904
2905 engine->name = "bsd ring"; 2905 engine->name = "bsd ring";
@@ -2937,7 +2937,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
2937 */ 2937 */
2938int intel_init_bsd2_ring_buffer(struct drm_device *dev) 2938int intel_init_bsd2_ring_buffer(struct drm_device *dev)
2939{ 2939{
2940 struct drm_i915_private *dev_priv = dev->dev_private; 2940 struct drm_i915_private *dev_priv = to_i915(dev);
2941 struct intel_engine_cs *engine = &dev_priv->engine[VCS2]; 2941 struct intel_engine_cs *engine = &dev_priv->engine[VCS2];
2942 2942
2943 engine->name = "bsd2 ring"; 2943 engine->name = "bsd2 ring";
@@ -2957,7 +2957,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)
2957 2957
2958int intel_init_blt_ring_buffer(struct drm_device *dev) 2958int intel_init_blt_ring_buffer(struct drm_device *dev)
2959{ 2959{
2960 struct drm_i915_private *dev_priv = dev->dev_private; 2960 struct drm_i915_private *dev_priv = to_i915(dev);
2961 struct intel_engine_cs *engine = &dev_priv->engine[BCS]; 2961 struct intel_engine_cs *engine = &dev_priv->engine[BCS];
2962 2962
2963 engine->name = "blitter ring"; 2963 engine->name = "blitter ring";
@@ -2980,7 +2980,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
2980 2980
2981int intel_init_vebox_ring_buffer(struct drm_device *dev) 2981int intel_init_vebox_ring_buffer(struct drm_device *dev)
2982{ 2982{
2983 struct drm_i915_private *dev_priv = dev->dev_private; 2983 struct drm_i915_private *dev_priv = to_i915(dev);
2984 struct intel_engine_cs *engine = &dev_priv->engine[VECS]; 2984 struct intel_engine_cs *engine = &dev_priv->engine[VECS];
2985 2985
2986 engine->name = "video enhancement ring"; 2986 engine->name = "video enhancement ring";
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index ba28f5141687..321121e8fa2c 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -240,7 +240,7 @@ intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
240static void intel_sdvo_write_sdvox(struct intel_sdvo *intel_sdvo, u32 val) 240static void intel_sdvo_write_sdvox(struct intel_sdvo *intel_sdvo, u32 val)
241{ 241{
242 struct drm_device *dev = intel_sdvo->base.base.dev; 242 struct drm_device *dev = intel_sdvo->base.base.dev;
243 struct drm_i915_private *dev_priv = dev->dev_private; 243 struct drm_i915_private *dev_priv = to_i915(dev);
244 u32 bval = val, cval = val; 244 u32 bval = val, cval = val;
245 int i; 245 int i;
246 246
@@ -1195,7 +1195,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
1195static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder) 1195static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)
1196{ 1196{
1197 struct drm_device *dev = intel_encoder->base.dev; 1197 struct drm_device *dev = intel_encoder->base.dev;
1198 struct drm_i915_private *dev_priv = dev->dev_private; 1198 struct drm_i915_private *dev_priv = to_i915(dev);
1199 struct intel_crtc *crtc = to_intel_crtc(intel_encoder->base.crtc); 1199 struct intel_crtc *crtc = to_intel_crtc(intel_encoder->base.crtc);
1200 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; 1200 const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
1201 struct drm_display_mode *mode = &crtc->config->base.mode; 1201 struct drm_display_mode *mode = &crtc->config->base.mode;
@@ -1330,7 +1330,7 @@ static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder,
1330 enum pipe *pipe) 1330 enum pipe *pipe)
1331{ 1331{
1332 struct drm_device *dev = encoder->base.dev; 1332 struct drm_device *dev = encoder->base.dev;
1333 struct drm_i915_private *dev_priv = dev->dev_private; 1333 struct drm_i915_private *dev_priv = to_i915(dev);
1334 struct intel_sdvo *intel_sdvo = to_sdvo(encoder); 1334 struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
1335 u16 active_outputs = 0; 1335 u16 active_outputs = 0;
1336 u32 tmp; 1336 u32 tmp;
@@ -1353,7 +1353,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
1353 struct intel_crtc_state *pipe_config) 1353 struct intel_crtc_state *pipe_config)
1354{ 1354{
1355 struct drm_device *dev = encoder->base.dev; 1355 struct drm_device *dev = encoder->base.dev;
1356 struct drm_i915_private *dev_priv = dev->dev_private; 1356 struct drm_i915_private *dev_priv = to_i915(dev);
1357 struct intel_sdvo *intel_sdvo = to_sdvo(encoder); 1357 struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
1358 struct intel_sdvo_dtd dtd; 1358 struct intel_sdvo_dtd dtd;
1359 int encoder_pixel_multiplier = 0; 1359 int encoder_pixel_multiplier = 0;
@@ -1436,7 +1436,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
1436 1436
1437static void intel_disable_sdvo(struct intel_encoder *encoder) 1437static void intel_disable_sdvo(struct intel_encoder *encoder)
1438{ 1438{
1439 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; 1439 struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
1440 struct intel_sdvo *intel_sdvo = to_sdvo(encoder); 1440 struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
1441 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); 1441 struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
1442 u32 temp; 1442 u32 temp;
@@ -1489,7 +1489,7 @@ static void pch_post_disable_sdvo(struct intel_encoder *encoder)
1489static void intel_enable_sdvo(struct intel_encoder *encoder) 1489static void intel_enable_sdvo(struct intel_encoder *encoder)
1490{ 1490{
1491 struct drm_device *dev = encoder->base.dev; 1491 struct drm_device *dev = encoder->base.dev;
1492 struct drm_i915_private *dev_priv = dev->dev_private; 1492 struct drm_i915_private *dev_priv = to_i915(dev);
1493 struct intel_sdvo *intel_sdvo = to_sdvo(encoder); 1493 struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
1494 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 1494 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
1495 u32 temp; 1495 u32 temp;
@@ -1633,7 +1633,7 @@ intel_sdvo_get_edid(struct drm_connector *connector)
1633static struct edid * 1633static struct edid *
1634intel_sdvo_get_analog_edid(struct drm_connector *connector) 1634intel_sdvo_get_analog_edid(struct drm_connector *connector)
1635{ 1635{
1636 struct drm_i915_private *dev_priv = connector->dev->dev_private; 1636 struct drm_i915_private *dev_priv = to_i915(connector->dev);
1637 1637
1638 return drm_get_edid(connector, 1638 return drm_get_edid(connector,
1639 intel_gmbus_get_adapter(dev_priv, 1639 intel_gmbus_get_adapter(dev_priv,
@@ -1916,7 +1916,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
1916static void intel_sdvo_get_lvds_modes(struct drm_connector *connector) 1916static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
1917{ 1917{
1918 struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector); 1918 struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
1919 struct drm_i915_private *dev_priv = connector->dev->dev_private; 1919 struct drm_i915_private *dev_priv = to_i915(connector->dev);
1920 struct drm_display_mode *newmode; 1920 struct drm_display_mode *newmode;
1921 1921
1922 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", 1922 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -2001,7 +2001,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
2001{ 2001{
2002 struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector); 2002 struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
2003 struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); 2003 struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
2004 struct drm_i915_private *dev_priv = connector->dev->dev_private; 2004 struct drm_i915_private *dev_priv = to_i915(connector->dev);
2005 uint16_t temp_value; 2005 uint16_t temp_value;
2006 uint8_t cmd; 2006 uint8_t cmd;
2007 int ret; 2007 int ret;
@@ -2338,7 +2338,7 @@ intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
2338static u8 2338static u8
2339intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo) 2339intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)
2340{ 2340{
2341 struct drm_i915_private *dev_priv = dev->dev_private; 2341 struct drm_i915_private *dev_priv = to_i915(dev);
2342 struct sdvo_device_mapping *my_mapping, *other_mapping; 2342 struct sdvo_device_mapping *my_mapping, *other_mapping;
2343 2343
2344 if (sdvo->port == PORT_B) { 2344 if (sdvo->port == PORT_B) {
@@ -2952,7 +2952,7 @@ static void assert_sdvo_port_valid(const struct drm_i915_private *dev_priv,
2952bool intel_sdvo_init(struct drm_device *dev, 2952bool intel_sdvo_init(struct drm_device *dev,
2953 i915_reg_t sdvo_reg, enum port port) 2953 i915_reg_t sdvo_reg, enum port port)
2954{ 2954{
2955 struct drm_i915_private *dev_priv = dev->dev_private; 2955 struct drm_i915_private *dev_priv = to_i915(dev);
2956 struct intel_encoder *intel_encoder; 2956 struct intel_encoder *intel_encoder;
2957 struct intel_sdvo *intel_sdvo; 2957 struct intel_sdvo *intel_sdvo;
2958 int i; 2958 int i;
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index fc654173c491..0de935ad01c2 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -199,7 +199,7 @@ skl_update_plane(struct drm_plane *drm_plane,
199 const struct intel_plane_state *plane_state) 199 const struct intel_plane_state *plane_state)
200{ 200{
201 struct drm_device *dev = drm_plane->dev; 201 struct drm_device *dev = drm_plane->dev;
202 struct drm_i915_private *dev_priv = dev->dev_private; 202 struct drm_i915_private *dev_priv = to_i915(dev);
203 struct intel_plane *intel_plane = to_intel_plane(drm_plane); 203 struct intel_plane *intel_plane = to_intel_plane(drm_plane);
204 struct drm_framebuffer *fb = plane_state->base.fb; 204 struct drm_framebuffer *fb = plane_state->base.fb;
205 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 205 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -303,7 +303,7 @@ static void
303skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) 303skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
304{ 304{
305 struct drm_device *dev = dplane->dev; 305 struct drm_device *dev = dplane->dev;
306 struct drm_i915_private *dev_priv = dev->dev_private; 306 struct drm_i915_private *dev_priv = to_i915(dev);
307 struct intel_plane *intel_plane = to_intel_plane(dplane); 307 struct intel_plane *intel_plane = to_intel_plane(dplane);
308 const int pipe = intel_plane->pipe; 308 const int pipe = intel_plane->pipe;
309 const int plane = intel_plane->plane + 1; 309 const int plane = intel_plane->plane + 1;
@@ -317,7 +317,7 @@ skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
317static void 317static void
318chv_update_csc(struct intel_plane *intel_plane, uint32_t format) 318chv_update_csc(struct intel_plane *intel_plane, uint32_t format)
319{ 319{
320 struct drm_i915_private *dev_priv = intel_plane->base.dev->dev_private; 320 struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
321 int plane = intel_plane->plane; 321 int plane = intel_plane->plane;
322 322
323 /* Seems RGB data bypasses the CSC always */ 323 /* Seems RGB data bypasses the CSC always */
@@ -359,7 +359,7 @@ vlv_update_plane(struct drm_plane *dplane,
359 const struct intel_plane_state *plane_state) 359 const struct intel_plane_state *plane_state)
360{ 360{
361 struct drm_device *dev = dplane->dev; 361 struct drm_device *dev = dplane->dev;
362 struct drm_i915_private *dev_priv = dev->dev_private; 362 struct drm_i915_private *dev_priv = to_i915(dev);
363 struct intel_plane *intel_plane = to_intel_plane(dplane); 363 struct intel_plane *intel_plane = to_intel_plane(dplane);
364 struct drm_framebuffer *fb = plane_state->base.fb; 364 struct drm_framebuffer *fb = plane_state->base.fb;
365 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 365 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -485,7 +485,7 @@ static void
485vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) 485vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
486{ 486{
487 struct drm_device *dev = dplane->dev; 487 struct drm_device *dev = dplane->dev;
488 struct drm_i915_private *dev_priv = dev->dev_private; 488 struct drm_i915_private *dev_priv = to_i915(dev);
489 struct intel_plane *intel_plane = to_intel_plane(dplane); 489 struct intel_plane *intel_plane = to_intel_plane(dplane);
490 int pipe = intel_plane->pipe; 490 int pipe = intel_plane->pipe;
491 int plane = intel_plane->plane; 491 int plane = intel_plane->plane;
@@ -502,7 +502,7 @@ ivb_update_plane(struct drm_plane *plane,
502 const struct intel_plane_state *plane_state) 502 const struct intel_plane_state *plane_state)
503{ 503{
504 struct drm_device *dev = plane->dev; 504 struct drm_device *dev = plane->dev;
505 struct drm_i915_private *dev_priv = dev->dev_private; 505 struct drm_i915_private *dev_priv = to_i915(dev);
506 struct intel_plane *intel_plane = to_intel_plane(plane); 506 struct intel_plane *intel_plane = to_intel_plane(plane);
507 struct drm_framebuffer *fb = plane_state->base.fb; 507 struct drm_framebuffer *fb = plane_state->base.fb;
508 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 508 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -624,7 +624,7 @@ static void
624ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 624ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)
625{ 625{
626 struct drm_device *dev = plane->dev; 626 struct drm_device *dev = plane->dev;
627 struct drm_i915_private *dev_priv = dev->dev_private; 627 struct drm_i915_private *dev_priv = to_i915(dev);
628 struct intel_plane *intel_plane = to_intel_plane(plane); 628 struct intel_plane *intel_plane = to_intel_plane(plane);
629 int pipe = intel_plane->pipe; 629 int pipe = intel_plane->pipe;
630 630
@@ -643,7 +643,7 @@ ilk_update_plane(struct drm_plane *plane,
643 const struct intel_plane_state *plane_state) 643 const struct intel_plane_state *plane_state)
644{ 644{
645 struct drm_device *dev = plane->dev; 645 struct drm_device *dev = plane->dev;
646 struct drm_i915_private *dev_priv = dev->dev_private; 646 struct drm_i915_private *dev_priv = to_i915(dev);
647 struct intel_plane *intel_plane = to_intel_plane(plane); 647 struct intel_plane *intel_plane = to_intel_plane(plane);
648 struct drm_framebuffer *fb = plane_state->base.fb; 648 struct drm_framebuffer *fb = plane_state->base.fb;
649 struct drm_i915_gem_object *obj = intel_fb_obj(fb); 649 struct drm_i915_gem_object *obj = intel_fb_obj(fb);
@@ -753,7 +753,7 @@ static void
753ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 753ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)
754{ 754{
755 struct drm_device *dev = plane->dev; 755 struct drm_device *dev = plane->dev;
756 struct drm_i915_private *dev_priv = dev->dev_private; 756 struct drm_i915_private *dev_priv = to_i915(dev);
757 struct intel_plane *intel_plane = to_intel_plane(plane); 757 struct intel_plane *intel_plane = to_intel_plane(plane);
758 int pipe = intel_plane->pipe; 758 int pipe = intel_plane->pipe;
759 759
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 153190475ebd..49136ad5473e 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -826,7 +826,7 @@ static bool
826intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) 826intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe)
827{ 827{
828 struct drm_device *dev = encoder->base.dev; 828 struct drm_device *dev = encoder->base.dev;
829 struct drm_i915_private *dev_priv = dev->dev_private; 829 struct drm_i915_private *dev_priv = to_i915(dev);
830 u32 tmp = I915_READ(TV_CTL); 830 u32 tmp = I915_READ(TV_CTL);
831 831
832 if (!(tmp & TV_ENC_ENABLE)) 832 if (!(tmp & TV_ENC_ENABLE))
@@ -841,7 +841,7 @@ static void
841intel_enable_tv(struct intel_encoder *encoder) 841intel_enable_tv(struct intel_encoder *encoder)
842{ 842{
843 struct drm_device *dev = encoder->base.dev; 843 struct drm_device *dev = encoder->base.dev;
844 struct drm_i915_private *dev_priv = dev->dev_private; 844 struct drm_i915_private *dev_priv = to_i915(dev);
845 845
846 /* Prevents vblank waits from timing out in intel_tv_detect_type() */ 846 /* Prevents vblank waits from timing out in intel_tv_detect_type() */
847 intel_wait_for_vblank(encoder->base.dev, 847 intel_wait_for_vblank(encoder->base.dev,
@@ -854,7 +854,7 @@ static void
854intel_disable_tv(struct intel_encoder *encoder) 854intel_disable_tv(struct intel_encoder *encoder)
855{ 855{
856 struct drm_device *dev = encoder->base.dev; 856 struct drm_device *dev = encoder->base.dev;
857 struct drm_i915_private *dev_priv = dev->dev_private; 857 struct drm_i915_private *dev_priv = to_i915(dev);
858 858
859 I915_WRITE(TV_CTL, I915_READ(TV_CTL) & ~TV_ENC_ENABLE); 859 I915_WRITE(TV_CTL, I915_READ(TV_CTL) & ~TV_ENC_ENABLE);
860} 860}
@@ -1013,7 +1013,7 @@ static void set_color_conversion(struct drm_i915_private *dev_priv,
1013static void intel_tv_pre_enable(struct intel_encoder *encoder) 1013static void intel_tv_pre_enable(struct intel_encoder *encoder)
1014{ 1014{
1015 struct drm_device *dev = encoder->base.dev; 1015 struct drm_device *dev = encoder->base.dev;
1016 struct drm_i915_private *dev_priv = dev->dev_private; 1016 struct drm_i915_private *dev_priv = to_i915(dev);
1017 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); 1017 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
1018 struct intel_tv *intel_tv = enc_to_tv(encoder); 1018 struct intel_tv *intel_tv = enc_to_tv(encoder);
1019 const struct tv_mode *tv_mode = intel_tv_mode_find(intel_tv); 1019 const struct tv_mode *tv_mode = intel_tv_mode_find(intel_tv);
@@ -1173,7 +1173,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
1173 struct drm_crtc *crtc = connector->state->crtc; 1173 struct drm_crtc *crtc = connector->state->crtc;
1174 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 1174 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
1175 struct drm_device *dev = connector->dev; 1175 struct drm_device *dev = connector->dev;
1176 struct drm_i915_private *dev_priv = dev->dev_private; 1176 struct drm_i915_private *dev_priv = to_i915(dev);
1177 u32 tv_ctl, save_tv_ctl; 1177 u32 tv_ctl, save_tv_ctl;
1178 u32 tv_dac, save_tv_dac; 1178 u32 tv_dac, save_tv_dac;
1179 int type; 1179 int type;
@@ -1523,7 +1523,7 @@ static const struct drm_encoder_funcs intel_tv_enc_funcs = {
1523void 1523void
1524intel_tv_init(struct drm_device *dev) 1524intel_tv_init(struct drm_device *dev)
1525{ 1525{
1526 struct drm_i915_private *dev_priv = dev->dev_private; 1526 struct drm_i915_private *dev_priv = to_i915(dev);
1527 struct drm_connector *connector; 1527 struct drm_connector *connector;
1528 struct intel_tv *intel_tv; 1528 struct intel_tv *intel_tv;
1529 struct intel_encoder *intel_encoder; 1529 struct intel_encoder *intel_encoder;
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 19d759ed7a30..1d65209c0998 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1409,7 +1409,7 @@ static const struct register_whitelist {
1409int i915_reg_read_ioctl(struct drm_device *dev, 1409int i915_reg_read_ioctl(struct drm_device *dev,
1410 void *data, struct drm_file *file) 1410 void *data, struct drm_file *file)
1411{ 1411{
1412 struct drm_i915_private *dev_priv = dev->dev_private; 1412 struct drm_i915_private *dev_priv = to_i915(dev);
1413 struct drm_i915_reg_read *reg = data; 1413 struct drm_i915_reg_read *reg = data;
1414 struct register_whitelist const *entry = whitelist; 1414 struct register_whitelist const *entry = whitelist;
1415 unsigned size; 1415 unsigned size;
generated by cgit v1.2.2 (git 2.25.0) at 2025-06-01 00:54:07 -0400