Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
drm_fb_helper.c
diff --git
a/kernel/drivers/gpu/drm/drm_fb_helper.c
b/kernel/drivers/gpu/drm/drm_fb_helper.c
index
69cbab5
..
5ad0367
100644
(file)
--- a/
kernel/drivers/gpu/drm/drm_fb_helper.c
+++ b/
kernel/drivers/gpu/drm/drm_fb_helper.c
@@
-1899,7
+1899,6
@@
static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,
int n, int width, int height)
{
int c, o;
int n, int width, int height)
{
int c, o;
- struct drm_device *dev = fb_helper->dev;
struct drm_connector *connector;
const struct drm_connector_helper_funcs *connector_funcs;
struct drm_encoder *encoder;
struct drm_connector *connector;
const struct drm_connector_helper_funcs *connector_funcs;
struct drm_encoder *encoder;
@@
-1918,7
+1917,7
@@
static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,
if (modes[n] == NULL)
return best_score;
if (modes[n] == NULL)
return best_score;
- crtcs = kzalloc(
dev->mode_config.num_connector
*
+ crtcs = kzalloc(
fb_helper->connector_count
*
sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);
if (!crtcs)
return best_score;
sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);
if (!crtcs)
return best_score;
@@
-1964,7
+1963,7
@@
static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,
if (score > best_score) {
best_score = score;
memcpy(best_crtcs, crtcs,
if (score > best_score) {
best_score = score;
memcpy(best_crtcs, crtcs,
-
dev->mode_config.num_connector
*
+
fb_helper->connector_count
*
sizeof(struct drm_fb_helper_crtc *));
}
}
sizeof(struct drm_fb_helper_crtc *));
}
}