Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
036a12b6
Commit
036a12b6
authored
Nov 03, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv50/kms: remove a couple of cursor-related stub functions
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6aac6ced
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_display.c
+2
-0
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nv50_display.c
+0
-12
No files found.
drivers/gpu/drm/nouveau/nouveau_display.c
View file @
036a12b6
...
@@ -633,6 +633,8 @@ nouveau_display_resume(struct drm_device *dev, bool runtime)
...
@@ -633,6 +633,8 @@ nouveau_display_resume(struct drm_device *dev, bool runtime)
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
struct
nouveau_crtc
*
nv_crtc
=
nouveau_crtc
(
crtc
);
u32
offset
=
nv_crtc
->
cursor
.
nvbo
->
bo
.
offset
;
u32
offset
=
nv_crtc
->
cursor
.
nvbo
->
bo
.
offset
;
if
(
!
nv_crtc
->
cursor
.
set_offset
)
continue
;
nv_crtc
->
cursor
.
set_offset
(
nv_crtc
,
offset
);
nv_crtc
->
cursor
.
set_offset
(
nv_crtc
,
offset
);
nv_crtc
->
cursor
.
set_pos
(
nv_crtc
,
nv_crtc
->
cursor_saved_x
,
nv_crtc
->
cursor
.
set_pos
(
nv_crtc
,
nv_crtc
->
cursor_saved_x
,
nv_crtc
->
cursor_saved_y
);
nv_crtc
->
cursor_saved_y
);
...
...
drivers/gpu/drm/nouveau/nv50_display.c
View file @
036a12b6
...
@@ -1343,16 +1343,6 @@ static const struct drm_crtc_funcs nv50_crtc_func = {
...
@@ -1343,16 +1343,6 @@ static const struct drm_crtc_funcs nv50_crtc_func = {
.
page_flip
=
nouveau_crtc_page_flip
,
.
page_flip
=
nouveau_crtc_page_flip
,
};
};
static
void
nv50_cursor_set_pos
(
struct
nouveau_crtc
*
nv_crtc
,
int
x
,
int
y
)
{
}
static
void
nv50_cursor_set_offset
(
struct
nouveau_crtc
*
nv_crtc
,
uint32_t
offset
)
{
}
static
int
static
int
nv50_crtc_create
(
struct
drm_device
*
dev
,
int
index
)
nv50_crtc_create
(
struct
drm_device
*
dev
,
int
index
)
{
{
...
@@ -1371,8 +1361,6 @@ nv50_crtc_create(struct drm_device *dev, int index)
...
@@ -1371,8 +1361,6 @@ nv50_crtc_create(struct drm_device *dev, int index)
head
->
base
.
set_color_vibrance
=
nv50_crtc_set_color_vibrance
;
head
->
base
.
set_color_vibrance
=
nv50_crtc_set_color_vibrance
;
head
->
base
.
color_vibrance
=
50
;
head
->
base
.
color_vibrance
=
50
;
head
->
base
.
vibrant_hue
=
0
;
head
->
base
.
vibrant_hue
=
0
;
head
->
base
.
cursor
.
set_offset
=
nv50_cursor_set_offset
;
head
->
base
.
cursor
.
set_pos
=
nv50_cursor_set_pos
;
for
(
i
=
0
;
i
<
256
;
i
++
)
{
for
(
i
=
0
;
i
<
256
;
i
++
)
{
head
->
base
.
lut
.
r
[
i
]
=
i
<<
8
;
head
->
base
.
lut
.
r
[
i
]
=
i
<<
8
;
head
->
base
.
lut
.
g
[
i
]
=
i
<<
8
;
head
->
base
.
lut
.
g
[
i
]
=
i
<<
8
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment