UPSTREAM: drm/amd/display: Fix hubp check in set_cursor_position [chromiumos/third_party/kernel : chromeos-4.14]
1 view
Skip to first unread message
Dominik Behr (Gerrit)
Apr 13, 2018, 2:15:32 PM4/13/18
to Stéphane Marchesin, Drew Davenport
Dominik Behr would like Stéphane Marchesin and Drew Davenport to review this change.
UPSTREAM: drm/amd/display: Fix hubp check in set_cursor_position
Found by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:298
dc_stream_set_cursor_position() error: we previously assumed 'hubp'
could be null (see line 294)
BUG=b:72048470
TEST=boot Kahlee, run graphics_SanAngeles
Signed-off-by: Harry Wentland <harry.w...@amd.com>
Reviewed-by: Tony Cheng <Tony....@amd.com>
Acked-by: Harry Wentland <harry.w...@amd.com>
Signed-off-by: Alex Deucher <alexande...@amd.com>
(cherry picked from commit b3fb2b4e21a995c4fa511627088bd55b88f6be11)
Signed-off-by: Dominik Behr <db...@chromium.org>
Change-Id: I5c96f9d0fee9894077e79797441c2416b2b8b3bb
---
M drivers/gpu/drm/amd/display/dc/core/dc_stream.c
M drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index b00a604..e230cc4 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -263,7 +263,6 @@
struct input_pixel_processor *ipp = pipe_ctx->plane_res.ipp;
struct mem_input *mi = pipe_ctx->plane_res.mi;
struct hubp *hubp = pipe_ctx->plane_res.hubp;
- struct transform *xfm = pipe_ctx->plane_res.xfm;
struct dpp *dpp = pipe_ctx->plane_res.dpp;
struct dc_cursor_position pos_cpy = *position;
struct dc_cursor_mi_param param = {
@@ -294,11 +293,11 @@
if (mi != NULL && mi->funcs->set_cursor_position != NULL)
mi->funcs->set_cursor_position(mi, &pos_cpy, ¶m);
- if (hubp != NULL && hubp->funcs->set_cursor_position != NULL)
- hubp->funcs->set_cursor_position(hubp, &pos_cpy, ¶m);
+ if (!hubp)
+ continue;
- if (xfm != NULL && xfm->funcs->set_cursor_position != NULL)
- xfm->funcs->set_cursor_position(xfm, &pos_cpy, ¶m, hubp->curs_attr.width);
+ if (hubp->funcs->set_cursor_position != NULL)
+ hubp->funcs->set_cursor_position(hubp, &pos_cpy, ¶m);
if (dpp != NULL && dpp->funcs->set_cursor_position != NULL)
dpp->funcs->set_cursor_position(dpp, &pos_cpy, ¶m, hubp->curs_attr.width);
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
index 7c08bc6..ea88997 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
@@ -259,13 +259,6 @@
struct transform *xfm_base,
const struct dc_cursor_attributes *attr);
- void (*set_cursor_position)(
- struct transform *xfm_base,
- const struct dc_cursor_position *pos,
- const struct dc_cursor_mi_param *param,
- uint32_t width
- );
-
};
const uint16_t *get_filter_2tap_16p(void);
To view, visit change 1012666. To unsubscribe, or for help writing mail filters, visit settings.
Stéphane Marchesin (Gerrit)
Apr 13, 2018, 7:33:08 PM4/13/18
to Dominik Behr, Drew Davenport
Patch set 1:Code-Review +2
Dominik Behr (Gerrit)
Apr 16, 2018, 7:03:15 PM4/16/18
to Dominik Behr, Stéphane Marchesin, Drew Davenport
Patch set 1:Commit-Queue +1
Dominik Behr (Gerrit)
Apr 16, 2018, 7:19:31 PM4/16/18
to Dominik Behr, Stéphane Marchesin, Drew Davenport
Patch set 1:Verified +1
Dominik Behr (Gerrit)
Apr 18, 2018, 7:22:09 PM4/18/18
to Dominik Behr, ChromeOS Commit Bot, Stéphane Marchesin, Drew Davenport
ChromeOS bot (Gerrit)
Apr 19, 2018, 4:16:47 AM4/19/18
to Dominik Behr, Stéphane Marchesin, Drew Davenport, Dominik Behr, ChromeOS Commit Bot
ChromeOS bot uploaded patch set #2 to the change originally created by Dominik Behr.
UPSTREAM: drm/amd/display: Fix hubp check in set_cursor_position
Found by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:298
dc_stream_set_cursor_position() error: we previously assumed 'hubp'
could be null (see line 294)
BUG=b:72048470
TEST=boot Kahlee, run graphics_SanAngeles
Signed-off-by: Harry Wentland <harry.w...@amd.com>
Reviewed-by: Tony Cheng <Tony....@amd.com>
Acked-by: Harry Wentland <harry.w...@amd.com>
Signed-off-by: Alex Deucher <alexande...@amd.com>
(cherry picked from commit b3fb2b4e21a995c4fa511627088bd55b88f6be11)
Signed-off-by: Dominik Behr <db...@chromium.org>
Change-Id: I5c96f9d0fee9894077e79797441c2416b2b8b3bb
Reviewed-on: https://chromium-review.googlesource.com/1012666
Commit-Ready: Dominik Behr <db...@google.com>
Tested-by: Dominik Behr <db...@google.com>
Reviewed-by: Stéphane Marchesin <mar...@chromium.org>
---
M drivers/gpu/drm/amd/display/dc/core/dc_stream.c
M drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
2 files changed, 4 insertions(+), 12 deletions(-)
To view, visit change 1012666. To unsubscribe, or for help writing mail filters, visit settings.
ChromeOS bot (Gerrit)
Apr 19, 2018, 4:16:48 AM4/19/18
to Dominik Behr, Dominik Behr, ChromeOS Commit Bot, Stéphane Marchesin, Drew Davenport
ChromeOS bot merged this change.
UPSTREAM: drm/amd/display: Fix hubp check in set_cursor_position
Found by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:298
dc_stream_set_cursor_position() error: we previously assumed 'hubp'
could be null (see line 294)
BUG=b:72048470
TEST=boot Kahlee, run graphics_SanAngeles
Signed-off-by: Harry Wentland <harry.w...@amd.com>
Reviewed-by: Tony Cheng <Tony....@amd.com>
Acked-by: Harry Wentland <harry.w...@amd.com>
Signed-off-by: Alex Deucher <alexande...@amd.com>
(cherry picked from commit b3fb2b4e21a995c4fa511627088bd55b88f6be11)
Signed-off-by: Dominik Behr <db...@chromium.org>
Change-Id: I5c96f9d0fee9894077e79797441c2416b2b8b3bb
Reviewed-on: https://chromium-review.googlesource.com/1012666
Commit-Ready: Dominik Behr <db...@google.com>
Tested-by: Dominik Behr <db...@google.com>
Reviewed-by: Stéphane Marchesin <mar...@chromium.org>
Reply all
Reply to author
Forward
0 new messages