projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_mode.h
diff --git
a/drivers/gpu/drm/radeon/radeon_mode.h
b/drivers/gpu/drm/radeon/radeon_mode.h
index
6794cdf
..
5067d18
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_mode.h
+++ b/
drivers/gpu/drm/radeon/radeon_mode.h
@@
-209,6
+209,7
@@
enum radeon_connector_table {
CT_EMAC,
CT_RN50_POWER,
CT_MAC_X800,
+ CT_MAC_G5_9600,
};
enum radeon_dvo_chip {
@@
-675,4
+676,5
@@
void radeon_fb_output_poll_changed(struct radeon_device *rdev);
void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id);
+int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled);
#endif