summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2020-01-07 21:40:08 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2020-01-07 21:43:56 +0300
commit820013481a115100d5f8f22dc01aac8cc0363a23 (patch)
tree99cd46b66d5b9b97d38265d553f4fb60fee0d6a2 /meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch
parent965a056096e5e043748da8766fa50cb7afedb608 (diff)
downloadopenbmc-820013481a115100d5f8f22dc01aac8cc0363a23.tar.xz
Update to internal 2020-01-07
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch
index 856da7caf..259720e87 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch
@@ -1,4 +1,4 @@
-From 4090d7ab2e7282ff5680c3e574e644964a8ae7d6 Mon Sep 17 00:00:00 2001
+From 195cd60ff2fe38b18ebdea90245b908548f4e985 Mon Sep 17 00:00:00 2001
From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
Date: Wed, 20 Nov 2019 14:58:24 -0800
Subject: [PATCH] drm: add AST2600 GFX support
@@ -13,7 +13,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx.h b/drivers/gpu/drm/aspeed/aspeed_gfx.h
-index a10358b..eebd72e 100644
+index a10358bb61ec..eebd72eb1220 100644
--- a/drivers/gpu/drm/aspeed/aspeed_gfx.h
+++ b/drivers/gpu/drm/aspeed/aspeed_gfx.h
@@ -13,11 +13,15 @@ struct aspeed_gfx {
@@ -33,7 +33,7 @@ index a10358b..eebd72e 100644
#define CRT_CTRL2 0x64 /* CRT Control II */
#define CRT_STATUS 0x68 /* CRT Status */
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c
-index 15db9e4..2c95c72 100644
+index 2184b8be6fd4..86359a0fe05f 100644
--- a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c
+++ b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c
@@ -59,8 +59,8 @@ static void aspeed_gfx_enable_controller(struct aspeed_gfx *priv)
@@ -57,7 +57,7 @@ index 15db9e4..2c95c72 100644
static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv)
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
-index eeb22ec..aa44e01 100644
+index ada2f6aca906..92bc9b475e0f 100644
--- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
+++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
@@ -112,8 +112,14 @@ static int aspeed_gfx_load(struct drm_device *drm)
@@ -92,7 +92,7 @@ index eeb22ec..aa44e01 100644
priv->clk = devm_clk_get(drm->dev, NULL);
if (IS_ERR(priv->clk)) {
-@@ -212,6 +215,7 @@ static struct drm_driver aspeed_gfx_driver = {
+@@ -211,6 +214,7 @@ static struct drm_driver aspeed_gfx_driver = {
static const struct of_device_id aspeed_gfx_match[] = {
{ .compatible = "aspeed,ast2500-gfx" },