1. 16 Mar, 2016 4 commits
    • Arnd Bergmann's avatar
      nouveau: fix nv40_perfctr_next() cleanup regression · 86d65b7e
      Arnd Bergmann authored
      gcc-6 warns about code in the nouveau driver that is obviously silly:
      
      drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c: In function 'nv40_perfctr_next':
      drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c:62:19: warning: self-comparison always evaluats to false [-Wtautological-compare]
        if (pm->sequence != pm->sequence) {
      
      The behavior was accidentally introduced in a patch described as "This is
      purely preparation for upcoming commits, there should be no code changes here.".
      As far as I can tell, that was true for the rest of that patch except for
      this one function, which has been changed to a NOP.
      
      This patch restores the original behavior.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 8c1aeaa1 ("drm/nouveau/pm: cosmetic changes")
      Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      86d65b7e
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel into drm-next · 1a4be38a
      Dave Airlie authored
      * tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel: (27 commits)
        drm: atomic helper: do not unreference error pointer
        drm/edid: Extract SADs properly from multiple audio data blocks
        drm: fix blob pointer check
        drm: introduce pipe color correction properties
        drm/atomic: Clean up update_connector_routing.
        drm/atomic: Clean up steal_encoder, v2.
        drm/atomic: Handle encoder assignment conflicts in a separate check, v3.
        drm/atomic: Handle encoder stealing from set_config better.
        drm/atomic: Always call steal_encoder, v2.
        drm/ast: removed optional dummy crtc mode_fixup function.
        drm/bochs: removed optional dummy crtc mode_fixup function.
        drm/fsl-dcu: removed optional dummy crtc mode_fixup function.
        drm/virtio: removed optional dummy crtc mode_fixup function.
        drm/nouveau/dispnv04: removed optional dummy crtc mode_fixup function.
        drm/atmel-hlcdc: remove optional dummy crtc mode_fixup function.
        drm/sti: removed optional dummy crtc mode_fixup function.
        drm/shmobile: removed optional dummy crtc mode_fixup function.
        drm/msm/mdp: removed optional dummy crtc mode_fixup function.
        drm/omapdrm: removed optional dummy crtc mode_fixup function.
        drm/rcar-du: removed optional dummy crtc mode_fixup function.
        ...
      1a4be38a
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-fixes-2016-03-15' of... · c51e034f
      Dave Airlie authored
      Merge tag 'drm-amdkfd-next-fixes-2016-03-15' of git://people.freedesktop.org/~gabbayo/linux into drm-next
      
      * tag 'drm-amdkfd-next-fixes-2016-03-15' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: uninitialized variable in dbgdev_wave_control_set_registers()
      c51e034f
    • Tomi Valkeinen's avatar
      drm/omap: fix panel/encoder probes · 55f6fca3
      Tomi Valkeinen authored
      The recent changes which removed platform data support from panels &
      encoders had a few mistakes, causing probes of DVI connector and DSI
      command mode panels to fail every time due to missing '!'. Fix the
      if()s.
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      Reported-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      55f6fca3
  2. 15 Mar, 2016 1 commit
  3. 14 Mar, 2016 35 commits