drm: Fix shift operations for drm_fb_helper::drm_target_preferred()

smatch correctly warns:

	drivers/gpu/drm/drm_fb_helper.c:1960 drm_target_preferred() warn: should '1 << i' be a 64 bit type?
	drivers/gpu/drm/drm_fb_helper.c:2001 drm_target_preferred() warn: should '1 << i' be a 64 bit type?

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 14547817566d9616ff1496ca1cbae6f003591cb8..1f26634f53d8c2d56808a1ec8df934862e581055 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1959,19 +1959,20 @@ static bool drm_target_preferred(struct drm_fb_helper *fb_helper,
                                 bool *enabled, int width, int height)
 {
        struct drm_fb_helper_connector *fb_helper_conn;
-       int i;
-       uint64_t conn_configured = 0, mask;
+       const u64 mask = BIT_ULL(fb_helper->connector_count) - 1;
+       u64 conn_configured = 0;
        int tile_pass = 0;
-       mask = (1 << fb_helper->connector_count) - 1;
+       int i;
+
 retry:
        for (i = 0; i < fb_helper->connector_count; i++) {
                fb_helper_conn = fb_helper->connector_info[i];
 
-               if (conn_configured & (1 << i))
+               if (conn_configured & BIT_ULL(i))
                        continue;
 
                if (enabled[i] == false) {
-                       conn_configured |= (1 << i);
+                       conn_configured |= BIT_ULL(i);
                        continue;
                }
 
@@ -2012,7 +2013,7 @@ static bool drm_target_preferred(struct drm_fb_helper *fb_helper,
                }
                DRM_DEBUG_KMS("found mode %s\n", modes[i] ? modes[i]->name :
                          "none");
-               conn_configured |= (1 << i);
+               conn_configured |= BIT_ULL(i);
        }
 
        if ((conn_configured & mask) != mask) {