1. 10 Aug, 2017 15 commits
    • Rodrigo Vivi's avatar
      drm/i915/cnl: Enable SAGV for Cannonlake. · 01971819
      Rodrigo Vivi authored
      For now inherit from previous platforms.
      
      v2: Rebase on top of CFL.
      
      Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170809205248.11917-2-rodrigo.vivi@intel.com
      01971819
    • Paulo Zanoni's avatar
      drm/i915/gen10+: use the SKL code for reading WM latencies · 50682ee6
      Paulo Zanoni authored
      Gen 10 should use the exact same code as Gen 9, so change the check to
      take this into consideration, and also assume that future platforms
      will run this code.
      
      Also add a MISSING_CASE(), just in case we do something wrong, instead
      of silently failing.
      
      Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170809205248.11917-1-rodrigo.vivi@intel.com
      50682ee6
    • Rodrigo Vivi's avatar
      drm/i915: Avoid null dereference if mst_port is unset. · 06bfe5b0
      Rodrigo Vivi authored
      I'm not sure if this is really the case and I don't believe
      this is the real fix for the bug mentioned here, but since
      I don't see a reliable path when mst_port is set and when
      mode_valid is requested I believe it is worth to have this
      protection here.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102022
      Cc: Elizabeth <elizabethx.de.la.torre.mena@intel.com>
      Cc: Stefan Assmann <sassmann@redhat.com>
      Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170810145043.24047-1-rodrigo.vivi@intel.com
      06bfe5b0
    • Chris Wilson's avatar
      drm/i915/perf: Drop redundant check for perf.initialised on reset · 28b6cb08
      Chris Wilson authored
      As we cannot have an exclusive stream set if the perf has not been
      initialized, we only need to check for that exclusive stream.
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Cc: Matthew Auld <matthew.auld@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170810175743.25401-3-chris@chris-wilson.co.ukReviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
      28b6cb08
    • Chris Wilson's avatar
      drm/i915/perf: Drop lockdep assert for i915_oa_init_reg_state() · 84a095e4
      Chris Wilson authored
      This is called from execlist context init which we need to be unlocked.
      Commit f89823c2 ("drm/i915/perf: Implement
      I915_PERF_ADD/REMOVE_CONFIG interface") added a lockdep assert to this
      path for unclear reasons, remove it again!
      
      Fixes: f89823c2 ("drm/i915/perf: Implement I915_PERF_ADD/REMOVE_CONFIG interface")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Cc: Matthew Auld <matthew.auld@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170810175743.25401-2-chris@chris-wilson.co.ukReviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
      84a095e4
    • Chris Wilson's avatar
      drm/i915/perf: Initialise dynamic sysfs group before creation · 40f75ea4
      Chris Wilson authored
      Another case where we need to call sysfs_attr_init() to setup the
      internal lockdep class prior to use:
      
      [    9.325229] BUG: key ffff880168bc7bb0 not in .data!
      [    9.325240] DEBUG_LOCKS_WARN_ON(1)
      [    9.325250] ------------[ cut here ]------------
      [    9.325280] WARNING: CPU: 1 PID: 275 at kernel/locking/lockdep.c:3156 lockdep_init_map+0x1b2/0x1c0
      [    9.325301] Modules linked in: intel_powerclamp(+) coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel i915(+) snd_hda_intel snd_hda_codec snd_hwdep r8169 mii snd_hda_core snd_pcm prime_numbers i2c_hid pinctrl_geminilake pinctrl_intel
      [    9.325375] CPU: 1 PID: 275 Comm: modprobe Not tainted 4.13.0-rc4-CI-Trybot_1040+ #1
      [    9.325395] Hardware name: Intel Corp. Geminilake/GLK RVP2 LP4SD (07), BIOS GELKRVPA.X64.0045.B51.1704281422 04/28/2017
      [    9.325422] task: ffff8801721a4ec0 task.stack: ffffc900001dc000
      [    9.325440] RIP: 0010:lockdep_init_map+0x1b2/0x1c0
      [    9.325456] RSP: 0018:ffffc900001dfa10 EFLAGS: 00010282
      [    9.325473] RAX: 0000000000000016 RBX: ffff880168d54b80 RCX: 0000000000000000
      [    9.325488] RDX: 0000000080000001 RSI: 0000000000000001 RDI: ffffffff810f0800
      [    9.325505] RBP: ffffc900001dfa30 R08: 0000000000000001 R09: 0000000000000000
      [    9.325521] R10: 0000000000000000 R11: 0000000000000000 R12: ffff880168bc7bb0
      [    9.325537] R13: 0000000000000000 R14: ffff880168bc7b98 R15: ffffffff81a263a0
      [    9.325554] FS:  00007fb60c3fd700(0000) GS:ffff88017fc80000(0000) knlGS:0000000000000000
      [    9.325574] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [    9.325588] CR2: 0000006582777d80 CR3: 000000016d818000 CR4: 00000000003406e0
      [    9.325604] Call Trace:
      [    9.325618]  __kernfs_create_file+0x76/0xe0
      [    9.325632]  sysfs_add_file_mode_ns+0x8a/0x1a0
      [    9.325646]  internal_create_group+0xea/0x2c0
      [    9.325660]  sysfs_create_group+0x13/0x20
      [    9.325737]  i915_perf_register+0xde/0x220 [i915]
      [    9.325800]  i915_driver_load+0xa77/0x16c0 [i915]
      [    9.325863]  i915_pci_probe+0x37/0x90 [i915]
      [    9.325880]  pci_device_probe+0xa8/0x130
      [    9.325894]  driver_probe_device+0x29c/0x450
      [    9.325908]  __driver_attach+0xe3/0xf0
      [    9.325922]  ? driver_probe_device+0x450/0x450
      [    9.325935]  bus_for_each_dev+0x62/0xa0
      [    9.325948]  driver_attach+0x1e/0x20
      [    9.325960]  bus_add_driver+0x173/0x270
      [    9.325974]  driver_register+0x60/0xe0
      [    9.325986]  __pci_register_driver+0x60/0x70
      [    9.326044]  i915_init+0x6f/0x78 [i915]
      [    9.326066]  ? 0xffffffffa024e000
      [    9.326079]  do_one_initcall+0x43/0x170
      [    9.326094]  ? rcu_read_lock_sched_held+0x7a/0x90
      [    9.326109]  ? kmem_cache_alloc_trace+0x261/0x2d0
      [    9.326124]  do_init_module+0x5f/0x206
      [    9.326137]  load_module+0x2561/0x2da0
      [    9.326150]  ? show_coresize+0x30/0x30
      [    9.326165]  ? kernel_read_file+0x105/0x190
      [    9.326180]  SyS_finit_module+0xc1/0x100
      [    9.326192]  ? SyS_finit_module+0xc1/0x100
      [    9.326210]  entry_SYSCALL_64_fastpath+0x1c/0xb1
      [    9.326223] RIP: 0033:0x7fb60bf359f9
      [    9.326234] RSP: 002b:00007fff92b47c48 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
      [    9.326255] RAX: ffffffffffffffda RBX: ffffffff814898a3 RCX: 00007fb60bf359f9
      [    9.326271] RDX: 0000000000000000 RSI: 00000028a9ceef8b RDI: 0000000000000000
      [    9.326287] RBP: ffffc900001dff88 R08: 0000000000000000 R09: 0000000000000000
      [    9.326303] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000040000
      [    9.326319] R13: 00000028aaef2a70 R14: 0000000000000000 R15: 00000028aaeee5d0
      [    9.326339]  ? __this_cpu_preempt_check+0x13/0x20
      [    9.326353] Code: f1 39 00 85 c0 0f 84 38 ff ff ff 83 3d 9f 44 ce 01 00 0f 85 2b ff ff ff 48 c7 c6 b2 a2 c7 81 48 c7 c7 53 40 c5 81 e8 3f 82 01 00 <0f> ff e9 11 ff ff ff 0f 1f 80 00 00 00 00 55 31 c9 31 d2 31 f6
      
      Fixes: 701f8231 ("drm/i915/perf: prune OA configs")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Cc: Matthew Auld <matthew.auld@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170810175743.25401-1-chris@chris-wilson.co.ukReviewed-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
      40f75ea4
    • Jani Nikula's avatar
      drm/i915: add register macro definition style guide · 1aa920ea
      Jani Nikula authored
      This is not to try to force a new style; this is my interpretation of
      what the most common existing style is.
      
      With hopes I don't need to answer so many questions about style going
      forward.
      
      Start a new style section in the i915 document to bolt the register
      style guide into.
      
      v2: vertical alignment, incorporate to kernel-doc, and more
      
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/9de4a5b1bea4e76461c70a1dd66751581de0124f.1502368010.git.jani.nikula@intel.com
      1aa920ea
    • Jani Nikula's avatar
    • Jani Nikula's avatar
      Documentation/i915: remove sphinx conversion artefact · 83e92c21
      Jani Nikula authored
      Remove old warning about docproc directive that's not supported in the
      Sphinx toolchain.
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/7fc8a110b78a9dc9a585dce643b68b4200b7e793.1502368010.git.jani.nikula@intel.com
      83e92c21
    • Ben Widawsky's avatar
      drm/i915: Add format modifiers for Intel · 714244e2
      Ben Widawsky authored
      This was based on a patch originally by Kristian. It has been modified
      pretty heavily to use the new callbacks from the previous patch.
      
      v2:
        - Add LINEAR and Yf modifiers to list (Ville)
        - Combine i8xx and i965 into one list of formats (Ville)
        - Allow 1010102 formats for Y/Yf tiled (Ville)
      
      v3:
        - Handle cursor formats (Ville)
        - Put handling for LINEAR in the mod_support functions (Ville)
      
      v4:
        - List each modifier explicitly in supported modifiers (Ville)
        - Handle the CURSOR plane (Ville)
      
      v5:
        - Split out cursor and sprite handling (Ville)
      
      v6:
        - Actually use the sprite funcs (Emil)
        - Use unreachable (Emil)
      
      v7:
        - Only allow Intel modifiers and LINEAR (Ben)
      
      v8
        - Fix spite assert introduced in v6 (Daniel)
      
      v9
        - Change vendor check logic to avoid magic 56 (Emil)
        - Reorder skl_mod_support (Ville)
        - make intel_plane_funcs static, could be done as of v5 (Ville)
        - rename local variable intel_format_modifiers to modifiers (Ville)
          - actually use sprite modifiers
        - split out modifier/formats by platform (Ville)
      
      v10:
        - Undo vendor check from v9
      
      v11:
        - Squash CCS advertisement into this patch (daniels)
        - Don't advertise CCS on higher sprite planes (daniels)
      
      v12:
        - Don't advertise Y-tiled or CCS on any sprite planes, since we don't
          allocate enough DDB space for it to work. (daniels)
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v8)
      Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
      714244e2
    • Ville Syrjälä's avatar
      drm/i915: Add render decompression support · 2e2adb05
      Ville Syrjälä authored
      SKL+ display engine can scan out certain kinds of compressed surfaces
      produced by the render engine. This involved telling the display engine
      the location of the color control surfae (CCS) which describes
      which parts of the main surface are compressed and which are not. The
      location of CCS is provided by userspace as just another plane with its
      own offset.
      
      Add the required stuff to validate the user provided AUX plane metadata
      and convert the user provided linear offset into something the hardware
      can consume.
      
      Due to hardware limitations we require that the main surface and
      the AUX surface (CCS) be part of the same bo. The hardware also
      makes life hard by not allowing you to provide separate x/y offsets
      for the main and AUX surfaces (excpet with NV12), so finding suitable
      offsets for both requires a bit of work. Assuming we still want keep
      playing tricks with the offsets. I've just gone with a dumb "search
      backward for suitable offsets" approach, which is far from optimal,
      but it works.
      
      Also not all planes will be capable of scanning out compressed surfaces,
      and eg. 90/270 degree rotation is not supported in combination with
      decompression either.
      
      This patch may contain work from at least the following people:
      * Vandana Kannan <vandana.kannan@intel.com>
      * Daniel Vetter <daniel@ffwll.ch>
      * Ben Widawsky <ben@bwidawsk.net>
      
      v2: Deal with display workarounds 0390, 0531, 1125 (Paulo)
      v3: Pretend CCS tiles are regular 128 byte wide Y tiles (Jason)
          Put the AUX register defines to the correct place
          Fix up the slightly bogus rotation check
      v4: Use I915_WRITE_FW() due to plane update locking changes
          s/return -EINVAL/goto err/ in intel_framebuffer_init()
          Eliminate a bunch hardcoded numbers in CCS code
      
      v5: (By Ben)
      conflict resolution +
      -               res_blocks += fixed_16_16_to_u32_round_up(y_tile_minimum);
      +               res_blocks += fixed16_to_u32_round_up(y_tile_minimum);
      
      v6: (daniels) Fix botched commit message.
      
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Cc: Jason Ekstrand <jason@jlekstrand.net>
      Signed-off-by: default avatarVille Syrjä <ville.syrjala@linux.intel.com>
      Reviewed-by: Ben Widawsky <ben@bwidawsk.net> (v1)
      Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
      Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/20170801165817.7063-1-ben@bwidawsk.net
      2e2adb05
    • Ville Syrjälä's avatar
      drm/i915: Implement .get_format_info() hook for CCS · bbfb6ce8
      Ville Syrjälä authored
      SKL+ display engine can scan out certain kinds of compressed surfaces
      produced by the render engine. This involved telling the display engine
      the location of the color control surfae (CCS) which describes which
      parts of the main surface are compressed and which are not. The location
      of CCS is provided by userspace as just another plane with its own offset.
      
      By providing our own format information for the CCS formats, we should
      be able to make framebuffer_check() do the right thing for the CCS
      surface as well.
      
      Note that we'll return the same format info for both Y and Yf tiled
      format as that's what happens with the non-CCS Y vs. Yf as well. If
      desired, we could potentially return a unique pointer for each
      pixel_format+tiling+ccs combination, in which case we immediately be
      able to tell if any of that stuff changed by just comparing the
      pointers. But that does sound a bit wasteful space wise.
      
      v2: Drop the 'dev' argument from the hook
      v3: Include the description of the CCS surface layout
      v4: Pretend CCS tiles are regular 128 byte wide Y tiles (Jason)
      v5: Re-drop 'dev', fix commit message, add missing drm_fourcc.h
          description of CCS layout. (daniels)
      
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Cc: Jason Ekstrand <jason@jlekstrand.net>
      Acked-by: default avatarJason Ekstrand <jason@jlekstrand.net>
      Reviewed-by: Ben Widawsky <ben@bwidawsk.net> (v3)
      Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
      Signed-off-by: default avatarVille Syrjä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
      bbfb6ce8
    • Daniel Vetter's avatar
      Merge airlied/drm-next into drm-intel-next-queued · 148b1e11
      Daniel Vetter authored
      Ben Widawsky/Daniel Stone need the extended modifier support from
      drm-misc to be able to merge CCS support for i915.ko
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      148b1e11
    • Chris Wilson's avatar
      drm/i915: Supply the engine-id for our mock_engine() · 3ec0af7f
      Chris Wilson authored
      In the original selftest, we didn't care what the engine->id was, just
      that it could uniquely identify it. Later though, we started tracking
      the mock engines in the fixed size arrays around the drm_i915_private and
      so we now require their indices to be correct. This becomes an issue when
      using the standalone harness which runs all available tests at module load,
      and so we quickly assign an out-of-bounds index to an engine as we
      reallocate the mock GEM device between tests. It doesn't show up in
      igt/drv_selftest as that runs each subtest individually.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102045Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170809163930.26470-1-chris@chris-wilson.co.ukReviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
      3ec0af7f
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc into drm-next · 09ef2378
      Dave Airlie authored
      UAPI Changes:
      - vc4: Add ioctl to allow attaching a label to a bo (Eric)
      - Add new format/modifier blob plane property (Ben)
      - armada: Use __u32/__u64 instead of uint32_t/uint64_t (Mikko)
      - [kinda uapi] fb_helper: Expose display_info size via fb_info (David)
      
      Core Changes:
      - Default gem_dumb_[map_offset|destroy] as mmap/destroy implementations (Noralf)
      - Simplify atomic properties by removing the helpers and handling in core (Daniel)
      
      Driver Changes:
      - stm: Add STM32 DSI controller driver (Phillipe)
      - vc4: Add HDMI CEC support (Hans)
      - rockchip: Refactor register init & soc version handling (Mark)
      - misc: Remove .load_lut, .gamma_set, .gamma_get dead code (Peter)
      - dw-hdmi: Add HDMI CEC support (Russell)
      
      Cc: Philippe CORNU <philippe.cornu@st.com>
      Cc: Hans Verkuil <hans.verkuil@cisco.com>
      Cc: Eric Anholt <eric@anholt.net>
      Cc: Noralf Trønnes <noralf@tronnes.org>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Cc: Mark yao <mark.yao@rock-chips.com>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
      Cc: David Lechner <david@lechnology.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      
      * tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc: (107 commits)
        drm: Nuke drm_atomic_legacy_backoff
        drm: Nuke drm_atomic_helper_connector_dpms
        drm: Nuke drm_atomic_helper_connector_set_property
        drm: Nuke drm_atomic_helper_plane_set_property
        drm: Nuke drm_atomic_helper_crtc_set_property
        drm: Handle properties in the core for atomic drivers
        drm: Don't update property values for atomic drivers
        drm/omap: Rework the rotation-on-crtc hack
        drm/radeon: Use the drm_driver.dumb_destroy default
        drm/i915: Use the drm_driver.dumb_destroy default
        drm/sti: Use .dumb_map_offset and .dumb_destroy defaults
        drm: bridge: synopsys/dw-hdmi: Provide default configuration function for HDMI 2.0 PHY
        drm/fb-helper: pass physical dimensions to fbdev
        uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t
        drm/bridge: dw-hdmi: remove CEC engine register definitions
        drm/bridge: dw-hdmi: add cec driver
        drm/bridge: dw-hdmi: add missing cec_notifier_put
        drm: remove unused and redundant callbacks
        staging: vboxvideo: remove dead gamma lut code
        drm: dw-hdmi-i2s: add missing company name on Copyright
        ...
      09ef2378
  2. 09 Aug, 2017 1 commit
  3. 08 Aug, 2017 14 commits
  4. 07 Aug, 2017 9 commits
  5. 04 Aug, 2017 1 commit