1. 03 Jun, 2015 14 commits
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-05-27' of git://anongit.freedesktop.org/drm-intel into drm-next · 531e63e1
      Dave Airlie authored
      One more round of drm-misc, again mostly atomic. Big thing is the
      userspace blob code from Daniel Stone, with support for the mode_id blob
      now added to the atomic ioctl. Finally we can do atomic modesets!
      
      Note that the atomic ioctl is still behind the module knob since the
      weston patches aren't quite ready yet imo - they lack TEST_ONLY support,
      which is a fairly crucial bit of the atomic api. But besides that I think
      it's all good to go. That's also why we didn't bother to hide the new blob
      ioctls behind the knob, that part won't need to change. And if weston
      patches get in shape in time we could throw the "atomic by default patch"
      on top for 4.2.
      
      * tag 'topic/drm-misc-2015-05-27' of git://anongit.freedesktop.org/drm-intel:
        drm: Fix off-by-one in vblank hardware counter wraparound handling
        drm/atomic: fix out of bounds read in for_each_*_in_state helpers
        drm/atomic: Add MODE_ID property
        drm/atomic: Add current-mode blob to CRTC state
        drm: Add drm_atomic_set_mode_for_crtc
        drm: check for garbage in unused addfb2 fields
        drm: Retain reference to blob properties in lookup
        drm/mode: Add user blob-creation ioctl
        drm: Return error value from blob creation
        drm: Allow creating blob properties without copy
        drm/mode: Unstatic kernel-userspace mode conversion
        drm/mode: Validate modes inside drm_crtc_convert_umode
        drm/crtc_helper: Replace open-coded CRTC state helpers
        drm: kerneldoc fixes for blob properties
        drm/DocBook: Add more drm_bridge documentation
        drm: bridge: Allow daisy chaining of bridges
        drm/atomic: add all affected planes in drm_atomic_helper_check_modeset
        drm/atomic: add drm_atomic_add_affected_planes
        drm/atomic: add commit_planes_on_crtc helper
      531e63e1
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-next · cb2d47a4
      Dave Airlie authored
      drm-amdkfd-next-2015-06-03:
      
      - Add the H/W debugger support module, including new IOCTLs to:
        - register/unregister a process as a debugged process
        - Set address watch-point in the debugged process's GPU kernel
        - Do a wave control operation in the debugged process's waves
        See the commit messages for more details on the available operations.
      
        The debugged process can only perform debug operation on itself. It is
        blocked by the amdkfd+H/W from performing operations on other processes's
        waves or GPU kernels. The blocking is done by setting the VMID and PASID of
        the debugged process in the packets that are sent to the CP with the debug
        instructions.
      
      - Add support for static user-mode queues. These queues are regular queues,
        but because they belong to the debugged process, we need to make sure the CP
        doesn't preempt them during a debug operation. Therefore, we mark them as
        static for the CP ignore them during preemption.
      
      - Support killing all the waves when a process is terminated. This is needed
        in case a process is terminated but we can't UNMAP its queues (can occur due
        to several reasons). In that case, the CP could be stuck unless we kill all
        its waves. This function is *very* important as it provides the kernel a high
        level of control over the GPU. The reason we didn't upstream this function
        so far, is because it is implemented using the H/W debugger module functions,
        so we had to wait until we can upstream the H/W debugger module.
      
      - Replace declaration of bitmap from unsigned long to standard DECLARE_BITMAP
      
      * tag 'drm-amdkfd-next-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: Enforce kill all waves on process termination
        drm/radeon: Add ATC VMID<-->PASID functions to kfd->kgd
        drm/amdkfd: Implement address watch debugger IOCTL
        drm/amdkfd: Implement wave control debugger IOCTL
        drm/amdkfd: Implement (un)register debugger IOCTLs
        drm/amdkfd: Add address watch operation to debugger
        drm/amdkfd: Add wave control operation to debugger
        drm/amdkfd: Add skeleton H/W debugger module support
        drm/amdkfd: Add static user-mode queues support
        drm/amdkfd: add H/W debugger IOCTL set definitions
        drm/radeon: Add H/W debugger kfd->kgd functions
        drm/amdkfd: Use DECLARE_BITMAP
      cb2d47a4
    • Ben Goz's avatar
      drm/amdkfd: Enforce kill all waves on process termination · c3447e81
      Ben Goz authored
      This commit makes sure that on process termination, after
      we're destroying all the active queues, we're killing all the
      existing wave front of the current process.
      
      By doing this we're making sure that if any of the CUs were blocked
      by infinite loop we're enforcing it to end the shader explicitly.
      Signed-off-by: default avatarBen Goz <ben.goz@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      c3447e81
    • Alexey Skidanov's avatar
      drm/radeon: Add ATC VMID<-->PASID functions to kfd->kgd · edad4023
      Alexey Skidanov authored
      This patch adds three new interfaces to kfd2kgd interface file of radeon.
      
      The interfaces are:
      
      - Check if a specific VMID has a valid PASID mapping
      - Retrieve the PASID which is mapped to a specific VMID
      - Issue a VMID invalidation request to the ATC
      Signed-off-by: default avatarAlexey Skidanov <Alexey.Skidanov@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      edad4023
    • Yair Shachar's avatar
      drm/amdkfd: Implement address watch debugger IOCTL · f8bd1333
      Yair Shachar authored
      v2:
      
      - rename get_dbgmgr_mutex to kfd_get_dbgmgr_mutex to namespace it
      - change void* to uint64_t inside ioctl arguments
      - use kmalloc instead of kzalloc because we use copy_from_user
        immediately after it
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      f8bd1333
    • Yair Shachar's avatar
      drm/amdkfd: Implement wave control debugger IOCTL · 94484589
      Yair Shachar authored
      v2:
      
      - rename get_dbgmgr_mutex to kfd_get_dbgmgr_mutex to namespace it
      - change void* to uint64_t inside ioctl arguments
      - use kmalloc instead of kzalloc because we use copy_from_user
        immediately after it
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      94484589
    • Yair Shachar's avatar
      drm/amdkfd: Implement (un)register debugger IOCTLs · 037ed9a2
      Yair Shachar authored
      v2: rename get_dbgmgr_mutex to kfd_get_dbgmgr_mutex to namespace it
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      037ed9a2
    • Yair Shachar's avatar
      drm/amdkfd: Add address watch operation to debugger · e2e9afc4
      Yair Shachar authored
      The address watch operation gives the ability to specify watch points
      which will generate a shader breakpoint, based on a specified single
      address or range of addresses.
      
      There is support for read/write/any access modes.
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      e2e9afc4
    • Yair Shachar's avatar
      drm/amdkfd: Add wave control operation to debugger · 788bf83d
      Yair Shachar authored
      The wave control operation supports several command types executed upon
      existing wave fronts that belong to the currently debugged process.
      
      The available commands are:
      
      HALT   - Freeze wave front(s) execution
      RESUME - Resume freezed wave front(s) execution
      KILL   - Kill existing wave front(s)
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      788bf83d
    • Yair Shachar's avatar
      drm/amdkfd: Add skeleton H/W debugger module support · fbeb661b
      Yair Shachar authored
      This patch adds the skeleton H/W debugger module support. This code
      enables registration and unregistration of a single HSA process at a
      time.
      
      The module saves the process's pasid and use it to verify that only the
      registered process is allowed to execute debugger operations through the
      kernel driver.
      
      v2: rename get_dbgmgr_mutex to kfd_get_dbgmgr_mutex to namespace it
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      fbeb661b
    • Yair Shachar's avatar
      drm/amdkfd: Add static user-mode queues support · 992839ad
      Yair Shachar authored
      This patch adds support for static user-mode queues in QCM.
      Queues which are designated as static can NOT be preempted by
      the CP microcode when it is executing its scheduling algorithm.
      
      This is needed for supporting the debugger feature, because we
      can't allow the CP to preempt queues which are currently being debugged.
      
      The number of queues that can be designated as static is limited by the
      number of HQDs (Hardware Queue Descriptors).
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      992839ad
    • Yair Shachar's avatar
      drm/amdkfd: add H/W debugger IOCTL set definitions · aef11009
      Yair Shachar authored
      This patch adds four new IOCTLs to amdkfd. These IOCTLs expose a H/W
      debugger functionality to the userspace.
      
      The IOCTLs are:
      
      - AMDKFD_IOC_DBG_REGISTER:
      
      The purpose of this IOCTL is to notify amdkfd that a process wants to use
      GPU debugging facilities on itself only.
      It is expected that this IOCTL would be called before any other H/W
      debugger requests are sent to amdkfd and for each GPU where the H/W
      debugging needs to be enabled. The use of this IOCTL ensures that only
      one instance of a debugger is active in the system.
      
      - AMDKFD_IOC_DBG_UNREGISTER:
      
      This IOCTL detaches the debugger/debugged process from the H/W
      Debug which was established by the AMDKFD_IOC_DBG_REGISTER IOCTL.
      
      - AMDKFD_IOC_DBG_ADDRESS_WATCH:
      
      This IOCTL allows to set different watchpoints with various conditions as
      indicated by the IOCTL's arguments. The available number of watchpoints
      is retrieved from topology. This operation is confined to the current
      debugged process, which was registered through AMDKFD_IOC_DBG_REGISTER.
      
      - AMDKFD_IOC_DBG_WAVE_CONTROL:
      
      This IOCTL allows to control a wavefront as indicated by the IOCTL's
      arguments. For example, you can halt/resume or kill either a
      single wavefront or a set of wavefronts. This operation is confined to
      the current debugged process, which was registered through
      AMDKFD_IOC_DBG_REGISTER.
      
      Because the arguments for the address watch IOCTL and wave control IOCTL
      are dynamic, meaning that they could vary in size, the userspace passes a
      pointer to a structure (in userspace) that contains the value of the
      arguments. The kernel driver is responsible to parse this structure and
      validate its contents.
      
      v2: change void* to uint64_t inside ioctl arguments
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      aef11009
    • Yair Shachar's avatar
      drm/radeon: Add H/W debugger kfd->kgd functions · a6186f4d
      Yair Shachar authored
      This patch adds new interface functions to the kfd2kgd interface file. The
      new functions allow to perform H/W debugger operations by writing to GPU
      registers.
      Signed-off-by: default avatarYair Shachar <yair.shachar@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      a6186f4d
    • Joe Perches's avatar
      drm/amdkfd: Use DECLARE_BITMAP · f761d8bd
      Joe Perches authored
      Use the generic mechanism to declare a bitmap instead of unsigned long.
      
      It seems that "struct kfd_process.allocated_queue_bitmap" is unused.
      Maybe it could be deleted instead.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      f761d8bd
  2. 02 Jun, 2015 2 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-05-29' of... · 3e8d222f
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      Fixes for 4.2. Nothing too serious (given that it's still pre merge
      window). With that it's off for 2 weeks of vacation for me and taking care
      of 4.2 fixes for Jani.
      
      * tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: limit PPGTT size to 2GB in 32-bit platforms
        drm/i915: Another fbdev hack to avoid PSR on fbcon.
        drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes.
        drm/i915: disable IPS while getting the sink CRCs
        drm/i915: Disable 12bpc hdmi for now
        drm/i915: Adjust sideband locking a bit for CHV/VLV
        drm/i915: s/dpio_lock/sb_lock/
        drm/i915: Kill intel_flush_primary_plane()
        drm/i915: Throw out WIP CHV power well definitions
        drm/i915: Use the default 600ns LDO programming sequence delay
        drm/i915: Remove unnecessary null check in execlists_context_unqueue
        drm/i915: Use spinlocks for checking when to waitboost
        drm/i915: Fix the confusing comment about the ioctl limits
        Revert "drm/i915: Force clean compilation with -Werror"
      3e8d222f
    • Alexandre Courbot's avatar
      drm/ttm: dma: Don't crash on memory in the vmalloc range · 1c34d824
      Alexandre Courbot authored
      dma_alloc_coherent() can return memory in the vmalloc range.
      virt_to_page() cannot handle such addresses and crashes. This
      patch detects such cases and obtains the struct page * using
      vmalloc_to_page() instead.
      Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
      Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      1c34d824
  3. 29 May, 2015 3 commits
    • Michel Thierry's avatar
      drm/i915: limit PPGTT size to 2GB in 32-bit platforms · 501fd70f
      Michel Thierry authored
      We already set this limit for the GGTT.
      
      This is a temporary patch until a full replacement of size_t variables
      (inadequate in 32-bit kernel) is in place.
      
      Regression from:
      	commit a4e0bedc
      	Author: Michel Thierry <michel.thierry@intel.com>
      	Date:   Wed Apr 8 12:13:35 2015 +0100
      
      		drm/i915: Use complete address space in true PPGTT
      
      v2: Prettify code and explain why this is needed. (Chris)
      v3: Don't hide the compilation warning in 32-bit. (Chris)
      Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Mika Kuoppala <mika.kuoppala@intel.com>
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      501fd70f
    • Rodrigo Vivi's avatar
      drm/i915: Another fbdev hack to avoid PSR on fbcon. · d9a946b5
      Rodrigo Vivi authored
      With unified modeset and flip paths introduced recently when switching
      to fbcon PSR was being disabled on fb_set_par path but re-enabled on
      fb_pan_display one, causing missed screen updates and un unusable
      console.
      
      Regression introduced with:
      
      commit bb546623
      Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
      Date:   Tue Apr 21 17:13:13 2015 +0300
      
          drm/i915: Unify modeset and flip paths of intel_crtc_set_config()
      
      Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      d9a946b5
    • Rodrigo Vivi's avatar
      drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes. · 2d847d45
      Rodrigo Vivi authored
      Without this frontbuffer flip when enabling planes PSR got compromised
      and wasn't being enabled waiting forever on the flush that never
      arrived.
      
      Another solution would to create a enable_cursor function and split this
      frontbuffer flip among the different plane enable and disable functions.
      But if necessary this can be done in a follow up work. For now let's
      just fix the regression.
      
      It was removed by:
      
      commit 87d4300a
      Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Date:   Tue Apr 21 17:12:54 2015 +0300
      
          drm/i915: Move intel_(pre_disable/post_enable)_primary to intel_display.c, and use it there.
      
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      2d847d45
  4. 28 May, 2015 15 commits
    • Dave Airlie's avatar
      Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 95872b49
      Dave Airlie authored
      warning fix for tda998x
      
      * 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/i2c: tda998x: fix compiler warning for ssize_t
      95872b49
    • Russell King's avatar
      drm: clean up drm_mm debugfs output · 2f15791c
      Russell King authored
      The drm_mm debugfs output is difficult to read as two different formats
      are used for the addresses:
      
      0x00000080000000-0x0000008000b000: 45056: used
      0x8000b000-0x80016000: 45056: free
      0x00000080016000-0x0000008001b000: 20480: used
      0x8001b000-0x817a1000: 24666112: free
      0x000000817a1000-0x000000817a8000: 28672: used
      0x000000817a8000-0x00000081ba8000: 4194304: used
      
      Fix this by using %#018llx for all addresses, thus making the output:
      
      0x0000000080000000-0x000000008000b000: 45056: used
      0x000000008000b000-0x0000000080016000: 45056: free
      0x0000000080016000-0x000000008001b000: 20480: used
      0x000000008001b000-0x00000000817a1000: 24666112: free
      0x00000000817a1000-0x00000000817a8000: 28672: used
      0x00000000817a8000-0x0000000081ba8000: 4194304: used
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      2f15791c
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-05-22' of git://anongit.freedesktop.org/drm-intel into drm-next · c99d1530
      Dave Airlie authored
      - cpt modeset sequence fixes from Ville
      - more rps boosting tuning from Chris
      - S3 support for skl (Damien)
      - a pile of w/a for bxt from various people
      - cleanup of primary plane pixel formats (Damien)
      - a big pile of small patches with fixes and cleanups all over
      
      * tag 'drm-intel-next-2015-05-22' of git://anongit.freedesktop.org/drm-intel: (90 commits)
        drm/i915: Update DRIVER_DATE to 20150522
        drm/i915: Introduce DRM_I915_THROTTLE_JIFFIES
        drm/i915: Use the correct destructor for freeing requests on error
        drm/i915/skl: don't fail colorkey + scaler request
        drm/i915: Enable GTT caching on gen8
        drm/i915: Move WaProgramL3SqcReg1Default:bdw to init_clock_gating()
        drm/i915: Use ilk_init_lp_watermarks() on BDW
        drm/i915: Disable FDI RX/TX before the ports
        drm/i915: Disable CRT port after pipe on PCH platforms
        drm/i915: Disable SDVO port after the pipe on PCH platforms
        drm/i915: Disable HDMI port after the pipe on PCH platforms
        drm/i915: Fix the IBX transcoder B workarounds
        drm/i915: Write the SDVO reg twice on IBX
        drm/i915: Fix DP enhanced framing for CPT
        drm/i915: Clean up the CPT DP .get_hw_state() port readout
        drm/i915: Clarfify the DP code platform checks
        drm/i915: Remove the double register write from intel_disable_hdmi()
        drm/i915: Remove a bogus 12bpc "toggle" from intel_disable_hdmi()
        drm/i915/skl: Deinit/init the display at suspend/resume
        drm/i915: Free RPS boosts for all laggards
        ...
      c99d1530
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-next · a8a7cf02
      Dave Airlie authored
      for amdgpu separately next week.  Highlights for radeon:
      - VCE1 support
      - Bug fixes and misc cleanups
      
      * 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux:
        radeon: Deinline indirect register accessor functions
        drm/radeon: Fix max_vblank_count value for current display engines
        drm/radeon: stop using addr to check for BO move
        drm/radeon: clean up radeon_audio_enable
        drm/radeon: take the mode_config mutex when dealing with hpds (v2)
        drm/radeon: make dpcd parameters const
        drm/radeon: Use DECLARE_BITMAP
        drm/radeon/tn/si: enable/disable vce cg when encoding v2
        drm/radeon: add support for vce 1.0 clock gating
        drm/radeon: add VCE 1.0 support v4
        drm/radeon/dpm: add vce support for SI
        drm/radeon/dpm: add vce dpm support for TN
        drm/radeon: implement tn_set_vce_clocks
        drm/radeon: implement si_set_vce_clocks v2
        drm/radeon: allow some more VCE firmware versions
        drm/radeon: rework VCE FW size calculation
        drm/radeon: add a GPU reset counter queryable by userspace
      a8a7cf02
    • Denys Vlasenko's avatar
      radeon: Deinline indirect register accessor functions · 9e5acbc2
      Denys Vlasenko authored
      This patch deinlines indirect register accessor functions.
      
      These functions perform two mmio accesses, framed by spin lock/unlock.
      Spin lock/unlock by itself takes more than 50 cycles in ideal case
      (if lock is exclusively cached on current CPU).
      
      With this .config: http://busybox.net/~vda/kernel_config,
      after uninlining these functions have sizes and callsite counts
      as follows:
      
      r600_uvd_ctx_rreg: 111 bytes, 4 callsites
      r600_uvd_ctx_wreg: 113 bytes, 5 callsites
      eg_pif_phy0_rreg: 106 bytes, 13 callsites
      eg_pif_phy0_wreg: 108 bytes, 13 callsites
      eg_pif_phy1_rreg: 107 bytes, 13 callsites
      eg_pif_phy1_wreg: 108 bytes, 13 callsites
      rv370_pcie_rreg: 111 bytes, 21 callsites
      rv370_pcie_wreg: 113 bytes, 24 callsites
      r600_rcu_rreg: 111 bytes, 16 callsites
      r600_rcu_wreg: 113 bytes, 25 callsites
      cik_didt_rreg: 106 bytes, 10 callsites
      cik_didt_wreg: 107 bytes, 10 callsites
      tn_smc_rreg: 106 bytes, 126 callsites
      tn_smc_wreg: 107 bytes, 116 callsites
      eg_cg_rreg: 107 bytes, 20 callsites
      eg_cg_wreg: 108 bytes, 52 callsites
      
      Functions r100_mm_rreg() and r100_mm_rreg() have a fast path and
      a locked (slow) path. This patch deinlines only slow path.
      
      r100_mm_rreg_slow: 78 bytes, 2083 callsites
      r100_mm_wreg_slow: 81 bytes, 3570 callsites
      
      Reduction in code size is more than 65,000 bytes:
      
          text     data      bss       dec     hex filename
      85740176 22294680 20627456 128662312 7ab3b28 vmlinux.before
      85674192 22294776 20627456 128598664 7aa4288 vmlinux
      Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
      Cc: Christian König <christian.koenig@amd.com>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      9e5acbc2
    • Paulo Zanoni's avatar
      drm/i915: disable IPS while getting the sink CRCs · 4373f0f2
      Paulo Zanoni authored
      This commit is the "sink CRC" version of:
      
      commit 8c740dce
      Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Date:   Fri Oct 17 18:42:03 2014 -0300
          drm/i915: disable IPS while getting the pipe CRCs.
      
      For some unknown reason, when IPS gets enabled, the sink CRC changes.
      Since hsw_enable_ips() doesn't really guarantee to enable IPS (it
      depends on package C-states), we can't really predict if IPS is
      enabled or disabled while running our CRC tests, so let's just
      completely disable IPS while sink CRCs are being used.
      
      If we find a way to make IPS not change the pipe CRC result, we may
      want to fix IPS and then revert this patch (and 8c740dce too). While
      this doesn't happen, let's merge this patch, so the IGT tests relying
      on sink CRCs can work properly.
      
      This was discovered while developing a new IGT test, which will
      probably be called kms_frontbuffer_tracking.
      
      Testcase: igt/kms_frontbuffer_tracking (not on upstream IGT yet)
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      4373f0f2
    • Daniel Vetter's avatar
      drm/i915: Disable 12bpc hdmi for now · 5e3daaca
      Daniel Vetter authored
      It's totally broken, and since
      
      commit d328c9d7
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Fri Apr 10 16:22:37 2015 +0200
      
          drm/i915: Select starting pipe bpp irrespective or the primary plane
      
      the kernel will try to use it even for the common rgb888 framebuffers.
      Ville has patches to fix it all up properly, but unfortunately they're
      stuck in review limbo. And since the 4.2 feature cutoff has passed we
      need to somehow  handle this regression.
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Paulo Zanoni <przanoni@gmail.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      5e3daaca
    • Ville Syrjälä's avatar
      drm/i915: Adjust sideband locking a bit for CHV/VLV · 54433e91
      Ville Syrjälä authored
      chv_enable_pll() doesn't need to hold sb_lock for the entire duration of
      the function. Drop the lock as soon as possible.
      
      valleyview_set_cdclk() does a potential lock+unlock+lock+unlock cycle
      with sb_lock. Grab the lock a few lines earlier so we can make do
      with a single lock+unlock cycle always.
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      54433e91
    • Ville Syrjälä's avatar
      drm/i915: s/dpio_lock/sb_lock/ · a580516d
      Ville Syrjälä authored
      Rename dpio_lock to sb_lock to inform the reader that its primary
      purpose is to protect the sideband mailbox rather than some DPIO
      state.
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a580516d
    • Ville Syrjälä's avatar
      drm/i915: Kill intel_flush_primary_plane() · b12ce1d8
      Ville Syrjälä authored
      The primary plane frobbing was removed from the sprite code in
       commit ecce87ea
       Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
       Date:   Tue Apr 21 17:12:50 2015 +0300
      
          drm/i915: Remove implicitly disabling primary plane for now
      
      but the intel_flush_primary_plane() calls were left behind. Replace them
      with straight forward POSTING_READ() of the sprite surface address
      register.
      
      The other user of intel_flush_primary_plane() is g4x_disable_trickle_feed()
      where we can just inline the steps directly.
      
      This allows intel_flush_primary_plane() to be killed off.
      
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      b12ce1d8
    • Ville Syrjälä's avatar
      drm/i915: Throw out WIP CHV power well definitions · fde61e4b
      Ville Syrjälä authored
      Expecting CHV power wells to be just an extended versions of the VLV
      power wells, a bunch of commented out power wells were added in
      anticipation when Punit folks would implement it all. Turns out they
      never did, and instead CHV has fewer power wells than VLV. Rip out all
      the #if 0'ed junk that's not needed.
      
      v2: Rename the "pipe-a" well to "display" to match VLV
          Clarify the pipe A power well relationship to pipes B and C (Deepak)
      Reviewed-by: default avatarDeepak S <deepak.s@linux.intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      fde61e4b
    • Ville Syrjälä's avatar
      drm/i915: Use the default 600ns LDO programming sequence delay · bc284542
      Ville Syrjälä authored
      Not sure which LDO programming sequence delay should be used for the CHV
      PHY, but the spec says that 600ns is "Used by default for initial
      bringup", and the BIOS seems to use that, so let's do the same.
      Reviewed-by: default avatarDeepak S <deepak.s@linux.intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      bc284542
    • Michel Dänzer's avatar
      drm/radeon: Fix max_vblank_count value for current display engines · b0b9bb4d
      Michel Dänzer authored
      The value was much too low, which could cause the userspace visible
      vblank counter to move backwards when the hardware counter wrapped
      around.
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      b0b9bb4d
    • Christian König's avatar
      drm/radeon: stop using addr to check for BO move · 161ab658
      Christian König authored
      It is theoretically possible that a swapped out BO gets the
      same GTT address, but different backing pages while being swapped in.
      
      Instead just use another VA state to note updated areas.
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      161ab658
    • Alex Deucher's avatar
      drm/radeon: clean up radeon_audio_enable · 01062193
      Alex Deucher authored
      - make it static
      - fix mask/bool handling for last param
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      01062193
  5. 27 May, 2015 2 commits
  6. 26 May, 2015 4 commits