diff options
| author | Chris Wilson | 2016-11-27 18:09:10 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2016-11-28 08:40:03 +0100 |
| commit | c96521eebc24d49eb109013dcdae08c0c37e4f1e (patch) | |
| tree | 305408ee8c71dcb8794bffaa7e595d4c8d4ad547 /drivers/gpu/drm/drm_fb_helper.c | |
| parent | drm: Avoid NULL dereference for DRM_LEGACY debug message (diff) | |
| download | kernel-qcow2-linux-c96521eebc24d49eb109013dcdae08c0c37e4f1e.tar.gz kernel-qcow2-linux-c96521eebc24d49eb109013dcdae08c0c37e4f1e.tar.xz kernel-qcow2-linux-c96521eebc24d49eb109013dcdae08c0c37e4f1e.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 14547817566d..1f26634f53d8 100644 --- 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 @@ retry: } 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) { |