• Matt Roper's avatar
    drm/i915/gen9: Calculate watermarks during atomic 'check' (v2) · 734fa01f
    Matt Roper authored
    Moving watermark calculation into the check phase will allow us to to
    reject display configurations for which there are no valid watermark
    values before we start trying to program the hardware (although those
    tests will come in a subsequent patch).
    
    Another advantage of moving this calculation to the check phase is that
    we can calculate the watermarks in a single shot as part of the atomic
    transaction.  The watermark interfaces we inherited from our legacy
    modesetting days are a bit broken in the atomic design because they use
    per-crtc entry points but actually re-calculate and re-program something
    that is really more of a global state.  That worked okay in the legacy
    modesetting world because operations only ever updated a single CRTC at
    a time.  However in the atomic world, a transaction can involve multiple
    CRTC's, which means we wind up computing and programming the watermarks
    NxN times (where N is the number of CRTC's involved).  With this patch
    we eliminate the redundant re-calculation of watermark data for atomic
    states (which was the cause of the WARN_ON(!wm_changed) problems that
    have plagued us for a while).
    
    We still need to work on the 'commit' side of watermark handling so that
    we aren't doing redundant NxN programming of watermarks, but that's
    content for future patches.
    
    v2:
     - Bail out of skl_write_wm_values() if the CRTC isn't active.  Now that
       we set dirty_pipes to ~0 if the active pipes change (because
       we need to deal with DDB changes), we can now wind up here for
       disabled pipes, whereas we couldn't before.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89055
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92181
    Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
    Tested-by: default avatarDaniel Stone <daniels@collabora.com>
    Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Link: http://patchwork.freedesktop.org/patch/msgid/1463091100-13747-1-git-send-email-matthew.d.roper@intel.com
    734fa01f
intel_pm.c 214 KB