lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 118/124] drm/i915: Mark pin flags as u64
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Wilson <chris@chris-wilson.co.uk>

    commit 0014868b9c3c1dda1de6711cf58c3486fb422d07 upstream.

    Since the flags are being used to operate on a u64 variable, they too
    need to be marked as such so that the inverses are full width (and not
    zero extended on 32b kernels and bdw+).

    Reported-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: stable@vger.kernel.org
    Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
    Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20181102161232.17742-2-chris@chris-wilson.co.uk
    (cherry picked from commit 83b466b1dc5f0b4d33f0a901e8b00197a8f3582d)
    Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/i915_gem_gtt.h | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
    +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
    @@ -584,20 +584,20 @@ int i915_gem_gtt_insert(struct i915_addr
    u64 start, u64 end, unsigned int flags);

    /* Flags used by pin/bind&friends. */
    -#define PIN_NONBLOCK BIT(0)
    -#define PIN_MAPPABLE BIT(1)
    -#define PIN_ZONE_4G BIT(2)
    -#define PIN_NONFAULT BIT(3)
    -#define PIN_NOEVICT BIT(4)
    +#define PIN_NONBLOCK BIT_ULL(0)
    +#define PIN_MAPPABLE BIT_ULL(1)
    +#define PIN_ZONE_4G BIT_ULL(2)
    +#define PIN_NONFAULT BIT_ULL(3)
    +#define PIN_NOEVICT BIT_ULL(4)

    -#define PIN_MBZ BIT(5) /* I915_VMA_PIN_OVERFLOW */
    -#define PIN_GLOBAL BIT(6) /* I915_VMA_GLOBAL_BIND */
    -#define PIN_USER BIT(7) /* I915_VMA_LOCAL_BIND */
    -#define PIN_UPDATE BIT(8)
    +#define PIN_MBZ BIT_ULL(5) /* I915_VMA_PIN_OVERFLOW */
    +#define PIN_GLOBAL BIT_ULL(6) /* I915_VMA_GLOBAL_BIND */
    +#define PIN_USER BIT_ULL(7) /* I915_VMA_LOCAL_BIND */
    +#define PIN_UPDATE BIT_ULL(8)

    -#define PIN_HIGH BIT(9)
    -#define PIN_OFFSET_BIAS BIT(10)
    -#define PIN_OFFSET_FIXED BIT(11)
    +#define PIN_HIGH BIT_ULL(9)
    +#define PIN_OFFSET_BIAS BIT_ULL(10)
    +#define PIN_OFFSET_FIXED BIT_ULL(11)
    #define PIN_OFFSET_MASK (-I915_GTT_PAGE_SIZE)

    #endif

    \
     
     \ /
      Last update: 2018-11-19 19:19    [W:2.384 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site