---
drivers/gpu/drm/radeon/radeon_benchmark.c | 5 ++--
drivers/gpu/drm/radeon/radeon_connectors.c | 30 ++++++++++++++--------
drivers/gpu/drm/radeon/radeon_drv.c | 5 ++++
drivers/gpu/drm/radeon/radeon_encoders.c | 6 +++--
4 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_benchmark.c
b/drivers/gpu/drm/radeon/radeon_benchmark.c
index ac9a5ec481c3..c283b6b15925 100644
--- a/drivers/gpu/drm/radeon/radeon_benchmark.c
+++ b/drivers/gpu/drm/radeon/radeon_benchmark.c
@@ -30,7 +30,7 @@
#define RADEON_BENCHMARK_COPY_DMA 0
#define RADEON_BENCHMARK_ITERATIONS 1024
-#define RADEON_BENCHMARK_COMMON_MODES_N 17
+#define RADEON_BENCHMARK_COMMON_MODES_N 18
static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size,
uint64_t saddr, uint64_t daddr,
@@ -184,7 +184,8 @@ void radeon_benchmark(struct radeon_device *rdev, int
test_number)
1680 * 1050 * 4,
1600 * 1200 * 4,
1920 * 1080 * 4,
- 1920 * 1200 * 4
+ 1920 * 1200 * 4,
+ 2560 * 1080 * 4
};
switch (test_number) {
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c
b/drivers/gpu/drm/radeon/radeon_connectors.c
index 607ad5620bd9..37927222f5b3 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -37,6 +37,8 @@
#include <linux/pm_runtime.h>
#include <linux/vga_switcheroo.h>
+extern int hdmimhz;
+
static int radeon_dp_handle_hpd(struct drm_connector *connector)
{
struct radeon_connector *radeon_connector =
to_radeon_connector(connector);
@@ -503,7 +505,7 @@ static void radeon_add_common_modes(struct drm_encoder
*encoder, struct drm_conn
struct mode_size {
int w;
int h;
- } common_modes[17] = {
+ } common_modes[18] = {
{ 640, 480},
{ 720, 480},
{ 800, 600},
@@ -520,10 +522,11 @@ static void radeon_add_common_modes(struct drm_encoder
*encoder, struct drm_conn
{1680, 1050},
{1600, 1200},
{1920, 1080},
- {1920, 1200}
+ {1920, 1200},
+ {2560, 1080}
};
- for (i = 0; i < 17; i++) {
+ for (i = 0; i < 18; i++) {
if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT)) {
if (common_modes[i].w > 1024 ||
common_modes[i].h > 768)
@@ -1491,25 +1494,32 @@ static enum drm_mode_status
radeon_dvi_mode_valid(struct drm_connector *connecto
(mode->clock > 135000))
return MODE_CLOCK_HIGH;
- if (radeon_connector->use_digital && (mode->clock > 165000)) {
+ if (radeon_connector->use_digital && (mode->clock > (hdmimhz * 1000))) {
if ((radeon_connector->connector_object_id ==
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I) ||
(radeon_connector->connector_object_id ==
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) ||
- (radeon_connector->connector_object_id ==
CONNECTOR_OBJECT_ID_HDMI_TYPE_B))
+ (radeon_connector->connector_object_id ==
CONNECTOR_OBJECT_ID_HDMI_TYPE_B)){
+ printk("MODE_CLOCK_HIHG0 %d", hdmimhz);
return MODE_OK;
- else if (ASIC_IS_DCE6(rdev) &&
drm_detect_hdmi_monitor(radeon_connector_edid(connector))) {
+ }else if (ASIC_IS_DCE6(rdev) &&
drm_detect_hdmi_monitor(radeon_connector_edid(connector))) {
/* HDMI 1.3+ supports max clock of 340 Mhz */
- if (mode->clock > 340000)
+ if (mode->clock > 340000){
+ printk("MODE_CLOCK_HIHG1 %d", hdmimhz);
return MODE_CLOCK_HIGH;
- else
+ }else{
+ printk("MODE_OK1");
return MODE_OK;
+ }
} else {
+ printk("MODE_CLOCK_HIHG2 %d", hdmimhz);
return MODE_CLOCK_HIGH;
}
}
/* check against the max pixel clock */
- if ((mode->clock / 10) > rdev->clock.max_pixel_clock)
+ if ((mode->clock / 10) > rdev->clock.max_pixel_clock){
+ printk("MODE_CLOCK_HIHG3 %d", hdmimhz);
return MODE_CLOCK_HIGH;
+ }
return MODE_OK;
}
@@ -1809,7 +1819,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct
drm_connector *connector
if (mode->clock > 340000)
return MODE_CLOCK_HIGH;
} else {
- if (mode->clock > 165000)
+ if (mode->clock > (hdmimhz * 1000))
return MODE_CLOCK_HIGH;
}
}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c
b/drivers/gpu/drm/radeon/radeon_drv.c
index e45d7344ac2b..fce8f9ab8018 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -281,6 +281,11 @@ int radeon_cik_support = 1;
MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 =
disabled)");
module_param_named(cik_support, radeon_cik_support, int, 0444);
+int hdmimhz = 165;
+MODULE_PARM_DESC(hdmi_mhz, "set HDMI max frequency, default is 165");
+module_param_named(hdmi_mhz, hdmimhz, int, 0444);
+
+
static struct pci_device_id pciidlist[] = {
radeon_PCI_IDS
};
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c
b/drivers/gpu/drm/radeon/radeon_encoders.c
index 46549d5179ee..6b805bcd5726 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -35,6 +35,8 @@
#include "radeon_legacy_encoders.h"
#include "atom.h"
+extern int hdmimhz;
+
static uint32_t radeon_encoder_clones(struct drm_encoder *encoder)
{
struct drm_device *dev = encoder->dev;
@@ -389,7 +391,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder
*encoder,
else
return false;
} else {
- if (pixel_clock > 165000)
+ if (pixel_clock > (hdmimhz * 1000))
return true;
else
return false;
@@ -414,7 +416,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder
*encoder,
else
return false;
} else {
- if (pixel_clock > 165000)
+ if (pixel_clock > (hdmimhz * 1000))
return true;
else
return false;
--
2.30.0
